refactor(programs): sort imports

flake.lock

@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1680646146,
-        "narHash": "sha256-NH+EhLFYDwLQ01BqfTwGvZAjfmZynnP1xxPjqH0XJss=",
+        "lastModified": 1681335578,
+        "narHash": "sha256-yIZqE6WpkgAllsJ7IAbn8k6IRz/0CS/xp6IR+8yrEP8=",
         "owner": "zhaofengli",
         "repo": "attic",
-        "rev": "efa15b9788add910f6e8409dddfb7bb69c2ad201",
+        "rev": "171c89fbe0f099e8bf6e466a1a1a12578f703f0e",
         "type": "github"
       },
       "original": {
@@ -82,6 +82,22 @@
         "type": "github"
       }
     },
+    "bufferline-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681547098,
+        "narHash": "sha256-WZAJiDm77rS9S4tN7dz03jjnv1jFvTur6dLg8OkYVM4=",
+        "owner": "akinsho",
+        "repo": "bufferline.nvim",
+        "rev": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "akinsho",
+        "repo": "bufferline.nvim",
+        "type": "github"
+      }
+    },
     "comment-box-nvim": {
       "flake": false,
       "locked": {
@@ -101,11 +117,11 @@
     "copilot-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1680027228,
-        "narHash": "sha256-3u+2azMRm24mp5iOrxwYg9QrM2xJHnSjGsldIDRS6HQ=",
+        "lastModified": 1681223911,
+        "narHash": "sha256-ttF9LW6PNKk/BBWET2BUqtq5f7OIZ7ohtQevAaP8srg=",
         "owner": "zbirenbaum",
         "repo": "copilot.lua",
-        "rev": "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4",
+        "rev": "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb",
         "type": "github"
       },
       "original": {
@@ -198,16 +214,32 @@
         "type": "github"
       }
     },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1681037374,
-        "narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "033b9f258ca96a10e543d4442071f614dc3f8412",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -287,17 +319,14 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": [
-          "flake-utils"
         ]
       },
       "locked": {
-        "lastModified": 1680667162,
-        "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=",
+        "lastModified": 1681586243,
+        "narHash": "sha256-vdP79IZuDZVNSl4RN1LgEuab1Tkbv4gCxiE8VLdRf7U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d",
+        "rev": "40ebb62101c83de81e5fd7c3cfe5cea2ed21b1ad",
         "type": "github"
       },
       "original": {
@@ -332,11 +361,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1681066980,
-        "narHash": "sha256-68e+4txZITxbHP9IPYfLm36kOoI+rkMjRCbrPgtdQK8=",
+        "lastModified": 1681652918,
+        "narHash": "sha256-ybXmD3OhyMG1Yz31lxT8de7aBi2mQmXmzAZ7q49Uvi4=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "f3909cf2bfdd72aff69112f18c920ac6c9ca28f1",
+        "rev": "b05ff89c76b2c9454c76daf2120f4ccb076a018d",
         "type": "github"
       },
       "original": {
@@ -371,11 +400,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1681080114,
-        "narHash": "sha256-rAKfgQJQRsw4QMOXdxfHIh/d5LPY6HHKBX1KtaPs2No=",
+        "lastModified": 1681650457,
+        "narHash": "sha256-IGXRZrFGFqUeM5iDgP/ojbrd+gKL40PaFFAITxbkfZ0=",
         "owner": "hyprwm",
         "repo": "hyprpaper",
-        "rev": "4bcedde1dc1a06107ec32c93a937de30f40aa1fc",
+        "rev": "3bfaac09f58ce31c33e1a56e7eaa606a87fe4c32",
         "type": "github"
       },
       "original": {
@@ -387,11 +416,11 @@
     "lspsaga-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1681041449,
-        "narHash": "sha256-ARbFiwfWsYapFH5p7xSCCe25RFUlUI/h8Jv81XHLBx4=",
+        "lastModified": 1681470671,
+        "narHash": "sha256-mekeKttJSsBpTxMShC0l29/Wx3VKUnHMh6YtLYtx9Lk=",
         "owner": "glepnir",
         "repo": "lspsaga.nvim",
-        "rev": "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b",
+        "rev": "b2feb95e84776f7c9cdfb96e4c89a582c9ade0e4",
         "type": "github"
       },
       "original": {
@@ -402,11 +431,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1681080342,
-        "narHash": "sha256-7GvJEuGANq9/zk549rf5zoeTyFdsw5irvVLf5crpBnE=",
+        "lastModified": 1681658302,
+        "narHash": "sha256-KDXpkA7JOTnffQWAA5W246FoJNbdSur5HgzYScOzYKQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "340acec509d71d0d0decd7a82e7cb52ae4c76065",
+        "rev": "f30febf83039aaa4a4399d46d068900a2b449de6",
         "type": "github"
       },
       "original": {
@@ -415,25 +444,47 @@
         "type": "github"
       }
     },
