update

configuration.nix

@@ -45,18 +45,11 @@
 
   networking = {
     hostName = "terra"; # Define your hostname.
-
-      networkmanager = {
-        enable = true;
-        wifi.powersave = false;
-      };
-
+    networkmanager.enable = true;
     firewall.enable = false;
-
     extraHosts = ''
-      192.168.0.17 steam.deck
+      192.168.0.18 steam.deck
       '';
-
   };
 
 # Set your time zone.

flake.lock

@@ -196,26 +196,6 @@
         "type": "github"
       }
     },
-    "hyprpaper": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1684265311,
-        "narHash": "sha256-zFOShOYS7zMcyCT9bFQlWB/ZtTelAFKKGUq4XBRQLE0=",
-        "owner": "hyprwm",
-        "repo": "hyprpaper",
-        "rev": "b82254e957cfa60124240e8d94e7368cbf6d392d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprpaper",
-        "type": "github"
-      }
-    },
     "hyprpicker": {
       "inputs": {
         "nixpkgs": [
@@ -343,7 +323,6 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "hyprland-contrib": "hyprland-contrib",
-        "hyprpaper": "hyprpaper",
         "hyprpicker": "hyprpicker",
         "nixpkgs": "nixpkgs_2",
         "openmw-git": "openmw-git",

flake.nix

@@ -30,11 +30,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hyprpaper = {
-      url = "github:hyprwm/hyprpaper";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     hyprpicker = {
       url = "github:hyprwm/hyprpicker";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -77,13 +72,12 @@
         inputs.chaotic-nyx.overlays.default
         inputs.hyprland.overlays.default
         inputs.hyprland-contrib.overlays.default
-        inputs.hyprpaper.overlays.default
         inputs.hyprpicker.overlays.default
     ];
   };
   in
   {
-    overlays.default = final: prev: rec {
+    overlays.default = final: prev: {
       nerdfonts = prev.nerdfonts.override {
         fonts = [ "JetBrainsMono" ];
       };

user/configs/fish/default.nix

@@ -45,13 +45,13 @@
             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
+                nix flake update --commit-lock-file
                 doas nixos-rebuild switch --upgrade --flake .#
                 popd &> /dev/null
                 '';
         };
         shellAliases = {
-            nf = "${pkgs.pfetch}/bin/pfetch";
+            nf = "${pkgs.neofetch}/bin/neofetch";
             e = "nvim";
         };
     };

user/configs/neovim/default.nix

@@ -23,6 +23,8 @@
 
                 nvim-lspconfig
                 nvim-treesitter.withAllGrammars
+                trouble-nvim
+                vim-fugitive
 
                 nvim-cmp
                 lspkind-nvim
@@ -37,7 +39,7 @@
         extraLuaConfig = builtins.readFile ./init.lua;
 
         extraPackages = with pkgs; [
-          rnix-lsp
+          nil
           lua-language-server
           clang-tools
         ];

user/configs/neovim/init.lua

@@ -93,20 +93,18 @@ require("nvim-treesitter.configs").setup({
 
 require("which-key").setup()
 
-local ts_builtin = require("telescope.builtin")
-vim.keymap.set('n', '<leader>ff', ts_builtin.find_files, { desc = "Find Files" })
-vim.keymap.set('n', '<leader>fg', ts_builtin.live_grep, { desc = "Live Grep" })
-vim.keymap.set('n', '<leader>fb', ts_builtin.buffers, { desc = "List Buffers" })
-vim.keymap.set('n', '<leader>fh', ts_builtin.help_tags, { desc = "Help Tags" })
-vim.keymap.set('n', '<leader>fc', ts_builtin.git_files, { desc = "Find Files (Git)" })
+require("trouble").setup()
 
-require("telescope").load_extension("fzf")
+local telescope = require("telescope")
+local telescope_builtin = require("telescope.builtin")
+
+telescope.load_extension("fzf")
 
 require('nvim-surround').setup()
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 local lspconfig = require("lspconfig")
-lspconfig.rnix.setup {
+lspconfig.nil_ls.setup {
   capabilities = capabilities
 }
 lspconfig.lua_ls.setup {
@@ -122,7 +120,9 @@ lspconfig.lua_ls.setup {
     },
   },
 }
-lspconfig.clangd.setup {}
+lspconfig.clangd.setup {
+  capabilities = capabilities,
+}
 
 require("luasnip.loaders.from_vscode").lazy_load()
 
@@ -269,3 +269,11 @@ vim.keymap.set("n", "<S-h>", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buff
 vim.keymap.set("n", "<S-l>", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
 vim.keymap.set("n", "[b", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buffer" })
 vim.keymap.set("n", "]b", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
+
+vim.keymap.set("n", '<leader>ff', telescope_builtin.find_files, { desc = "Find Files" })
+vim.keymap.set("n", '<leader>fg', telescope_builtin.live_grep, { desc = "Live Grep" })
+vim.keymap.set("n", '<leader>fb', telescope_builtin.buffers, { desc = "List Buffers" })
+vim.keymap.set("n", '<leader>fh', telescope_builtin.help_tags, { desc = "Help Tags" })
+vim.keymap.set("n", '<leader>fc', telescope_builtin.git_files, { desc = "Find Files (Git)" })
+
+vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>", { silent = true, noremap = true, desc = "Toggle Trouble Window" })

user/configs/wayland/hyprland/default.nix

@@ -7,8 +7,6 @@ let
   leftMonitor = "HDMI-A-1";
   rightMonitor = "DP-1";
 
-  wallpaper = "/mnt/hdd/Wallpapers/wallhaven-qdgx55.jpg";
-
   wob-voldaemon = pkgs.writeShellScriptBin "wob-volumeindicator.sh" ''
     if pgrep "wob";  then
       killall wob &> /dev/null
@@ -36,6 +34,22 @@ let
   killprocess = pkgs.writeShellScriptBin "killprocess.sh" ''
     ps -x -o pid=,comm= | column -t -o "    " | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "kill process: " | awk '{print $1}' | uniq | xargs -r kill -9
   '';
+
+  passmenu = pkgs.writeShellScriptBin "passmenu.sh" ''
+    shopt -s nullglob globstar
+
+    prefix=''${PASSWORD_STORE_DIR-~/.password-store}
+    password_files=( "$prefix"/**/*.gpg )
+    password_files=( "''${password_files[@]#"$prefix"/}" )
+    password_files=( "''${password_files[@]%.gpg}" )
+
+    password=$(printf '%s\n' "''${password_files[@]}" | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "pass: " "$@")
+
+    [[ -n $password ]] || exit
+
+    pass show -c "$password" 2>/dev/null
+  '';
+
 in
 
 {
@@ -74,7 +88,7 @@ in
 
       general {
           gaps_in = 16
-          border_size = 6
+          border_size = 4
           col.active_border = 0xff$surface2Alpha 0xff$surface0alpha 45deg
           col.inactive_border = 0xff$baseAlpha
       }
@@ -124,6 +138,7 @@ in
       exec-once = ${pkgs.mullvad-vpn}/bin/mullvad-gui
       exec-once = ${xwaylandSetPrimary}/bin/xwayland-setprimary.sh
       exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
+      exec-once = ${pkgs.swww}/bin/swww-daemon
 
       exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh;
 
@@ -131,7 +146,6 @@ in
       exec-once = ${pkgs.hyprland}/bin/hyprctl setcursor capitaine-cursors-white 24 &> /dev/null
 
       exec = pkill waybar; ${pkgs.waybar_hyprland}/bin/waybar
-      exec = pkill swaybg; ${pkgs.swaybg}/bin/swaybg -i ${wallpaper} -m fill
 
       #keybinds
       bind = ${modKey}, 1, workspace, 1
@@ -158,9 +172,9 @@ in
       bind = ${modKey}, F, fullscreen
 
       bind = ${modKey} SHIFT, Q, killactive
-      bind = ${modKey}, d, exec, ${pkgs.rofi-wayland}/bin/rofi -show drun -show-icons
+      bind = ${modKey}, D, exec, ${pkgs.rofi-wayland}/bin/rofi -show drun -show-icons
 
-      bind = ${modKey}, q, exec, ${pkgs.firefox}/bin/firefox
+      bind = ${modKey}, Q, exec, ${pkgs.firefox}/bin/firefox
 
       bind = ${modKey}, Return, exec, ${pkgs.foot}/bin/foot
 
@@ -169,8 +183,8 @@ in
 
       bind = CTRL, Space, exec, ${pkgs.mako}/bin/makoctl dismiss
       bind = CTRL, grave, exec, ${pkgs.mako}/bin/makoctl restore
-
-      bind = ${modKey} SHIFT, o, exec, ${killprocess}/bin/killprocess.sh
+      bind = ${modKey} SHIFT, O, exec, ${killprocess}/bin/killprocess.sh
+      bind = ${modKey} SHIFT, P, exec, ${passmenu}/bin/passmenu.sh
 
       bind = MOD5, F9, exec, ${pkgs.mpc-cli}/bin/mpc stop
       bind = MOD5, F10, exec, ${pkgs.mpc-cli}/bin/mpc prev
@@ -191,8 +205,20 @@ in
       windowrulev2 = float, class:^(org.kde.dolphin)$
     ''
     ];
-
   };
-  home.packages = [ pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.hyprpaper pkgs.hyprprop ];
+  home.file.".local/share/kservices5/swww.desktop".text = ''
+   [Desktop Entry]
+   Type=Service
+   X-KDE-ServiceTypes=KonqPopupMenu/Plugin
+   MimeType=image/jpeg;image/png;image/svg
+   Actions=setSWWWWallpaper;
+   Encoding=UTF-8
+
+   [Desktop Action setSWWWWallpaper]
+   Name=Set Wallpaper with swww
+   Exec=swww img "%f" 
+  '';
+
+  home.packages = [ pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop ];
 }