Seperate user

flake.lock

@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "disko": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1715217706,
-        "narHash": "sha256-yEB5SEHc+o3WJpUPw455OdLy9A+gffvCJX8DZ7NCkuo=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "8eb1b315eef89f3bdc5c9814d1b207c6d64f0046",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
     "hardware": {
       "locked": {
         "lastModified": 1715148395,
@@ -37,16 +17,14 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1715348159,
+        "lastModified": 1715486357,
-        "narHash": "sha256-nP0PJZ3dR0ols1V+w+sYBki7JlSRFvFJ8J8B00Oa7BM=",
+        "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "223743313bab8b0b44a57eaf9573de9f69082b4d",
+        "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
         "type": "github"
       },
       "original": {
@@ -57,11 +35,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715087517,
+        "lastModified": 1715447595,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
+        "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
         "type": "github"
       },
       "original": {
@@ -87,51 +65,28 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
+    "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1714858427,
+        "lastModified": 1715447595,
-        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
+        "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
+        "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
-        "disko": "disko",
         "hardware": "hardware",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
-        "sops-nix": "sops-nix"
+        "nixpkgs-unstable": "nixpkgs-unstable"
-      }
-    },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
-      },
-      "locked": {
-        "lastModified": 1715244550,
-        "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=",
-        "owner": "mic92",
-        "repo": "sops-nix",
-        "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mic92",
-        "repo": "sops-nix",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -4,49 +4,48 @@
   inputs = {
     # NixOS official package source, using the nixos-23.11 branch here
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
 
     home-manager = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-unstable.follows = "nixpkgs";
     };
 
 
 
-    # Declarative partitioning and formatting
+#    # Declarative partitioning and formatting
-    disko = {
+#    disko = {
-      url = "github:nix-community/disko";
+#      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
+#      inputs.nixpkgs.follows = "nixpkgs";
-    };
+#    };
-
+#
-    # Secrets management. See ./docs/secretsmgmt.md
+#    # Secrets management. See ./docs/secretsmgmt.md
-    sops-nix = {
+#    sops-nix = {
-      url = "github:mic92/sops-nix";
+#      url = "github:mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+#      inputs.nixpkgs.follows = "nixpkgs";
-    };
+#    };
 
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs: {
+  outputs = { self, nixpkgs-unstable, home-manager, ... }@inputs: {
     # Please replace my-nixos with your hostname
-    nixosConfigurations.Lenni = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.Lenni = nixpkgs-unstable.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
         # Import the previous configuration.nix we used,
         # so the old configuration file still takes effect
 
-        ./hosts/common
+        
         home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-
+            #home-manager.users.willifan = import ./users/willifan/home;
-            home-manager.users.willifan = import ./home/willifan;
-
             # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
           }
-        
+        ./hosts/common
+        ./users/willifan
       ];
     };
   };

home/willifan/default.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.bash.enable = true;
-  nixpkgs.config.allowUnfree = true;
-  imports = [
-    ./graphical
-    ./git.nix
-  ];
-  
-  home.stateVersion = "23.11";
-}
-

home/willifan/git.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.git = {
-    enable = true;
-    package = pkgs.gitAndTools.gitFull;
-    userName = "willifan";
-    userEmail = "willifan@proton.me";
-    extraConfig = {
-      init.defaultBranch = "main";
-    };
-  };
-}

home/willifan/graphical/default.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-
-  imports = [
-    ./dev
-#    ./hyprland
-    ./theme
-  ];
-
-}
-

home/willifan/graphical/dev/vscodium.nix

@@ -1,52 +0,0 @@
-{ pkgs, ... }:
-
-{
-programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-    extensions = with pkgs.vscode-extensions; [
-      # System
-      bbenoist.nix
-      #fireblast.hyprlang-vscode
-      #eww-yuck.yuck
-
-      #Rust
-      rust-lang.rust-analyzer
-      serayuzgur.crates
-      bungcip.better-toml
-      vadimcn.vscode-lldb
-      usernamehw.errorlens
-
-      #C/C++
-      ms-vscode.cpptools
-      twxs.cmake
-      ms-vscode.cmake-tools
-
-      #Shell
-      timonwong.shellcheck
-      mads-hartmann.bash-ide-vscode
-
-      #Git
-      #phil294.git-log--graph
-    ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-      {
-        name = "hyprlang-vscode";
-        publisher = "fireblast";
-        version = "0.0.1";
-        sha256 = "lSMihMIue0qu9+97EgT5dqjbzsey0TLZDpJby+Piip4=";
-      }
-      {
-        name = "yuck";
-        publisher = "eww-yuck";
-        version = "0.0.3";
-        sha256 = "DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM=";
-      }
-      {
-        name = "git-log--graph";
-        publisher = "phil294";
-        version = "0.1.15";
-        sha256 = "lvjDkvXSX7rw7HyyK3WWQLnGezvL6FPEgtjIi8KWkU0=";
-      }
-    ];
-  };
-}

home/willifan/graphical/theme/gtk.nix

@@ -1,44 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  gtk = {
-    enable = true;
-    font = {
-      name = "jetbrains-mono";
-      package = pkgs.jetbrains-mono;
-    };
-
-    theme = {
-      name = "rose-pine";
-      package = pkgs.rose-pine-gtk-theme;
-    };
-
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-
-    #TODO add ascendancy cursor pack
-    #cursortTheme.name = "";
-    #cursortTheme.package = ;
-
-    gtk3.extraConfig = {
-      Settings = ''
-        gtk-application-prefer-dark-theme=1
-      '';
-    };
-    gtk4 = {
-      extraConfig = {
-        Settings = ''
-          gtk-application-prefer-dark-theme=1
-        '';
-      };
-      extraCss = ''
-        .sidebar-pane {
-          background-color: rgb(42, 42, 42);
-        }
-      '';
-      
-    };
-  };
-}