-    "neovim": {
+    "neovim-flake": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1680264322,
-        "narHash": "sha256-nv1lSK+y/vv6ASMhNFoJE1YcNisJmQ0A+anNLzscvKk=",
+        "lastModified": 1681631972,
+        "narHash": "sha256-zF+sWaQPJpoDyhWXvwJGR7VryYr9+qBCWMTNRjA3BhQ=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63",
+        "rev": "0d9b0fbe579343fa6d6c46e6e1bf6bb8719ea5e0",
         "type": "github"
       },
       "original": {
         "dir": "contrib",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63",
+        "type": "github"
+      }
+    },
+    "neovim-nightly-overlay": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "neovim-flake": "neovim-flake",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1681632748,
+        "narHash": "sha256-c0CskvdpipnTn5TSjq6KqNkeKRPYCDMmVTdZL08HTJA=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "0e3e0029aa6353ecb7304d4a683d8d6ee69379ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
         "type": "github"
       }
     },
@@ -448,11 +499,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1680544266,
-        "narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=",
+        "lastModified": 1681412802,
+        "narHash": "sha256-IcEala6vFQ7SFNOPCeXBh9Jbl8nL2QOtLmO7RbDsBbo=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362",
+        "rev": "1d5bc81023c21b22cfbea06a8b4b82963c01b941",
         "type": "github"
       },
       "original": {
@@ -527,27 +578,27 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1671983799,
-        "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
+        "lastModified": 1681571934,
+        "narHash": "sha256-Q3B3HTqhTahhPCT53ahK1FPktOXlEWmudSttd9CWGbE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836",
+        "rev": "29176972b4be60f7d3eb3101f696c99f2e6ada57",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1681028957,
-        "narHash": "sha256-gKWkKT/nFg2d9HZyK7VAjRzkyPfKLx+uIGyWXDw0NB0=",
+        "lastModified": 1681633309,
+        "narHash": "sha256-HvEzKU/ZWGyIt2G+AIEKmMt/ED3P+Tgjw3/BkArti0o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "11c129c16f4051ad215ea7b0d297a6c7cf5d24d7",
+        "rev": "cb578ff7040066fd1b3f6f087bca796ddbf598b5",
         "type": "github"
       },
       "original": {
@@ -559,11 +610,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1678898370,
-        "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
+        "lastModified": 1681303793,
+        "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac718d02867a84b42522a0ece52d841188208f2c",
+        "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
         "type": "github"
       },
       "original": {
@@ -591,18 +642,18 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "flake-utils": "flake-utils_3",
         "gitignore": "gitignore",
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1680981441,
-        "narHash": "sha256-Tqr2mCVssUVp1ZXXMpgYs9+ZonaWrZGPGltJz94FYi4=",
+        "lastModified": 1681413034,
+        "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "2144d9ddcb550d6dce64a2b44facdc8c5ea2e28a",
+        "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
         "type": "github"
       },
       "original": {
@@ -617,6 +668,7 @@
         "arkenfox-userjs": "arkenfox-userjs",
         "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
         "attic": "attic",
+        "bufferline-nvim": "bufferline-nvim",
         "comment-box-nvim": "comment-box-nvim",
         "copilot-lua": "copilot-lua",
         "flake-utils": "flake-utils",
@@ -627,7 +679,7 @@
         "hyprpaper": "hyprpaper",
         "lspsaga-nvim": "lspsaga-nvim",
         "master": "master",
-        "neovim": "neovim",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nil": "nil",
         "nixpkgs": "nixpkgs_5",
         "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
@@ -707,11 +759,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1680865339,
-        "narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=",
+        "lastModified": 1681482634,
+        "narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0040164e473509b4aee6aedb3b923e400d6df10b",
+        "rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
         "type": "github"
       },
       "original": {
@@ -786,11 +838,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681066882,
-        "narHash": "sha256-8szxuwDOQcYyS8TZokGpIJYzaTwBQ9pmmcCkeuX2YV8=",
+        "lastModified": 1681127512,
+        "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "e48165c5637260cf2a88494a112269922dee58de",
+        "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97",
         "type": "github"
       },
       "original": {

flake.nix

@@ -25,7 +25,6 @@
     attic.url = "github:zhaofengli/attic";
 
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.inputs.utils.follows = "flake-utils";
     home-manager.url = "github:nix-community/home-manager";
 
     nil.inputs.flake-utils.follows = "flake-utils";
@@ -35,7 +34,10 @@
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
 
     # Neovim
-    neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
+
+    bufferline-nvim.flake = false;
+    bufferline-nvim.url = "github:akinsho/bufferline.nvim";
 
     comment-box-nvim.flake = false;
     comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
@@ -99,6 +101,7 @@
       channels.nixpkgs.overlaysBuilder = _: [
         inputs.hypr-contrib.overlays.default
         inputs.hyprland.overlays.default
+        inputs.neovim-nightly-overlay.overlay
         inputs.utils.overlay
         self.overlay
       ];
@@ -118,6 +121,7 @@
         ./modules/profiles/base.nix
         ./modules/profiles/gaming.nix
         ./modules/profiles/desktop.nix
+        ./modules/profiles/personal.nix
       ];
 
       hostDefaults.modules = [
@@ -139,6 +143,7 @@
         ./hosts/nixos-laptop
         self.nixosModules.desktop
         self.nixosModules.gaming
+        self.nixosModules.personal
       ];
 
 
