Update

Author: Oughie

README.md

@@ -34,8 +34,8 @@ Personal configuration for Hyprland on NixOS 25.05 :snowflake:
 The list of additionally installed package can be viewed [here](nixos/modules/packages.nix).
 
 > [!WARNING]
-> The locale, keyboard layout as well as some keybindings are configured for German use cases.  
-> You may have to adjust them accordingly.
+> This configuration is intended for personal use.
+> The locale, drivers as well as other things may need to be adjusted for personal preferences.
 
 ## Installation
 

flake.lock

@@ -3,6 +3,7 @@
     ./btop
     ./fastfetch
     ./hyprland
+    ./kitty
     ./nvim
     ./waybar
     ./zsh
@@ -12,8 +13,8 @@
     ./eza.nix
     ./firefox.nix
     ./git.nix
-    ./kitty.nix
     ./rofi.nix
+    ./udiskie.nix
     ./xdg.nix
   ];
 }

home-manager/modules/default.nix

@@ -7,6 +7,7 @@
       "fullscreen.autohide" = false;
       "translations.neverTranslateLanguages" = "de";
       "aboutConfig.showWarning" = false;
+      "browser.uidensity" = 1;
       "newtabpage.activity-stream.showSponsoredTopSites" = false;
 
       "newtabpage.pinned" = [

home-manager/modules/firefox.nix

@@ -4,14 +4,14 @@
 
     blur = {
       enabled = true;
-      size = 15;
       passes = 3;
+      size = 10;
     };
 
     shadow = {
+      color = "rgba(1e1e2e8a)";
       range = 20;
       render_power = 3;
-      color = "rgba(1e1e2e8a)";
     };
   };
 }

home-manager/modules/hyprland/modules/decoration.nix

@@ -46,5 +46,9 @@
       "SUPER, mouse:272, movewindow"
       "SUPER, mouse:273, resizewindow"
     ];
+
+    binds = {
+      movefocus_cycles_fullscreen = 1;
+    };
   };
 }

home-manager/modules/hyprland/modules/keymaps.nix

@@ -1,8 +1,8 @@
 {
   wayland.windowManager.hyprland.settings = {
     windowrule = [
-      "opacity 0.82 override 0.7 override 1 override,^(kitty)$"
-      "opacity 0.8 override 0.7 override 1 override,^(discord)$"
+      "opacity 0.82 override 0.7 override 0.95 override, class:kitty"
+      "opacity 0.8 override 0.7 override 0.8 override, class:discord"
     ];
   };
 }

home-manager/modules/hyprland/modules/rules.nix

@@ -7,6 +7,5 @@ SCRIPTS=$HOME/Configuration/home-manager/modules/hyprland/scripts
 swww-daemon &
 waybar &
 dunst &
-udiskie &
 sh $SCRIPTS/slideshow.sh &
 sh $SCRIPTS/power-management.sh &

home-manager/modules/hyprland/scripts/start.sh

@@ -8,9 +8,10 @@ vim.keymap.set('t', '<C-j>', [[<C-\><C-n><C-w>j]], {})
 vim.keymap.set('t', '<C-k>', [[<C-\><C-n><C-w>k]], {})
 vim.keymap.set('t', '<C-l>', [[<C-\><C-n><C-w>l]], {})
 
--- Buffer navigation
+-- Buffer management
 vim.keymap.set('n', '<Tab>', '<cmd>bnext<cr>', {})
 vim.keymap.set('n', '<S-Tab>', '<cmd>bprevious<cr>', {})
+vim.keymap.set('n', '<leader>bd', '<cmd>bufdo bd<cr>', {})
 
 -- Window resizing
 vim.keymap.set('n', 'ß', '<cmd>horizontal resize +1<cr>', {})
@@ -33,4 +34,5 @@ vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', {})
 vim.keymap.set('n', '<leader>f', '<cmd>Telescope find_files<cr>', {})
 vim.keymap.set('n', '<leader>st', '<cmd>Telescope live_grep<cr>', {})
 vim.keymap.set('n', '<leader>th', '<cmd>Telescope colorscheme<cr>', {})
+vim.keymap.set('n', '<leader>sr', '<cmd>Telescope resume<cr>', {})
 vim.keymap.set('n', '<leader>e', '<cmd>NvimTreeToggle<cr>', {})

home-manager/modules/kitty.nix home-manager/modules/kitty/default.nix