hosts/common/default.nix

@@ -3,17 +3,8 @@
   networking.hostName = "Lenni";
   imports = [
     ./hardware-configuration.nix
-    ./applications.nix
+    ./nix-ld.nix
-    ./auto-cpufreq.nix
-    ./envvar.nix
-    ./nix-ld-nix
-    ./pipewire.nix
-    ./polkit.nix
-    ./syncthing.nix
-    ./udev.nix
-    ./user.nix
     ./boot.nix
-    ./locales.nix
   ];
   
   networking.networkmanager.enable = true;

users/willifan/default.nix

@@ -0,0 +1,20 @@
+{ pkgs, home-manager, ... }:
+{
+  imports = [
+    ./graphical
+    
+    ./applications.nix
+    ./auto-cpufreq.nix
+    ./envvar.nix
+    ./git.nix
+    ./locales.nix
+    ./pipewire.nix
+    ./polkit.nix
+    #./ssh.nix
+    ./syncthing.nix
+    ./udev.nix
+    ./user.nix
+    #./zsh.nix
+  ];
+  home-manager.users.willifan.home.stateVersion = "23.11";
+}

users/willifan/git.nix

@@ -0,0 +1,14 @@
+{ pkgs, home-manager, ... }:
+{
+  home-manager.users.willifan = {
+    programs.git = {
+      enable = true;
+      package = pkgs.gitAndTools.gitFull;
+      userName = "willifan";
+      userEmail = "willifan@proton.me";
+      extraConfig = {
+        init.defaultBranch = "main";
+      };
+    };
+  };
+}

users/willifan/graphical/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, home-manager-unstable, ... }:
+
+{
+
+  imports = [
+    ./dev
+    #./hyprland
+    ./theme
+
+    #./firefox.nix
+    #./kitty.nix
+    #./thunderbird.nix
+  ];
+
+}
+

users/willifan/graphical/dev/vscodium.nix

@@ -0,0 +1,54 @@
+{ pkgs, home-manager, ... }:
+
+{
+  home-manager.users.willifan = {
+    programs.vscode = {
+      enable = true;
+      package = pkgs.vscodium;
+      extensions = with pkgs.vscode-extensions; [
+        # System
+        bbenoist.nix
+        #fireblast.hyprlang-vscode
+        #eww-yuck.yuck
+
+        #Rust
+        rust-lang.rust-analyzer
+        serayuzgur.crates
+        bungcip.better-toml
+        vadimcn.vscode-lldb
+        usernamehw.errorlens
+
+        #C/C++
+        ms-vscode.cpptools
+        twxs.cmake
+        ms-vscode.cmake-tools
+
+        #Shell
+        timonwong.shellcheck
+        mads-hartmann.bash-ide-vscode
+
+        #Git
+        #phil294.git-log--graph
+      ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        {
+          name = "hyprlang-vscode";
+          publisher = "fireblast";
+          version = "0.0.1";
+          sha256 = "lSMihMIue0qu9+97EgT5dqjbzsey0TLZDpJby+Piip4=";
+        }
+        {
+          name = "yuck";
+          publisher = "eww-yuck";
+          version = "0.0.3";
+          sha256 = "DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM=";
+        }
+        {
+          name = "git-log--graph";
+          publisher = "phil294";
+          version = "0.1.15";
+          sha256 = "lvjDkvXSX7rw7HyyK3WWQLnGezvL6FPEgtjIi8KWkU0=";
+        }
+      ];
+    };
+  };
+}

users/willifan/graphical/theme/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, home-manager-unstable, ... }:
 
 {
   imports = [

users/willifan/graphical/theme/gtk.nix

@@ -0,0 +1,46 @@
+{ pkgs, home-manager, ... }:
+
+{
+  home-manager.users.willifan = {
+    gtk = {
+      enable = true;
+      font = {
+        name = "jetbrains-mono";
+        package = pkgs.jetbrains-mono;
+      };
+
+      theme = {
+        name = "rose-pine";
+        package = pkgs.rose-pine-gtk-theme;
+      };
+
+      iconTheme = {
+        name = "Papirus-Dark";
+        package = pkgs.papirus-icon-theme;
+      };
+
+      #TODO add ascendancy cursor pack
+      #cursortTheme.name = "";
+      #cursortTheme.package = ;
+
+      gtk3.extraConfig = {
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
+      gtk4 = {
+        extraConfig = {
+          Settings = ''
+            gtk-application-prefer-dark-theme=1
+          '';
+        };
+        extraCss = ''
+          .sidebar-pane {
+            background-color: rgb(42, 42, 42);
+          }
+        '';
+
+      };
+    };
+  };
+}

users/willifan/ssh.nix

@@ -0,0 +1,6 @@
+{ pkgs, home-manager, ... }:
+{
+  home-manager.users.willifan = {
+    
+  };
+}

users/willifan/zsh.nix

@@ -0,0 +1,6 @@
+{ pkgs, home-manager, ... }:
+{
+  home-manager.users.willifan = {
+    
+  };
+}