@@ -146,6 +151,7 @@
         ./hosts/nixos-desktop
         self.nixosModules.desktop
         self.nixosModules.gaming
+        self.nixosModules.personal
       ];
 
       /*

hosts/nixos-desktop/default.nix

@@ -10,8 +10,11 @@
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
-
-  my.programs.hyprland.nvidiaSupport = true;
+  my = {
+    programs.hyprland.nvidiaSupport = true;
+    services.mullvad.enable = true;
+    programs.ledger.enable = true;
+  };
 
   # KERNEL
   boot.kernelPackages = pkgs.linuxPackages_latest;

modules/profiles/desktop.nix

@@ -5,135 +5,56 @@
 with lib; {
   my = {
     yubikey = {
-      enable = true;
+      enable = mkDefault true;
       luksSupport = {
-        enable = true;
-        devices = [ "enc" ];
+        enable = mkDefault true;
+        devices = mkDefault [ "enc" ];
       };
     };
-    wallpapers.enable = true;
+    wallpapers.enable = mkDefault true;
     theming = {
-      enable = true;
-      scheme = "catppuccin-macchiato";
-    };
-    virtualisation = {
-      podman.enable = true;
-      libvirtd.enable = true;
+      enable = mkDefault true;
+      scheme = mkDefault "catppuccin-macchiato";
     };
+    virtualisation.podman.enable = mkDefault true;
 
     programs = {
-      adb.enable = true;
-      hyprland.enable = true;
-      code.enable = true;
-      firefox = {
-        enable = true;
-        arkenfox = {
-          enable = true;
-          overrides = {
-            ## arkenfox overrides
-            # automatic search
-            "keyword.enabled" = true;
-            "browser.search.suggest.enabled" = true;
-            "browser.urlbar.suggest.searches" = true;
-
-            # startup page
-            "browser.startup.homepage" = "https://searxng.moritzboeh.me/";
-            "browser.startup.page" = 1;
-
-            # drm
-            "media.eme.enabled" = true;
-
-            # sanitisation
-            "privacy.clearOnShutdown.history" = false;
-
-            # disable letterboxing
-            "privacy.resistFingerprinting.letterboxing" = false;
-
-            ## OTHER
-            # Dont show warning when accessing about:config
-            "browser.aboutConfig.showWarning" = false;
-
-            # Hide bookmarks
-            "browser.toolbars.bookmarks.visibility" = "never";
-
-            # Smooth scrolling
-            "general.smoothScroll.lines.durationMaxMS" = 125;
-            "general.smoothScroll.lines.durationMinMS" = 125;
-            "general.smoothScroll.mouseWheel.durationMaxMS" = 200;
-            "general.smoothScroll.mouseWheel.durationMinMS" = 100;
-            "general.smoothScroll.msdPhysics.enabled" = true;
-            "general.smoothScroll.other.durationMaxMS" = 125;
-            "general.smoothScroll.other.durationMinMS" = 125;
-            "general.smoothScroll.pages.durationMaxMS" = 125;
-            "general.smoothScroll.pages.durationMinMS" = 125;
-            "mousewheel.min_line_scroll_amount" = 40;
-            "mousewheel.system_scroll_override_on_root_content.enabled" = true;
-            "mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
-            "mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
-            "toolkit.scrollbox.horizontalScrollDistance" = 6;
-            "toolkit.scrollbox.verticalScrollDistance" = 2;
-          };
-        };
-      };
-      git.signing = true;
-      gpg.enable = true;
-      hub.enable = true;
-      ledger.enable = true;
-      logseq.enable = true;
-      nvim.enable = true;
-      python.versions."311".enable = true;
-      ssh = {
-        enable = true;
-        includeSecrets = [ ../../secrets/ssh-home.age ];
-      };
-      spotify.enable = true;
-      thunar.enable = true;
-      zathura.enable = true;
+      chromium.enable = mkDefault true;
+      firefox.enable = mkDefault true;
+      gpg.enable = mkDefault true;
+      hyprland.enable = mkDefault true;
+      logseq.enable = mkDefault true;
+      nvim.enable = mkDefault true;
+      python.versions."311".enable = mkDefault true;
+      spotify.enable = mkDefault true;
+      ssh.enable = mkDefault true;
+      thunar.enable = mkDefault true;
+      zathura.enable = mkDefault true;
     };
     services = {
-      dunst.enable = true;
-      kdeconnect.enable = true;
-      mullvad.enable = true;
-      openconnect.enable = true;
-      printing.enable = true;
+      dunst.enable = mkDefault true;
       gammastep.enable = true;
+      kdeconnect.enable = mkDefault true;
+      printing.enable = true;
       wireguard.enable = true;
     };
   };
 
   environment.systemPackages = with pkgs; [
-    # nix
-    nixpkgs-review
-
-    # ripping
-    abcde
-    handbrake
-    picard
-
-    # other
     anki
     calibre
-    jellyfin-media-player
     keepassxc
-    stable.libreoffice # HACK to fix build error
+    nixpkgs-review
     pavucontrol
+    stable.libreoffice # HACK to fix build error
     stable.signal-desktop
-    tlaplusToolbox
-    vlc
-    thunderbird
-    plantuml
-
-    jetbrains.pycharm-professional
-
     synology-drive-client
-
     texlive.combined.scheme-full
+    thunderbird
+    vlc
   ];
 
-  programs = {
-    chromium.enable = true;
-    nix-ld.enable = true;
-  };
+  programs.nix-ld.enable = true;
 
   home-manager.users.moritz = {
     services.nextcloud-client = {
@@ -148,7 +69,5 @@ with lib; {
       alsa.enable = true;
       pulse.enable = true;
     };
-    # Remap capslock to esc and shift + capslock to capslock
-    xserver.xkbOptions = "terminate:ctrl_alt_bksp,caps:escape_shifted_capslock";
   };
 }

modules/profiles/personal.nix

@@ -0,0 +1,60 @@
+{ lib, ... }:
+
+with lib;
+{
+  my = {
+    services.openconnect.enable = true;
+    programs = {
+      ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
+      git.signing = mkDefault true;
+      hub.enable = mkDefault true;
+      firefox.arkenfox = {
+        enable = mkDefault true;
+        overrides = mkDefault {
+          ## arkenfox overrides
+          # automatic search
+          "keyword.enabled" = true;
+          "browser.search.suggest.enabled" = true;
+          "browser.urlbar.suggest.searches" = true;
+
+          # startup page
+          "browser.startup.homepage" = "https://searxng.moritzboeh.me/";
+          "browser.startup.page" = 1;
+
+          # drm
+          "media.eme.enabled" = true;
+
+          # sanitisation
+          "privacy.clearOnShutdown.history" = false;
+
+          # disable letterboxing
+          "privacy.resistFingerprinting.letterboxing" = false;
+
+          ## OTHER
+          # Dont show warning when accessing about:config
+          "browser.aboutConfig.showWarning" = false;
+
+          # Hide bookmarks
+          "browser.toolbars.bookmarks.visibility" = "never";
+
+          # Smooth scrolling
+          "general.smoothScroll.lines.durationMaxMS" = 125;
+          "general.smoothScroll.lines.durationMinMS" = 125;
+          "general.smoothScroll.mouseWheel.durationMaxMS" = 200;
+          "general.smoothScroll.mouseWheel.durationMinMS" = 100;
+          "general.smoothScroll.msdPhysics.enabled" = true;
+          "general.smoothScroll.other.durationMaxMS" = 125;
+          "general.smoothScroll.other.durationMinMS" = 125;
+          "general.smoothScroll.pages.durationMaxMS" = 125;
+          "general.smoothScroll.pages.durationMinMS" = 125;
+          "mousewheel.min_line_scroll_amount" = 40;
+          "mousewheel.system_scroll_override_on_root_content.enabled" = true;
+          "mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
+          "mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
+          "toolkit.scrollbox.horizontalScrollDistance" = 6;
+          "toolkit.scrollbox.verticalScrollDistance" = 2;
+        };
+      };
+    };
+  };
+}

modules/profiles/ripping.nix

@@ -0,0 +1,32 @@
+{ pkgs }:
+
+{
+  environment.systemPackages = with pkgs; [
+    # nix
+    nixpkgs-review
+
+    # ripping
+    abcde
+    handbrake
+    picard
+
+    # other
+    anki
+    calibre
+    jellyfin-media-player
+    keepassxc
+    stable.libreoffice # HACK to fix build error
+    pavucontrol
+    stable.signal-desktop
+    tlaplusToolbox
+    vlc
+    thunderbird
+    plantuml
+
+    jetbrains.pycharm-professional
+
+    synology-drive-client
+
+    texlive.combined.scheme-full
+  ];
+}

modules/programs/chromium.nix

@@ -0,0 +1,26 @@
+{ config
+, lib
+, pkgs
+, ...
+}:
+
+with lib;
+let
+  cfg = config.my.programs.chromium;
+in
+{
+  options.my.programs.chromium = {
+    enable = mkEnableOption "chromium";
+    package = mkOption {
+      type = types.package;
+      default = pkgs.stable.chromium;
+      defaultText = "pkgs.chromium";
+      description = "Chromium package to install.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.chromium.enable = true;
+    environment.systemPackages = [ cfg.package ];
+  };
+}

modules/programs/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./adb.nix
     ./bspwm
+    ./chromium.nix
     ./code.nix
     ./direnv.nix
     ./firefox.nix
@@ -17,13 +18,13 @@
     ./ledger
     ./logseq.nix
     ./miracast.nix
+    ./nvim
     ./python.nix
     ./rofi
     ./spotify.nix
     ./ssh.nix
     ./sway.nix
     ./thunar.nix
-    ./nvim
     ./zathura.nix
     ./zsh.nix
   ];

modules/programs/hyprland/config.nix

@@ -43,8 +43,8 @@ in
   general {
       # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-      gaps_in = 5
-      gaps_out = 5
+      gaps_in = 3
+      gaps_out = 3
       border_size = 2
       col.active_border = rgba(1affffee)
       col.inactive_border = rgba(595959aa)

modules/programs/nvim/init.lua

@@ -1,11 +1,15 @@
 vim.loader.enable()
 
+-- Load custom treesitter grammar for org filetype
+require("orgmode").setup_ts_grammar()
 require("nvim-treesitter.configs").setup({
   sync_install = false,
   auto_install = false,
   highlight = {
     enable = true,
-    additional_vim_regex_highlighting = false,
+    -- Required for spellcheck, some LaTex highlights and
+    -- code block highlights that do not have ts grammar
+    additional_vim_regex_highlighting = { "org" },
   },
 })
 

modules/programs/nvim/plugins/orgmode.lua

@@ -1,18 +1,4 @@
-local orgmode = require("orgmode")
--- Load custom treesitter grammar for org filetype
-orgmode.setup_ts_grammar()
--- Treesitter configuration
-require("nvim-treesitter.configs").setup({
-  -- If TS highlights are not enabled at all, or disabled via `disable` prop,
-  -- highlighting will fallback to default Vim syntax highlighting
-  highlight = {
-    enable = true,
-    -- Required for spellcheck, some LaTex highlights and
-    -- code block highlights that do not have ts grammar
-    additional_vim_regex_highlighting = { "org" },
-  },
-})
-orgmode.setup({
+require("orgmode").setup({
   org_agenda_files = { "~/Notes/org" },
   org_default_notes_file = "~/Notes/org/refile.org",
 })

modules/security/default.nix

@@ -11,10 +11,10 @@
 
   # tmpfs = /tmp is mounted in ram. Doing so makes temp file management speedy
   # on ssd systems, and volatile! Because it's wiped on reboot.
-  boot.tmpOnTmpfs = lib.mkDefault true;
+  boot.tmp.useTmpfs = lib.mkDefault true;
   # If not using tmpfs, which is naturally purged on reboot, we must clean it
   # /tmp ourselves. /tmp should be volatile storage!
-  boot.cleanTmpDir = lib.mkDefault (!config.boot.tmpOnTmpfs);
+  boot.tmp.cleanOnBoot = lib.mkDefault (!config.boot.tmpOnTmpfs);
 
   # Fix a security hole in place for backwards compatibility. See desc in
   # nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

overlays/packages.nix

@@ -5,6 +5,5 @@ _: prev:
   agenix = inputs.agenix.packages.${prev.system}.default;
   attic = inputs.attic.packages.${prev.system}.default;
   hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
-  neovim-nightly = inputs.neovim.packages.${prev.system}.default;
   nil = inputs.nil.packages.${prev.system}.default;
 }

overlays/vimPlugins.nix

@@ -43,5 +43,10 @@ with lib.my;
       version = mkVersionInput inputs.gitignore-nvim;
       src = inputs.gitignore-nvim;
     };
+
+    bufferline-nvim = prev.vimPlugins.bufferline-nvim.overrideAttrs (_: {
+      version = mkVersionInput inputs.bufferline-nvim;
+      src = inputs.bufferline-nvim;
+    });
   };
 }