configuration.nix

@@ -72,7 +72,6 @@
     freetube
     nextcloud-client
     discord
-    nix-prefetch-github # Cmd to get rev and hash from GitHub
   ];
 
   nix.settings.experimental-features = [
@@ -104,10 +103,15 @@
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
+  security = {
+    # Adds Swaylock to /etc/pam.d
+    pam.services.swaylock = { };
+  };
+
   services = {
     displayManager.sddm = {
       enable = true;
-      autoNumlock = true; # Enable numlock at login # TODO doesn't work
+      autoNumlock = true; # Enable numlock at login
       wayland.enable = true;
     };
 

home/default.nix

@@ -9,7 +9,6 @@ in
 {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
-    ./fish.nix
     ./nixvim
     ./rofi
     ./wlogout
@@ -38,6 +37,11 @@ in
     home-manager.enable = true;
 
     kitty.enable = true;
+
+    starship = {
+      enable = true;
+      settings = (with builtins; fromTOML (readFile ./starship.toml)) // { };
+    };
   };
 
   services = {

home/fish.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs = {
-    fish = {
-      enable = true;
-      plugins = [
-        {
-          # !! to get the previous command
-          name = "fishbang";
-          src = pkgs.fetchFromGitHub {
-            owner = "BrewingWeasel";
-            repo = "fishbang";
-            rev = "50389667eb9ac79edcff9b987c83e1de8ac93921";
-            hash = "sha256-IneNWyfo29C7FDA5b6pTZRX3HpP6y/dRM6GXuLq2+zc=";
-          };
-        }
-      ];
-    };
-
-    starship = {
-      enable = true;
-      settings = (with builtins; fromTOML (readFile ./starship.toml)) // { };
-    };
-  };
-}

home/hyprland/default.nix

@@ -10,9 +10,4 @@
   ];
 
   home.file.".config/hypr/hyprland.conf".source = ./hyprland.conf;
-  programs.kitty = {
-    settings = {
-      window_padding_width = 10;
-    };
-  };
 }

home/hyprland/waybar/config/config.jsonc

@@ -25,7 +25,10 @@
   "hyprland/workspaces": {
     "disable-scroll": false,
     "sort-by-name": true,
-    "format": " {id} "
+    "format": " {id} ",
+    "format-icons": {
+      "default": ""
+    }
   },
   "hyprland/window": {},
   "tray": {
@@ -33,7 +36,7 @@
     "spacing": 10
   },
   "custom/music": {
-    "format": "󰓃 {}",
+    "format": " {}",
     "escape": true,
     "interval": 5,
     "tooltip": false,

home/hyprland/waybar/config/style.css

@@ -1,8 +1,8 @@
 @import "mocha.css";
 
 * {
-    font-family: JetBrainsMono Nerd Font;
+    font-family: FantasqueSansMono Nerd Font;
-    font-size: 15px;
+    font-size: 17px;
     min-height: 0;
 }
 
@@ -14,8 +14,9 @@
 
 #workspaces {
     border-radius: 1rem;
+    margin: 5px;
     background-color: @surface0;
-    margin: 5px 5px 5px 1rem;
+    margin-left: 1rem;
 }
 
 #workspaces button {
@@ -82,19 +83,19 @@
 }
 
 #custom-lock {
-    border-radius: 1rem 0 0 1rem;
+    border-radius: 1rem 0px 0px 1rem;
     color: @lavender;
 }
 
 #custom-power {
     margin-right: 1rem;
-    border-radius: 0 1rem 1rem 0;
+    border-radius: 0px 1rem 1rem 0px;
     color: @red;
 }
 
 #custom-notification {
     margin-right: 1rem;
-    border-radius: 0 1rem 1rem 0;
+    border-radius: 0px 1rem 1rem 0px;
     color: @sapphire;
 }
 

terminal/shell.nix

@@ -19,10 +19,6 @@
       interactiveShellInit = ''
         	starship init fish | source
       '';
-      shellAliases = {
-        # Transfer shell config to target device
-        ssh = "kitty +kitten ssh";
-      };
     };
   };
 }