various stuff

default.nix

@@ -8,7 +8,7 @@ in
 {
   imports = [
       inputs.home-manager.nixosModules.home-manager
-      inputs.nixvim.nixosModules.nixvim
+      inputs.nvf.nixosModules.default
       inputs.stylix.nixosModules.stylix
       inputs.nix-minecraft.nixosModules.minecraft-servers
       inputs.sops-nix.nixosModules.sops

flake.lock

@@ -190,10 +190,7 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib_2"
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1738453229,
@@ -446,34 +443,6 @@
         "type": "github"
       }
     },
-    "ixx": {
-      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.6",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
     "lib-aggregate": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -493,6 +462,21 @@
         "type": "github"
       }
     },
+    "mnw": {
+      "locked": {
+        "lastModified": 1738852285,
+        "narHash": "sha256-8Y1uyE6gGHxdU0Vcx2CMg/dAmDSxJw19aAl3TKbbo54=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "6ae73dc9cb72cea17bcc2e3d4670825f483e80e8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
     "mozilla": {
       "flake": false,
       "locked": {
@@ -509,6 +493,32 @@
         "type": "github"
       }
     },
+    "nil": {
+      "inputs": {
+        "flake-utils": [
+          "nvf",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nvf",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1732053863,
+        "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=",
+        "owner": "oxalica",
+        "repo": "nil",
+        "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "nil",
+        "type": "github"
+      }
+    },
     "nix-minecraft": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -529,6 +539,21 @@
         "type": "github"
       }
     },
+    "nixos-boot": {
+      "locked": {
+        "lastModified": 1722927293,
+        "narHash": "sha256-8oCsiFyAuidAdhSz60Lu8+TwCPHxaeWixyv0xT0mLt4=",
+        "owner": "Melkor333",
+        "repo": "nixos-boot",
+        "rev": "afaed735149d0a06f234e54dd2d9db2e18dc64ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Melkor333",
+        "repo": "nixos-boot",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1740695751,
@@ -560,6 +585,18 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1740828860,
@@ -625,6 +662,22 @@
       }
     },
     "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1740303746,
+        "narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2d068ae5c6516b2d04562de50a58c682540de9bf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1731763621,
         "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
@@ -640,7 +693,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1740367490,
         "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
@@ -656,7 +709,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1727348695,
         "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
@@ -672,26 +725,20 @@
         "type": "github"
       }
     },
-    "nixvim": {
+    "nmd": {
-      "inputs": {
+      "flake": false,
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nuschtosSearch": "nuschtosSearch"
-      },
       "locked": {
-        "lastModified": 1740520037,
+        "lastModified": 1705050560,
-        "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=",
+        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
-        "owner": "nix-community",
+        "owner": "~rycee",
-        "repo": "nixvim",
+        "repo": "nmd",
-        "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666",
+        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
-        "type": "github"
+        "type": "sourcehut"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "~rycee",
-        "repo": "nixvim",
+        "repo": "nmd",
-        "type": "github"
+        "type": "sourcehut"
       }
     },
     "nur": {
@@ -717,26 +764,27 @@
         "type": "github"
       }
     },
-    "nuschtosSearch": {
+    "nvf": {
       "inputs": {
+        "flake-parts": "flake-parts",
         "flake-utils": "flake-utils_3",
-        "ixx": "ixx",
+        "mnw": "mnw",
-        "nixpkgs": [
+        "nil": "nil",
-          "nixvim",
+        "nixpkgs": "nixpkgs_5",
-          "nixpkgs"
+        "nmd": "nmd",
-        ]
+        "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1738508923,
+        "lastModified": 1741546504,
-        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
+        "narHash": "sha256-dtdj9RWtsIiSa0H6XDY3c9gXKMN22RxgIvQtMHArd3w=",
-        "owner": "NuschtOS",
+        "owner": "notashelf",
-        "repo": "search",
+        "repo": "nvf",
-        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
+        "rev": "c8fd6204d02596462e354cf35b029cd6a86ce24b",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
+        "owner": "notashelf",
-        "repo": "search",
+        "repo": "nvf",
         "type": "github"
       }
     },
@@ -770,9 +818,10 @@
         "flux": "flux",
         "home-manager": "home-manager",
         "nix-minecraft": "nix-minecraft",
+        "nixos-boot": "nixos-boot",
         "nixpkgs": "nixpkgs_4",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "nixvim": "nixvim",
+        "nvf": "nvf",
         "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
@@ -796,9 +845,31 @@
         "type": "github"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nvf",
+          "nil",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731983527,
+        "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1741043164,
@@ -826,9 +897,9 @@
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "nur": "nur",
-        "systems": "systems_4",
+        "systems": "systems_5",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -909,6 +980,21 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -1015,7 +1101,7 @@
     },
     "zen-browser": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1727721329,

