flake.lock

@@ -664,26 +664,6 @@
         "type": "github"
       }
     },
-    "nix-index-database": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1696736548,
-        "narHash": "sha256-Dg0gJ9xVXud55sAbXspMapFYZOpVAldQQo7MFp91Vb0=",
-        "owner": "Mic92",
-        "repo": "nix-index-database",
-        "rev": "2902dc66f64f733bfb45754e984e958e9fe7faf9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "nix-index-database",
-        "type": "github"
-      }
-    },
     "nix-lazy-nvim": {
       "locked": {
         "lastModified": 1694868321,
@@ -709,17 +689,16 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1685886360,
+        "lastModified": 1695405275,
-        "narHash": "sha256-mQ6Eryo7CFkt8KHVJcbg0HfXMGFrjMq04XnL9b9TsX0=",
+        "narHash": "sha256-R4TX73TAzrW03Rdsa4HNz5ASKx5S1AKa/3SAntUHglg=",
         "owner": "privatevoid-net",
         "repo": "nix-super",
-        "rev": "518ce777422c6ade8988a3dd1bebb407a08f3851",
+        "rev": "cae2c834f2a19db35cd46d233f5b59086b24a6f1",
         "type": "github"
       },
       "original": {
         "owner": "privatevoid-net",
         "repo": "nix-super",
-        "rev": "518ce777422c6ade8988a3dd1bebb407a08f3851",
         "type": "github"
       }
     },
@@ -967,21 +946,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "locked": {
-        "lastModified": 1696923989,
-        "narHash": "sha256-cANE1rSfOb3yxQ+bH7CTXZbj34AnQyzu0g22JDbLUpE=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "0268065df586f8cae6b648432ebbda3b5ac96503",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
@@ -1089,12 +1053,10 @@
         "impermanence": "impermanence",
         "master": "master",
         "neovim-nightly-overlay": "neovim-nightly-overlay",
-        "nix-index-database": "nix-index-database",
         "nix-lazy-nvim": "nix-lazy-nvim",
         "nix-super": "nix-super",
         "nixpkgs": "nixpkgs_8",
         "none-ls-nvim": "none-ls-nvim",
-        "nur": "nur",
         "nvim-lspconfig": "nvim-lspconfig",
         "nvim-puppeteer": "nvim-puppeteer",
         "nvim-treesitter": "nvim-treesitter",

flake.nix

@@ -16,13 +16,10 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     stable.url = "github:nixos/nixpkgs/nixos-23.05";
-    nur.url = "github:nix-community/NUR";
-    nix-index-database.url = "github:Mic92/nix-index-database";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
 
     # Programs
     nix-super.inputs.nixpkgs.follows = "stable";
-    nix-super.url = "github:privatevoid-net/nix-super/518ce777422c6ade8988a3dd1bebb407a08f3851"; # NOTE: because nix 1.18 is borked
+    nix-super.url = "github:privatevoid-net/nix-super";
     rofi-wayland.flake = false;
     rofi-wayland.url = "github:lbonn/rofi/wayland";
     timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";
@@ -87,10 +84,6 @@
               inherit (prev) system;
               overlays = defaultOverlays;
             };
-            nur = import inputs.nur {
-              pkgs = prev;
-              nurpkgs = prev;
-            };
           }
         )
       ];
@@ -200,7 +193,6 @@
                 inputs.disko.nixosModules.default
                 inputs.home-manager.nixosModule
                 inputs.impermanence.nixosModules.impermanence
-                inputs.nix-index-database.nixosModules.nix-index
                 path
               ];
           })

hosts/nixos-laptop/impermanence.nix

@@ -41,7 +41,6 @@
         ".local/share/nvim"
         ".local/share/zoxide"
         ".local/state/nvim"
-        ".config/kdeconnect"
         ".mozilla"
         "Documents"
         "Downloads"

modules/profiles/base.nix

