update, drop --impure

configuration.nix

@@ -10,8 +10,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  hardware.firmware = [ pkgs.customedid ];
-
   boot = {
     kernelParams =
       [
@@ -19,11 +17,6 @@
       "net.ifnames=0"
       ];
 
-    extraModprobeConfig = ''
-      options iwlmvm power_scheme=1
-      options iwlwifi power_save=0
-      '';
-
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -87,6 +80,7 @@
   };
 
   chaotic.mesa-git.enable = true; # requires --impure for now
+
   hardware.opengl = {
     enable = true;
     extraPackages = [ pkgs.libvdpau-va-gl ];
@@ -96,6 +90,8 @@
   };
 
   hardware.steam-hardware.enable = true;
+  programs.steam.enable = true;
+  chaotic.steam.extraCompatPackages = with pkgs; [ luxtorpeda proton-ge-custom ];
 
   hardware.bluetooth.enable = true;
   hardware.sane = {
@@ -190,7 +186,7 @@
     };
 
     printing = {
-      enable = false;
+      enable = true;
       drivers = [ pkgs.cnijfilter2 ];
     };
 

flake.lock

@@ -47,11 +47,11 @@
         "yuzu-ea-git-src": "yuzu-ea-git-src"
       },
       "locked": {
-        "lastModified": 1684156567,
-        "narHash": "sha256-1Yb3wAj2U8RFaVrjz9LiUJovCH7HP4lty7jR2DT8S64=",
+        "lastModified": 1684180667,
+        "narHash": "sha256-UO54GUkaEN+IsVMa/jWKZqHs3i2/L80aD4B8H6nqXFo=",
         "owner": "chaotic-aur",
         "repo": "nyx",
-        "rev": "098f1d05009e98953ce0fe9a989648d5efe67d3f",
+        "rev": "f4fc92c3559f71fd55c00069f9eafb2ab1938b57",
         "type": "github"
       },
       "original": {

flake.nix

@@ -149,8 +149,6 @@
           visualizerSupport = true;
         };
 
-        customedid = pkgs.callPackage ./pkgs/custom-edid { };
-        wxedid = pkgs.callPackage ./pkgs/wxedid { };
       };
 
       nixosConfigurations.terra = nixpkgs.lib.nixosSystem
@@ -164,7 +162,7 @@
               nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
               nix.registry = { nixpkgs.flake = nixpkgs; };
             }
