editorconfig

.editorconfig

@@ -1,5 +1,6 @@
 root = true
 
 [*]
+end_of_line = lf
 indent_style = space
 indent_size = 2

README.md

@@ -19,6 +19,7 @@ each host should have these files:
   - move common config such as bootloader and networking settings to [`default.nix`](./default.nix) or some other common spot
   - multi architecture configuration ([nix-systems](https://github.com/nix-systems/nix-systems)?)
   - bitwarden
+  - divide steam and gamemode?
+  - laptop specific configuration (power profiles daemon, battery, etc)
   - sddm cursors no work :(
-  - setup editorconfig everywhere
+  - try out the [new sddm options](https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=sddm)
-  - divide steam and gamemode?

config/waybar.css

@@ -6,11 +6,8 @@
 
 window#waybar {
   color: @text;
-  /*background: alpha(@base, 0.6);*/
   background: @base;
   border-radius: 1em;
-  /*font-family: VictorMono, Iosevka Nerd Font, Noto Sans CJK;*/
-  /*font-family: 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK;*/
   font-family: CozetteVector, FontAwesome, Noto Sans CJK;
   font-size: 13px;
   font-style: normal;
@@ -82,10 +79,6 @@ window#waybar.floating #window {
   color: @lavender;
 }
 
-#network {
-  color: @sapphire;
-}
-
 #pulseaudio {
   color: @pink;
 }

flake.lock

@@ -137,26 +137,26 @@
     "hyprland": {
       "inputs": {
         "hyprcursor": "hyprcursor",
-        "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang_2",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs_3",
         "systems": "systems_3",
-        "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1714084064,
+        "lastModified": 1715027791,
-        "narHash": "sha256-WUEFYyOzgWOr6pK2/1fCohUUF77wuj1zIeP8jvPL0LU=",
+        "narHash": "sha256-9wO+A4oOWpf0WtJ/iIzxy1mwXXfWuKHPW+E3wmsCI0k=",
-        "owner": "hyprwm",
+        "ref": "refs/heads/main",
-        "repo": "Hyprland",
+        "rev": "0c446ec5f4c39599ea97cb703dd3ac7718fb9169",
-        "rev": "1d40af64d352bd5a87c7d53a52707fc5cfc6940e",
+        "revCount": 4621,
-        "type": "github"
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
       },
       "original": {
-        "owner": "hyprwm",
+        "submodules": true,
-        "repo": "Hyprland",
+        "type": "git",
-        "type": "github"
+        "url": "https://github.com/hyprwm/Hyprland"
       }
     },
     "hyprland-catppuccin": {
@@ -179,19 +179,21 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
+          "xdph",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
+          "xdph",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1691753796,
+        "lastModified": 1714869498,
-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
+        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
+        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
         "type": "github"
       },
       "original": {
@@ -340,11 +342,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713989318,
+        "lastModified": 1714755542,
-        "narHash": "sha256-WSsEQQxZQ+bsAWRhi1iXvP8sxgRyNtY3X1V3CfFdP5Q=",
+        "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "1cfe2d26a82ce794fd33ec06fa022e68501c5a45",
+        "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
         "type": "github"
       },
       "original": {
@@ -421,11 +423,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1713714899,
+        "lastModified": 1714253743,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
         "type": "github"
       },
       "original": {
@@ -671,29 +673,9 @@
         "type": "github"
       }
     },
