From 76124c02876c1404f85e16a6fb210cc0f29905cb Mon Sep 17 00:00:00 2001 From: meml0rz Date: Sat, 14 Dec 2024 20:50:34 +0100 Subject: [PATCH] oxocarbon --- configuration.nix | 33 ++++++++++++---------- hardware-configuration.nix | 15 +++++----- modules/nix/bspwm/alacritty.nix | 2 +- modules/nix/gaming.nix | 12 ++++++++ modules/nix/hypr/kitty.nix | 50 +++++++++++++++++++++++++++++++++ modules/nix/nvim/cmp.nix | 9 +++--- modules/nix/nvim/default.nix | 3 ++ 7 files changed, 95 insertions(+), 29 deletions(-) create mode 100644 modules/nix/gaming.nix diff --git a/configuration.nix b/configuration.nix index 84a2fef..2cba56b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,6 +8,7 @@ imports = [ ./hardware-configuration.nix ./modules/nix/firefox.nix + ./modules/nix/gaming.nix ]; nixpkgs.config.allowUnfree = true; @@ -120,7 +121,7 @@ grim slurp feh - chromium + gnumake # cli neofetch @@ -143,6 +144,8 @@ # misc cava discord + + python3Packages.adblock ]; security = { doas = { @@ -159,20 +162,20 @@ fonts = { fontconfig.enable = true; - packages = - with pkgs; - [ - noto-fonts - noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - fantasque-sans-mono - mplus-outline-fonts.githubRelease - dina-font - proggyfonts - ] - ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); + packages = + with pkgs; + [ + noto-fonts + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + fantasque-sans-mono + mplus-outline-fonts.githubRelease + dina-font + proggyfonts + ] + ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); }; system.stateVersion = "unstable"; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index ecfbf7e..375acef 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -8,18 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/d15649f6-6928-4527-bb66-1e1c3c8bcd76"; + { device = "/dev/disk/by-uuid/270c565f-b130-4f83-831e-c56b36b2ec83"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A38C-F2A8"; + { device = "/dev/disk/by-uuid/C7A8-3E74"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; @@ -31,10 +31,9 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wwp0s20f0u3i12.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/nix/bspwm/alacritty.nix b/modules/nix/bspwm/alacritty.nix index f798a49..4488926 100644 --- a/modules/nix/bspwm/alacritty.nix +++ b/modules/nix/bspwm/alacritty.nix @@ -34,7 +34,7 @@ }; }; font = { - size = 10; + size = 15; normal = { family = "FantasqueSansMNerdFont"; }; diff --git a/modules/nix/gaming.nix b/modules/nix/gaming.nix new file mode 100644 index 0000000..979af86 --- /dev/null +++ b/modules/nix/gaming.nix @@ -0,0 +1,12 @@ +{ + config, + pkgs, + ... +}: +{ + programs = { + steam = { + enable = true; + }; + }; +} diff --git a/modules/nix/hypr/kitty.nix b/modules/nix/hypr/kitty.nix index 17df0d8..bfa294c 100644 --- a/modules/nix/hypr/kitty.nix +++ b/modules/nix/hypr/kitty.nix @@ -8,6 +8,56 @@ cursor_shape beam close_window true confirm_os_window_close 0 + font_family FantasqueSansMNerdFont + foreground #dde1e6 + background #161616 + selection_foreground #f2f4f8 + selection_background #525252 + + cursor #f2f4f8 + cursor_text_color #393939 + + url_color #ee5396 + url_style single + + active_border_color #ee5396 + inactive_border_color #ff7eb6 + + bell_border_color #ee5396 + + wayland_titlebar_color system + macos_titlebar_color system + + active_tab_foreground #161616 + active_tab_background #ee5396 + inactive_tab_foreground #dde1e6 + inactive_tab_background #393939 + tab_bar_background #161616 + + color0 #262626 + color8 #393939 + + color1 #ff7eb6 + color9 #ff7eb6 + + color2 #42be65 + color10 #42be65 + + color3 #82cfff + color11 #82cfff + + color4 #33b1ff + color12 #33b1ff + + color5 #ee5396 + color13 #ee5396 + + color6 #3ddbd9 + color14 #3ddbd9 + + color7 #dde1e6 + color15 #ffffff + ''; }; diff --git a/modules/nix/nvim/cmp.nix b/modules/nix/nvim/cmp.nix index 30a91af..3225b46 100644 --- a/modules/nix/nvim/cmp.nix +++ b/modules/nix/nvim/cmp.nix @@ -31,9 +31,8 @@ in completeopt = "menu,menuone,noinsert,noselect"; keyword_length = 1; }; - sorting = - { - }; + sorting = { + }; mapping = { "".__raw = '' cmp.mapping(function(fallback) @@ -45,7 +44,7 @@ in end, { "i", "s" }) ''; - "".__raw = '' + "".__raw = '' cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() @@ -54,7 +53,7 @@ in end end, { "i", "s" }) ''; - "" = "cmp.mapping.scroll_docs(-4)"; + "" = "cmp.mapping.scroll_docs(-4)"; "" = "cmp.mapping.scroll_docs(4)"; "" = "cmp.mapping.complete()"; "" = "cmp.mapping.abort()"; diff --git a/modules/nix/nvim/default.nix b/modules/nix/nvim/default.nix index 3d11af2..e2d5b74 100644 --- a/modules/nix/nvim/default.nix +++ b/modules/nix/nvim/default.nix @@ -19,5 +19,8 @@ programs.nixvim = { enable = true; colorschemes.oxocarbon.enable = true; + plugins = { + neocord.enable = true; + }; }; }