-            ./system/configuration.nix
+            ./configuration.nix
             home-manager.nixosModules.home-manager
             {
               home-manager = {

pkgs/custom-edid/default.nix

@@ -1,18 +0,0 @@
-{ stdenvNoCC, lib }:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "edid-main-monitor";
-  version = "1";
-
-  edid = ./edid.bin;
-
-  dontFixup = true;
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/lib/firmware/edid
-    cp ${edid} $out/lib/firmware/edid/edid-EX2780Q.bin
-  '';
-}
-

pkgs/wxedid/default.nix

@@ -1,16 +0,0 @@
-{ lib, stdenv, fetchurl, wxGTK32 }:
-
-stdenv.mkDerivation rec {
-  pname = "wxedid";
-  version = "0.0.27";
-  src = fetchurl {
-    url = "https://downloads.sourceforge.net/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "KBIGrzsJ40TEsz+kJQZi9BPPFPITfVRrTlc1FYqdFfo=";
-  };
-
-  postPatch = ''
-    patchShebangs --build src/rcode/rcd_autogen
-  '';
-
-  buildInputs = [ wxGTK32 ];
-}

user/configs/fish/default.nix

@@ -1,63 +1,58 @@
-{ config, pkgs, inputs, ... }: {
-  programs.exa = {
-    enable = true;
-    enableAliases = true;
-  };
-
-  programs.fish = {
-    enable = true;
-
-    plugins = [
-      {
-        name = "bobthefish";
-        src = inputs.bobthefish;
-      }
-    ];
-
-    interactiveShellInit = ''
-      ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
-
-      set -g theme_color_scheme gruvbox
-      set -g theme_nerd_fonts yes
-      set -g theme_display_git_default_branch yes
-      set -g theme_git_default_branches master main
-
-    '';
-
-    #    loginShellInit = ''
-    #     if test (tty) = "/dev/tty1"
-    #        ${pkgs.sway}/bin/sway &> ~/.sway.log
-    #   end
-    #'';
-
-    functions = {
-      fish_greeting = "";
-
-      ec = ''
-        pushd . &> /dev/null
-        cd "${config.home.homeDirectory}/.dotfiles"
-        nvim "+Telescope find_files"
-        popd
-      '';
-
-      nor = ''
-        pushd . &> /dev/null
-        cd "${config.home.homeDirectory}/.dotfiles"
-        doas nixos-rebuild switch --flake .# --impure
-        popd &> /dev/null
-      '';
-
-      nou = ''
-        pushd . &> /dev/null
-        cd "${config.home.homeDirectory}/.dotfiles"
-        nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager --update-input hyprland --update-input chaotic-nyx
-        doas nixos-rebuild switch --upgrade --flake .# --impure
-        popd &> /dev/null
-      '';
+{ config, pkgs, inputs, ... }: 
+{
+    programs.exa = {
+        enable = true;
+        enableAliases = true;
     };
-    shellAliases = {
-      nf = "${pkgs.pfetch}/bin/pfetch";
-      e = "${pkgs.neovim}/bin/nvim";
+
+    programs.fish = {
+        enable = true;
+
+        plugins = [
+        {
+            name = "bobthefish";
+            src = inputs.bobthefish;
+        }
+        ];
+
+        interactiveShellInit = ''
+            ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
+
+            set -g theme_color_scheme gruvbox
+            set -g theme_nerd_fonts yes
+            set -g theme_display_git_default_branch yes
+            set -g theme_git_default_branches master main
+
+            '';
+
+        functions = {
+            fish_greeting = "";
+
+            ec = ''
+                pushd . &> /dev/null
+                cd "${config.home.homeDirectory}/.dotfiles"
+                nvim "+Telescope find_files"
+                popd
+                '';
+
+            nor = ''
+                pushd . &> /dev/null
+                cd "${config.home.homeDirectory}/.dotfiles"
+                doas nixos-rebuild switch --flake .#
+                popd &> /dev/null
+                '';
+
+            nou = ''
+                pushd . &> /dev/null
+                cd "${config.home.homeDirectory}/.dotfiles"
+                nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager --update-input hyprland --update-input chaotic-nyx
+                doas nixos-rebuild switch --upgrade --flake .#
+                popd &> /dev/null
+                '';
+        };
+        shellAliases = {
+            nf = "${pkgs.pfetch}/bin/pfetch";
+            e = "${pkgs.neovim}/bin/nvim";
+        };
     };
-  };
 }

user/configs/neovim/default.nix

@@ -14,6 +14,7 @@
                 neo-tree-nvim
                 nvim-notify
                 nvim-treesitter.withAllGrammars
+                which-key-nvim
 
                 telescope-nvim
                 telescope-fzf-native-nvim

user/configs/neovim/init.lua

@@ -11,6 +11,7 @@ vim.o.termguicolors = true
 vim.o.ignorecase = true
 vim.o.smartcase = true
 vim.o.lazyredraw = true
+vim.o.timeoutlen = 100
 
 vim.wo.number = true
 vim.wo.relativenumber = true
@@ -26,9 +27,9 @@ require("lualine").setup({
 
 require("bufferline").setup({
     options = {
-        separator_style = "slant",
         show_tab_indicators = true,
-    }
+        separator_style = { "", "" },
+    },
 })
 
 require("colorizer").setup()
@@ -75,11 +76,16 @@ require("nvim-treesitter.configs").setup({
     highlight = { enable = true, },
 })
 
+require("which-key").setup()
+
 local builtin = require("telescope.builtin")
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = "Find Files" })
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = "Live Grep" })
+vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = "List Buffers" })
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = "Help Tags" })
+vim.keymap.set('n', '<leader>fc', builtin.git_files, { desc = "Find Files (Git)" })
+
+require("telescope").load_extension("fzf")
 
 local cmp = require("cmp")
 local lspkind = require("lspkind")

user/configs/wayland/foot/default.nix

@@ -11,6 +11,8 @@ in
         font = "JetBrainsMono Nerd Font:pixelsize=12";
         box-drawings-uses-font-glyphs = "yes";
         pad = "16x16 center";
+        horizontal-letter-offset = "0";
+        vertical-letter-offset = "0";
       };
 
       colors = {

user/configs/wayland/hyprland/default.nix

@@ -58,11 +58,11 @@ in
 {
   imports = [
     inputs.hyprland.homeManagerModules.default
-    ./waybar.nix
-    ./foot.nix
-    ./wob.nix
-    ./fuzzel.nix
-    ./mako.nix
+    ../waybar
+    ../foot
+    ../wob
+    ../fuzzel
+    ../mako
   ];
 
   wayland.windowManager.hyprland = {

user/home.nix

@@ -7,7 +7,7 @@ in
     nix-colors.homeManagerModule
       ./configs/beets
       ./configs/cava
-      ./configs/wayland/hyprland.nix
+      ./configs/wayland/hyprland
       ./configs/fish
       ./configs/mpd
       ./configs/mpv
@@ -48,9 +48,7 @@ in
       sc-im
       signal-desktop
       sshfs
-      steam
       steam-run
-      steamtinkerlaunch
       sxiv
       thunderbird
       tldr
@@ -60,7 +58,6 @@ in
       vulkan-validation-layers
       webcord-vencord
       wineWowPackages.stagingFull
-      wxedid
       xdg-utils
       xivlauncher
       qbittorrent
@@ -70,6 +67,7 @@ in
     EDITOR = "nvim";
     MESA_DISK_CACHE_SINGLE_FILE = "1";
     NIXOS_OZONE_WL = "1";
+    NIXPKGS_ALLOW_UNFREE = "1";
     RADV_PERFTEST = "gpl";
     WINEDLLOVERRIDES = "winemenubuilder.exe=d";
     XDG_SCREENSHOTS_DIR = "~/Screenshots";