-    "wlroots": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1713731601,
-        "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=",
-        "owner": "hyprwm",
-        "repo": "wlroots-hyprland",
-        "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "wlroots-hyprland",
-        "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": [
+        "hyprland-protocols": "hyprland-protocols",
-          "hyprland",
-          "hyprland-protocols"
-        ],
         "hyprlang": [
           "hyprland",
           "hyprlang"
@@ -708,11 +690,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713724432,
+        "lastModified": 1714060055,
-        "narHash": "sha256-dtU1y4oj/0Y42oauzm93ucFg1AoqETnQ21bmXTIUng0=",
+        "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "9ace6f969ce495185df34cc6254fb9d297765478",
+        "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -12,7 +12,7 @@
 
     waybar.url = "github:Alexays/Waybar";
 
-    hyprland.url = "github:hyprwm/Hyprland";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     hyprlock.url = "github:hyprwm/hyprlock";
     hypridle.url = "github:hyprwm/hypridle";
     hyprpaper.url = "github:hyprwm/hyprpaper";

hosts/goopnet-interface/default.nix

@@ -9,7 +9,7 @@
     # archives
     zip xz unzip p7zip zstd
     # utils
-    ripgrep jq libqalculate
+    ffmpeg ripgrep jq libqalculate
     # nix
     nix-output-monitor
     # system
@@ -17,9 +17,11 @@
     # debug
     strace ltrace lsof
     # apps
-    firefox mpv qalculate-gtk
+    firefox mpv qalculate-gtk krita
+    # compatibility
+    wineWowPackages.waylandFull winetricks
     # misc
-    bat file which tree	prismlauncher yt-dlp ffmpeg gpu-screen-recorder gpu-screen-recorder-gtk
+    bat file which tree	prismlauncher yt-dlp gpu-screen-recorder gpu-screen-recorder-gtk
   ] ++ (with pkgs.my; [
     # none yet
   ]) ++ (with pkgs.gnome; [

hosts/goopnet-interface/hardware.nix

@@ -21,6 +21,9 @@
     efi.canTouchEfiVariables = true;
   };
 
+  # thermald proactively prevents overheating on intel CPUs and works well with other tools
+  services.thermald.enable = true;
+
   # nvidia driver
   services.xserver.videoDrivers = [ "nvidia" ];
 
@@ -50,6 +53,8 @@
     # TODO: remove this once nvidia gets their shit together
     # https://forums.developer.nvidia.com/t/cueglstreamproducerconnect-returns-error-801-on-525-53-driver/233610/20
     NVD_BACKEND = "direct";
+    # VA-API on firefox
+    MOZ_DISABLE_RDD_SANDBOX = "1";
   };
 
   fileSystems."/" =

modules/desktop/default.nix

