organize

flake.nix

@@ -4,12 +4,12 @@
   inputs = {
     # NixOS official package source, using the nixos-23.11 branch here
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     hardware.url = "github:nixos/nixos-hardware";
 
     home-manager = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs-unstable.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
 
@@ -28,25 +28,33 @@
 
   };
 
-  outputs = { self, nixpkgs-unstable, home-manager, ... }@inputs: {
+  outputs = { self, nixpkgs, home-manager, ... }@inputs: 
+  let 
+    inherit (self) outputs;
+    forAllSystems = nixpkgs.lib.genAttrs [
+      "x86_64-linux"
+    ];
+    inherit (nixpkgs) lib;
+    configVars = import ./vars { inherit inputs lib; };
+    specialArgs = { inherit inputs outputs configVars nixpkgs; };
+  in
+  {
     # Please replace my-nixos with your hostname
-    nixosConfigurations.Lenni = nixpkgs-unstable.lib.nixosSystem {
+    nixosConfigurations = {
-      system = "x86_64-linux";
+      Lenni = lib.nixosSystem {
-      modules = [
+        inherit specialArgs;
-        # Import the previous configuration.nix we used,
+        modules = [
-        # so the old configuration file still takes effect
+          home-manager.nixosModules.home-manager
-
+            {
-        
+              home-manager.useGlobalPkgs = true;
-        home-manager.nixosModules.home-manager
+              home-manager.useUserPackages = true;
-          {
+              #home-manager.users.willifan = import ./users/willifan/home;
-            home-manager.useGlobalPkgs = true;
+              # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
-            home-manager.useUserPackages = true;
+            }
-            #home-manager.users.willifan = import ./users/willifan/home;
+          ./hosts
-            # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
+          ./users/willifan
-          }
+        ];
-        ./hosts
+      };
-        ./users/willifan
-      ];
     };
   };
 }

scripts/rebuild.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+

scripts/update.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+

users/willifan/applications.nix

@@ -6,7 +6,11 @@
     grim
     slurp
     wl-clipboard
+
+    playerctl
+
     kanshi
+
     jq
     bc
     xorg.xrandr
@@ -14,11 +18,13 @@
     inotify-tools
     papirus-icon-theme
     eww
+
     mako
+
     polkit_gnome
+
     dconf
 
-    python3
     usbutils
     unzip
 

users/willifan/graphical/hyprland/hyprland.nix

@@ -161,7 +161,7 @@
           ''$mainMod, V, togglefloating, ''
           ''$mainMod, R, exec, wofi --show drun''
           ''$mainMod, J, togglesplit, # dwindle''
-          ''$mainMod, P, exec, enpass''
+          ''$mainMod, P, exec, Enpass''
           ''$mainMod, T, exec, hyprctl dispatch exec "[float; pin; size 40% 40%; move 100%-41% 40] kitty bpytop -b proc"''
           ''$mainMod, W, exec, networkmanager_dmenu''
           ''$mainMod, F, fullscreen''

users/willifan/graphical/theme/font.nix

@@ -4,7 +4,10 @@
     fonts.fontconfig = {
       enable = true;
       defaultFonts = {
-        monospace = [ "jetbrains-mono" ];
+        monospace = [ "JetBrains Mono" ];
+        serif = [ "" ];
+        sansSerif = [ "" ];
+        emoji = [ "" ];
       };
     };
   };

users/willifan/graphical/theme/gtk.nix

@@ -5,7 +5,7 @@
     gtk = {
       enable = true;
       font = {
-        name = "jetbrains-mono";
+        name = "JetBrains Mono";
         package = pkgs.jetbrains-mono;
       };
 

vars/default.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  
+}