flake.nix

@@ -16,10 +16,9 @@
       inputs.home-manager.follows = "home-manager";
     };
 
-    nixvim = {
+    nvf.url = "github:notashelf/nvf";
-      url = "github:nix-community/nixvim";
+
-      inputs.nixpkgs.follows = "nixpkgs";
+    nixos-boot.url = "github:Melkor333/nixos-boot";
-    };
 
     firefox.url = "github:nix-community/flake-firefox-nightly";
 

hosts/chris-laptop/default.nix

@@ -9,7 +9,7 @@
       polarity = "dark";
     };
 
-    system.audio = true;
+    system.audio.enable = true;
     networking.enable = true;
 
     desktop = {

hosts/chris-pc/default.nix

@@ -2,6 +2,8 @@
 {
   imports = [ ./hardware.nix ];
 
+  user.name = "chris";
+
   fileSystems."/home/chris/games" = {
     device = "/dev/disk/by-label/games";
     fsType = "ext4";
@@ -52,7 +54,7 @@
       };
 
       editors = {
-        default = "nano";
+        default = "zed";
         vscodium.enable = true;
         zed.enable = true;
         nvim.enable = true;

hosts/chris-pc/users/chris.nix

@@ -0,0 +1,65 @@
+// { config, lib, pkgs, ... }:
+// {
+//   full_name = "WOOT";
+
+//   modules = {
+//     themes = {
+//       enable = true;
+//       theme = "everforest";
+//       polarity = "dark";
+//     };
+
+//     develop = {
+//       rust.enable = true;
+//       js.enable = true;
+//       dotnet.enable = true;
+//     };
+
+//     # EXPERIMENTS
+//     # services.games.minecraft.enable = true;
+//     services.auth.enable = true;
+
+//     desktop = {
+//       plasma.enable = true;
+//       type = "wayland";
+
+//       applications = {
+//         communication.enable = true;
+//         email.enable = true;
+//         office.enable = true;
+//         steam.enable = true;
+//         recording.enable = true;
+//       };
+
+//       terminal = {
+//         default = "ghostty";
+//         alacritty.enable = true;
+//         ghostty.enable = true;
+//       };
+
+//       editors = {
+//         default = "zed";
+//         vscodium.enable = true;
+//         zed.enable = true;
+//         nvim.enable = true;
+//         nano.enable = true;
+//         kate.enable = true;
+//       };
+
+//       browsers = {
+//         default = "chromium";
+//         firefox.enable = true;
+//         chrome.enable = true;
+//       };
+
+//       games = {
+//         minecraft.enable = true;
+//       };
+//     };
+
+//     shell = {
+//       default = "zsh";
+//       corePkgs.enable = true;
+//     };
+//   };
+// }

hosts/mam-laptop/default.nix

@@ -1,15 +1,21 @@
 { config, lib, pkgs, ... }:
 {
-  imports = [ ./hardware.nix ];
+  # imports = [ ./hardware.nix ];
+
+  user_name = "moeke";
+  # user = {
+  #   name = "moeke";
+  #   display_name = "Ons mam";
+  # };
 
   modules = {
     themes = {
       enable = true;
       theme = "everforest";
-      polarity = "dark";
+      polarity = "light";
     };
 
-    system.audio = true;
+    system.audio.enable = true;
     networking.enable = true;
 
     desktop = {
@@ -26,9 +32,8 @@
       };
 
       browsers = {
-        default = "firefox";
+        default = "chrome";
-        firefox.enable = true;
+        chrome.enable=true;
-        firefox.privacy.enable = true;
       };
     };
 

lib/nixos.nix

@@ -15,6 +15,7 @@ in rec
       specialArgs = { inherit lib inputs system; };
 
       modules = [
+        inputs.nixos-boot.nixosModules.default
         {
           nixpkgs.pkgs = pkgs;
           networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path));

modules/desktop/applications/communication.nix

@@ -15,7 +15,7 @@ in
   config = mkIf cfg.enable
   {
     user.packages = attrValues {
-      inherit (pkgs) vesktop teamspeak_client whatsapp-for-linux;
+      inherit (pkgs) vesktop teamspeak_client;
     };
   };
 }

modules/desktop/editors/nvim.nix

@@ -9,39 +9,23 @@ in
   in { enable = mkEnableOption "neo-vim (nixvim)"; };
 
   config = mkIf config.modules.desktop.editors.nvim.enable {
-    programs.nixvim = {
+    programs.nvf = {
       enable = true;
+      settings = {
+        vim = {
+          statusline.lualine.enable = true;
+          telescope.enable = true;
+          autocomplete.nvim-cmp.enable = true;
 
-      opts = {
+          languages = {
-        number = true;
+            enableLSP = true;
+            enableTreesitter = true;
 
-        shiftwidth = 2;
+            nix.enable = true;
-      };
+            ts.enable = true;
-
+            rust.enable = true;
-#       colorschemes.base16 = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
-#       colorschemes.everforest.enable = true;
-
-      plugins = {
-        lualine.enable = true;
-        lightline.enable = true;
-
-        lsp = {
-          enable = true;
-          servers = {
-            ts_ls.enable = true;
-            lua_ls.enable = true;
-            rust_analyzer = {
-              enable = true;
-              installRustc = true;
-              installCargo = true;
-            };
           };
         };
-
-        cmp = {
-          enable = true;
-          autoEnableSources = true;
-        };
       };
     };
   };

modules/desktop/plasma.nix

@@ -19,7 +19,7 @@ in
         };
         autoLogin = {
           enable = true;
-          user = "chris";
+          user = config.user.name;
         };
       };
 

modules/options.nix

@@ -1,16 +1,13 @@
 { inputs, config, options, lib, pkgs, ... }:
 let
-  inherit (builtins) elem isList pathExists toString;
+  inherit (builtins) pathExists toString;
-  inherit (lib.attrsets) mapAttrs mapAttrsToList;
   inherit (lib.lists) findFirst;
   inherit (lib.modules) mkAliasDefinitions;
-  inherit (lib.strings) concatMapStringsSep concatStringsSep;
-  inherit (lib.my) mkOpt mkOpt';
 in
 {
   options = let
-    inherit (lib.options) mkOption;
+    inherit (lib.types) attrs path str;
-    inherit (lib.types) attrs attrsOf either listOf oneOf path str;
+    inherit (lib.my) mkOpt;
   in
   {
     user = mkOpt attrs {};
@@ -31,19 +28,18 @@ in
       pkgs.sops
     ];
 
-    user = let
+    nixos-boot = {
-      user = builtins.getEnv "USER";
+      enable = true;
-      name =
+
-        if builtins.elem user [ "" "root" ] then "chris"
+      bgColor = { red = 30; green = 30; blue = 30; };
-        else user;
+    };
-    in
+
-    {
+    user = {
-      inherit name;
+      name = "chris";
-#       description = "Primary user account";
       description = "Chris Kruining";
       extraGroups = [ "wheel" ];
       isNormalUser = true;
-      home = "/home/${name}";
+      home = "/home/chris";
       group = "users";
       uid = 1000;
     };
@@ -53,7 +49,6 @@ in
       useUserPackages = true;
       sharedModules = [
         inputs.plasma-manager.homeManagerModules.plasma-manager
-        inputs.nixvim.homeManagerModules.nixvim
       ];
     };
 
@@ -62,7 +57,9 @@ in
       sessionPath = [ "$SNEEUWVLOK_BIN" "$XDG_BIN_HOME" "$PATH" ];
     };
 
-    users.users.${config.user.name} = mkAliasDefinitions options.user;
+    users.users = {
+      ${config.user.name} = mkAliasDefinitions options.user;
+    };
 
     nix.settings = let users = [ "root" config.user.name ]; in
     {

modules/services/games/minecraft.nix

@@ -48,7 +48,7 @@ in
               bypassesPlayerLimit = false;
             }
           ];
-          jvmOpts = "-Xms4092M -Xmx4092M -XX:+UseG1GC -Djava.net.preferIPv4Stack=true";
+          jvmOpts = "-Xms2048M -Xmx2048M -XX:+UseG1GC";
         in {
           vanilla = {
             enable = true;

modules/system/security.nix

@@ -9,9 +9,16 @@
     sudo.execWheelOnly = true;
     acme.acceptTerms = true;
     polkit.enable = true;
-    pam.services.kwallet = {
+    pam = {
-      name = "kwallet";
+      u2f = {
-      enableKwallet = true;
+        enable = true;
+        settings.cue = true;
+      };
+
+      services.kwallet = {
+        name = "kwallet";
+        enableKwallet = true;
+      };
     };
   };
 

modules/themes/default.nix

@@ -37,6 +37,14 @@ in {
       image = ./${cfg.theme}.jpg;
       polarity = cfg.polarity;
 
+      targets = {
+        grub.enable = true;
+        plymouth.enable = true;
+        console.enable = true;
+        nixos-icons.enable = true;
+        qt.enable = true;
+      };
+
       fonts = {
         serif = {
           package = pkgs.dejavu_fonts;