@@ -1,7 +1,7 @@
 return {
     'catppuccin/nvim',
     name = 'catppuccin',
-    priority = 999,
+    priority = 1000,
     config = function()
         require('catppuccin').setup {
             custom_highlights = function(colors)

home-manager/assets/kitty-light.png home-manager/modules/kitty/icon.png

@@ -0,0 +1,5 @@
+return {
+    'mrcjkb/haskell-tools.nvim',
+    version = '^4',
+    lazy = false,
+}

home-manager/modules/nvim/lua/user/mappings.lua

@@ -5,13 +5,13 @@ return {
     require 'user.plugins.catppuccin',
     require 'user.plugins.cmp',
     require 'user.plugins.crates',
-    require 'user.plugins.emoji',
+    require 'user.plugins.haskell-tools',
     require 'user.plugins.illuminate',
     require 'user.plugins.inlay-hint',
     require 'user.plugins.lspconfig',
     require 'user.plugins.lsp-signature',
     require 'user.plugins.lualine',
-    require 'user.plugins.null-ls',
+    require 'user.plugins.none-ls',
     require 'user.plugins.nvim-tree',
     require 'user.plugins.rustacean',
     require 'user.plugins.telescope',

home-manager/modules/nvim/lua/user/plugins/catppuccin.lua

@@ -4,6 +4,7 @@ return {
     config = function()
         local lspconfig = require 'lspconfig'
 
+        -- Lua
         lspconfig.lua_ls.setup {
             settings = {
                 Lua = {
@@ -13,6 +14,11 @@ return {
                 },
             },
         }
+
+        -- Nix
+        lspconfig.nil_ls.setup {}
+
+        -- C / C++
         lspconfig.clangd.setup {
             init_options = {
                 clangdFileStatus = true,
@@ -26,15 +32,22 @@ return {
                 '--compile-commands-dir=' .. vim.fn.getcwd() .. '/build',
             },
         }
+
+        -- Python
         lspconfig.pylsp.setup {}
-        lspconfig.glsl_analyzer.setup {}
+
+        -- Java
         lspconfig.jdtls.setup {}
-        lspconfig.nil_ls.setup {}
+
+        -- JavaScript / TypeScript
         lspconfig.ts_ls.setup {}
 
+        -- Zig
         lspconfig.zls.setup {}
         vim.cmd.let 'g:zig_fmt_autosave = 0'
 
+        -- GLSL
+        lspconfig.glsl_analyzer.setup {}
         vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead' }, {
             pattern = '*.glsl',
             callback = function(args)

home-manager/modules/nvim/lua/user/plugins/emoji.lua

@@ -4,6 +4,8 @@ return {
     config = function()
         require('lualine').setup {
             options = {
+                section_separators = { left = '', right = '' },
+                component_separators = { left = '', right = '' },
                 disabled_filetypes = { 'alpha' },
             },
             sections = {

home-manager/modules/nvim/lua/user/plugins/haskell-tools.lua

@@ -1,5 +1,5 @@
 return {
-    'jose-elias-alvarez/null-ls.nvim',
+    'nvimtools/none-ls.nvim',
     event = 'LspAttach',
     enable = false,
     config = function()
@@ -9,6 +9,7 @@ return {
 
         null_ls.setup {
             sources = {
+                -- Lua
                 formatting.stylua.with {
                     extra_args = {
                         '--indent-type',
@@ -19,22 +20,29 @@ return {
                         'AutoPreferSingle',
                     },
                 },
+
+                -- Nix
+                formatting.nixfmt,
+
+                -- Python
+                formatting.isort,
                 formatting.black.with {
                     extra_args = {
                         '--skip-string-normalization',
                         '--line-length',
                         '75',
                     },
                 },
+
+                -- C / C++
                 formatting.clang_format.with {
                     extra_args = {
                         '--sort-includes',
                         '--style="{BasedOnStyle: llvm, IndentWidth: 4}"',
                     },
                 },
-                formatting.isort,
-                formatting.rustfmt,
-                formatting.nixfmt,
+
+                -- JavaScript / TypeScript
                 formatting.prettierd,
             },
             on_attach = function(client, bufnr)
@@ -53,5 +61,15 @@ return {
                 end
             end,
         }
+
+        -- Rust
+        vim.api.nvim_create_augroup('rustfmt', { clear = true })
+        vim.api.nvim_create_autocmd('BufWritePre', {
+            pattern = '*.rs',
+            group = 'rustfmt',
+            callback = function()
+                vim.lsp.buf.format { async = false }
+            end,
+        })
     end,
 }

home-manager/modules/nvim/lua/user/plugins/init.lua

@@ -0,0 +1,7 @@
+{
+  services.udiskie = {
+    enable = true;
+    automount = true;
+    notify = true;
+  };
+}

home-manager/modules/nvim/lua/user/plugins/lspconfig.lua

@@ -24,7 +24,6 @@
 
       "custom/distro" = {
         format = "<span font='Hack Nerd Font' size='medium'></span>";
-        on-click = "nmcli networking off; nmcli networking on";
         tooltip = false;
       };
 

home-manager/modules/nvim/lua/user/plugins/lualine.lua

@@ -8,10 +8,9 @@
     history.size = 1000000;
     syntaxHighlighting.enable = true;
 
-    initExtra = ''
+    initContent = ''
       [[ ! -f ${./p10k.zsh} ]] || source ${./p10k.zsh}
       eval "$(zoxide init --cmd cd zsh)"
-      export PATH="$HOME/.cargo/bin:$PATH"
     '';
 
     oh-my-zsh = {

home-manager/modules/nvim/lua/user/plugins/null-ls.lua home-manager/modules/nvim/lua/user/plugins/none-ls.lua

@@ -9,6 +9,17 @@
     sxiv
     discord
     libreoffice
+    obsidian
+
+    # Desktop
+    catppuccin-cursors.mochaFlamingo
+    cliphist
+    hyprpicker
+    hyprshot
+    papirus-icon-theme
+    swww
+    wf-recorder
+    wl-clipboard
 
     # Development
 
@@ -20,35 +31,19 @@
     nil
     nixfmt-rfc-style
 
-    # - Rust
-    rustup
-
     # Utils
 
     # - Grep
     fzf
     ripgrep
 
-    # - USB
-    udiskie
-    udisks
-    usbutils
-
     # - Miscellaneous
     dhcpcd
     home-manager
     libnotify
+    libva
     pipewire
     swayidle
     zoxide
-
-    # Desktop
-    catppuccin-cursors.mochaFlamingo
-    hyprpicker
-    hyprshot
-    swww
-    wf-recorder
-    cliphist
-    wl-clipboard
   ];
 }

home-manager/modules/udiskie.nix

@@ -22,6 +22,10 @@
   powerManagement = {
     enable = true;
     cpuFreqGovernor = "performance";
+    resumeCommands = ''
+      /run/current-system/sw/bin/nmcli networking off
+      /run/current-system/sw/bin/nmcli networking on
+    '';
   };
 
   systemd = {