@@ -173,8 +173,8 @@ in
 
   programs = {
     mtr.enable = true;
+    command-not-found.enable = true;
     starship.enable = true;
-    command-not-found.enable = false;
   };
 
   services = {

modules/programs/firefox.nix

@@ -1,7 +1,6 @@
 { config
 , lib
 , inputs
-, pkgs
 , ...
 }:
 
@@ -34,27 +33,13 @@ in
   config = mkIf cfg.enable {
     home-manager.users.moritz.programs.firefox = {
       enable = true;
-      profiles."default" = {
+      profiles."default".extraConfig = mkIf cfg.arkenfox.enable ''
-        extraConfig = mkIf cfg.arkenfox.enable ''
         // Arkenfox user.js
         ${arkenfox}
 
         // Overrides
         ${cfg.arkenfox.overrides}
       '';
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-          darkreader
-          firefox-color
-          istilldontcareaboutcookies
-          kagi-search
-          keepassxc-browser
-          languagetool
-          multi-account-containers
-          ublock-origin
-          wikiwand-wikipedia-modernized
-          vimium
-        ];
-      };
     };
   };
 }

modules/programs/hyprland/_config.nix

@@ -111,10 +111,10 @@ in
   }
 
   misc {
+    # disable_hypr_chan = true
     vrr = 1
     mouse_move_enables_dpms = true
     key_press_enables_dpms = true
-    force_default_wallpaper = 0
   }
 
   # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more

modules/programs/hyprland/default.nix

@@ -55,10 +55,15 @@ in
     };
 
     home-manager.users.moritz = {
+
+      # import home-manager module
+      imports = [ inputs.hyprland.homeManagerModules.default ];
+
       # enable home-manager module
       wayland.windowManager.hyprland = {
         enable = true;
         package = hyprland;
+        recommendedEnvironment = true;
         extraConfig = import ./_config.nix args;
       };
 
@@ -128,7 +133,7 @@ in
               timeout = 30 * 60;
               command = "${pkgs.systemd}/bin/systemctl suspend-and-hibernate";
             };
-        systemdTarget = "graphical-session.target";
+        systemdTarget = "hyprland-session.target";
       };
 
       systemd.user.services.nextcloud-client.Service = {
@@ -137,11 +142,19 @@ in
       };
     };
 
+
     # adds pam module for swaylock
     security.pam.services.swaylock = { };
 
+    # only consider graphical-session.target started when hyprland-sesstion.target is reached
+    systemd.user.targets.hyprland-session = {
+      partOf = [ "graphical-session.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      before = [ "graphical-session.target" ];
+    };
+
     systemd.user.services.xdg-desktop-portal-hyprland = {
-      after = [ "hyprland-session.target" ];
+      after = [ "hyrpland-session.target" ];
       requiredBy = [ "xdg-desktop-portal.service" ];
     };
 

overlays/packages.nix

@@ -11,10 +11,4 @@ final: prev:
   });
   timers = inputs.timers.packages.${prev.system}.default;
   hyprland = inputs.hyprland.packages.${prev.system}.default;
-
-  xorg = prev.xorg // {
-    lndir = prev.xorg.lndir.overrideAttrs (_: {
-      meta.mainProgram = "lndir";
-    });
-  };
 }

overlays/vimPlugins.nix

@@ -6,25 +6,25 @@ with lib.my;
   vimPlugins = prev.vimPlugins // {
     inherit (inputs.codeium-nvim.packages.${prev.system}.vimPlugins) codeium-nvim;
 
-    smartcolumn-nvim = prev.vimUtils.buildVimPlugin {
+    smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "smartcolumn-nvim";
       version = mkVersionInput inputs.smartcolumn-nvim;
       src = inputs.smartcolumn-nvim;
     };
 
-    telekasten-nvim = prev.vimUtils.buildVimPlugin {
+    telekasten-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "telekasten-nvim";
       version = mkVersionInput inputs.telekasten-nvim;
       src = inputs.telekasten-nvim;
     };
 
-    hmts-nvim = prev.vimUtils.buildVimPlugin {
+    hmts-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "hmts-nvim";
       version = mkVersionInput inputs.hmts-nvim;
       src = inputs.hmts-nvim;
     };
 
-    actions-preview-nvim = prev.vimUtils.buildVimPlugin {
+    actions-preview-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "actions-preview-nvim";
       version = mkVersionInput inputs.actions-preview-nvim;
       src = inputs.actions-preview-nvim;
@@ -46,7 +46,7 @@ with lib.my;
       src = inputs.nvim-lspconfig;
     });
 
-    nvim-puppeteer = prev.vimUtils.buildVimPlugin {
+    nvim-puppeteer = prev.vimUtils.buildVimPluginFrom2Nix {
       pname = "nvim-puppeteer";
       version = mkVersionInput inputs.nvim-puppeteer;
       src = inputs.nvim-puppeteer;