@@ -15,6 +15,9 @@ in {
     {
       modules.desktop.fonts.enable = true;
       modules.desktop.fonts.baseFonts = true;
+
+      # mounting and trash functionality, the recommended solution for most file managers
+      services.gvfs.enable = true;
     }
     (mkIf (cfg.envProto == "wayland") {
       environment.sessionVariables = {
@@ -23,6 +26,7 @@ in {
         _JAVA_AWT_WM_NONEREPARENTING = "1";
         GDK_BACKEND = "wayland,x11";
         ANKI_WAYLAND = "1";
+        MOZ_ENABLE_WAYLAND = "1";
         ELECTRON_OZONE_PLATFORM_HINT = "wayland";
         XDG_SESSION_TYPE = "wayland";
         SDL_VIDEODRIVER = "wayland";

modules/desktop/fonts.nix

@@ -45,19 +45,19 @@ in {
         package = pkgs.cozette;
         family = "CozetteVector";
 
-        size = 10;
+        size = 13;
       };
       monospaceBitmap = mkFontOption "bitmap monospace" {
         package = pkgs.cozette;
         family = "Cozette";
 
-        size = 10;
+        size = 13;
       };
       emoji = mkFontOption "emoji" {
         package = pkgs.twitter-color-emoji;
         family = "Twitter Color Emoji";
 
-        size = 10; # not applicable, but whatever
+        size = 13; # not applicable, but whatever
       };
     };
   };

modules/desktop/hyprland.nix

@@ -62,8 +62,14 @@ in {
 
           "$mod, Q, killactive, "
           "$mod, V, togglefloating, "
-          "$mod, P, pseudo, "
+          "$mod, P, pseudo, " # dwindle
-          "$mod, J, togglesplit, "
+          "$mod, J, togglesplit, " # dwindle
+
+          # move focus with mod + arrow keys
+          "$mod, left, movefocus, l"
+          "$mod, right, movefocus, r"
+          "$mod, up, movefocus, u"
+          "$mod, down, movefocus, d"
 
           # scroll through workspaces with mod + scroll
           "$mod, mouse_down, workspace, e+1"
@@ -89,12 +95,13 @@ in {
           kb_layout = "us";
 
           follow_mouse = 1;
+
+          sensitivity = 0; # -1.0 - 1.0, 0 means no modification
         };
 
         monitor= [
           "DVI-D-1, 1920x1080@60, 0x0,    1"
           "DP-2,    1920x1080@60, 1920x0, 1"
-          # "DP-2, modeline 712.75 3840 4160 4576 5312 2160 2163 2168 2237 -hsync +vsync, 1920x0, 1, bitdepth, 10"
         ];  
 
         exec-once = [ "${lib.getExe pkgs.networkmanagerapplet}" ];
@@ -130,6 +137,8 @@ in {
           "float, initialTitle:^Save As$"
           "size 1100 730, initialTitle:^Save As$"
 
+          "float, class:\.exe$"
+
           # fix focus
           "stayfocused, class:^pinentry-"
           "stayfocused, class:^polkit-"
@@ -141,6 +150,11 @@ in {
           "workspace 4, class:vesktop"
         ];
 
+        layerrule = [
+          "animation slide, notifications"
+          "animation slide, waybar"
+        ];
+
         blurls = [
           "gtk-layer-shell" # nwg-drawer
           "waybar"
@@ -157,8 +171,8 @@ in {
           };
 
           drop_shadow = false;
-          #shadow_range = 4;
+          #shadow_range = 30;
-          #shadow_render_power = true;
+          #shadow_render_power = 3;
         };
 
         animations = {
@@ -179,8 +193,7 @@ in {
         };
 
         dwindle = {
-          pseudotile = "yes";
+          pseudotile = "yes"; # master swtich for pseudotiling. enabling is mod + P in the keybinds section
-
           preserve_split = "yes";
         };
 

modules/desktop/waybar.nix

@@ -26,7 +26,7 @@ in {
         mainBar = {
           layer = "top";
           position = "top";
-          #spacing = 4;
+          spacing = 4;
           height = 30;
           margin-top = 6;
           margin-left = 6;
@@ -116,7 +116,7 @@ in {
             rewrite = {
               "(.*) — Mozilla Firefox" = "$1"; # the dash here is SLIGHTLY different. Wow
               "(.*) - Visual Studio Code" = "$1";
-              #"(.*\\.nix\\s.*)" = "";
+              "(.*\\.nix\\s.*)" = " $1";
               "(\\S+\\.html\\s.*)" = " $1";
               "(\\S+\\.css\\s.*)" = " $1";
               "(\\S+\\.js\\s.*)" = " $1";

modules/software/editors/vscode.nix

@@ -15,7 +15,7 @@ in {
         jnoortheen.nix-ide
         oderwat.indent-rainbow
         usernamehw.errorlens
-        vadimcn.vscode-lldb
+        editorconfig.editorconfig
         ms-vsliveshare.vsliveshare
       ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
         {
@@ -30,10 +30,10 @@ in {
       enableUpdateCheck = false;
       userSettings = with config.modules.desktop.fonts.fonts; {
         "editor.fontFamily" = "'${monospace.family}', monospace";
-        "editor.fontSize" = monospace.size + 3; # needed??
+        "editor.fontSize" = monospace.size;
 
         "terminal.integrated.fontFamily" = "\"${monospace.family}\"";
-        "terminal.integrated.fontSize" = monospace.size + 3; # needed??
+        "terminal.integrated.fontSize" = monospace.size;
 
         "telemetry.telemetryLevel" = "off";