Merge remote-tracking branch 'origin/main'

flake.nix

@@ -29,7 +29,7 @@
   };
 
   outputs = { self, nixpkgs, home-manager, disko, ... }@inputs: 
-  let 
+  let
     inherit (self) outputs;
     forAllSystems = nixpkgs.lib.genAttrs [
       "x86_64-linux"

users/willifan/applications.nix

@@ -15,7 +15,6 @@
 
     feh
 
-    hyfetch
     enpass
     webcord
     obsidian

users/willifan/default.nix

@@ -7,6 +7,7 @@
     ./auto-cpufreq.nix
     ./envvar.nix
     ./git.nix
+    ./hyfetch.nix
     ./locales.nix
     #./ssh.nix
     ./syncthing.nix

users/willifan/graphical/dev/default.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
+    ./rust.nix
     ./vscodium.nix
   ];
 }
-

users/willifan/graphical/dev/rust.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+
+    rustup
+    probe-rs
+    cargo-binutils
+    
+  ];
+}

users/willifan/graphical/dev/vscodium.nix

@@ -8,6 +8,7 @@
 
       userSettings = {
         "[nix]"."editor.tabSize" = 2;
+        "explorer.confirmDragAndDrop" = false;
       };
       extensions = with pkgs.vscode-extensions; [
         # System

users/willifan/graphical/hyprland/Lenni/default.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./hypridle.nix
+    ./hyprlock.nix
+    ./kanshi.nix
+  ];
+}

users/willifan/graphical/hyprland/Lenni/kanshi.nix

@@ -70,7 +70,7 @@
               criteria = "eDP-1";
               mode = "2256x1504";
               position = "3840,0";
-              scale = 1.6;
+              scale = 1.0;
               transform = "normal";
             }
           ];

users/willifan/graphical/hyprland/common/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  programs.hyprland.enable = true;
+  imports = [
+    ./hyprland.nix
+    ./hyprpaper.nix
+    ./mako.nix
+    ./pipewire.nix
+    ./polkit.nix
+    ./utils.nix
+    ./wofi.nix
+  ];
+  
+  
+}

users/willifan/graphical/hyprland/default.nix

@@ -1,19 +1,7 @@
-{ pkgs, ... }:
+{ pkgs, configVars, ... }:
-
 {
-  programs.hyprland.enable = true;
   imports = [
-    ./hypridle.nix
+    ./common
-    ./hyprland.nix
+    ./${configVars.hostname}
-    ./hyprlock.nix
-    ./hyprpaper.nix
-    ./kanshi.nix
-    ./mako.nix
-    ./pipewire.nix
-    ./polkit.nix
-    ./utils.nix
-    ./wofi.nix
   ];
-  
+}
-  
-}

users/willifan/hyfetch.nix

@@ -0,0 +1,25 @@
+{ pkgs, home-manager, ... }:
+
+{
+  home-manager.users.willifan = {
+    programs.hyfetch = {
+      enable = true;
+      settings = {
+        preset = "transgender";
+        mode = "rgb";
+        light_dark = "dark";
+        lightness = 0.69;
+        color_align = {
+            mode = "horizontal";
+            custom_colors = [];
+            fore_back = null;
+        };
+        backend = "neofetch";
+        args = null;
+        distro = null;
+        pride_month_shown = [];
+        pride_month_disable = false;
+      };
+    };
+  };
+}

users/willifan/syncthing.nix

@@ -3,8 +3,8 @@
   services.syncthing = {
     enable =  true;
     user = "willifan";
-    dataDir = "/home/willifan/temp";
+    dataDir = "/mnt/data";
-    configDir = "/home/willifan/temp/.config/syncthing";
+    configDir = "/mnt/data/.config/syncthing";
     overrideDevices = true;
     overrideFolders = true;
     settings = {