flake.lock

@@ -146,22 +146,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -595,38 +579,16 @@
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
-        "spicetify-nix": "spicetify-nix",
         "stylix": "stylix"
       }
     },
-    "spicetify-nix": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736396171,
-        "narHash": "sha256-1Pr1csD6wVTI2M+Dld77cc+PY83eKoO7ItIrvySWcmU=",
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "rev": "511074b9bed99e5cd4ef84999518970fd21af243",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "type": "github"
-      }
-    },
     "stylix": {
       "inputs": {
         "base16": "base16",
         "base16-fish": "base16-fish",
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
         "git-hooks": "git-hooks_2",
         "gnome-shell": "gnome-shell",

flake.nix

@@ -17,10 +17,6 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
-    spicetify-nix = {
-      url = "github:Gerg-L/spicetify-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     stylix = {
       url = "github:danth/stylix/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -34,7 +30,6 @@
       nixpkgs-unstable,
       home-manager,
       hyprpanel,
-      spicetify-nix,
       stylix,
       ...
     }:

home-manager/default.nix

@@ -17,7 +17,6 @@ in
     ./rofi
     ./wlogout
     ./hyprland
-    ./spicetify.nix
   ];
 
   # Home Manager needs a bit of information about you and the

home-manager/fish.nix

@@ -5,7 +5,7 @@ let
     if current == from then to else current;
   toSingleLine =
     with lib.strings;
-    s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "\n" s);
+    s: concatMapStrings (stringAsChars (replace "\n" "")) (splitString "n" s);
   theme = import ../theme.nix;
 in
 {

home-manager/hyprland/hyprlock/default.nix

@@ -46,17 +46,6 @@ in
           valign = "top";
         }
       ];
-
-      # USER AVATAR
-      image = {
-        path = "${../../face.png}";
-        size = 100;
-        border_color = "${theme.mauveRgb}";
-        position = "0, 75";
-        halign = "center";
-        valign = "center";
-      };
-
       # INPUT FIELD
       input-field = {
         size = "300, 60";
@@ -64,17 +53,17 @@ in
         dots_size = 0.2;
         dots_spacing = 0.2;
         dots_center = true;
-        outer_color = lib.mkDefault "${theme.mauveRgb}";
+        outer_color = lib.mkDefault "${theme.mauve}";
         inner_color = lib.mkDefault "${theme.surface0Rgb}";
         font_color = lib.mkDefault "${theme.textRgb}";
         fade_on_empty = false;
         placeholder_text = "<span foreground=\"##${theme.textAlpha}\"><i>󰌾 Logged in as </i><span foreground=\"##${theme.mauveAlpha}\">$USER</span></span>";
         hide_input = false;
-        check_color = lib.mkDefault "${theme.mauveRgb}";
+        check_color = lib.mkDefault "${theme.mauve}";
         fail_color = lib.mkDefault "${theme.redRgb}";
         fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
         capslock_color = lib.mkDefault "${theme.yellowRgb}";
-        position = "0, -47"; # TODO change to use % at 25.05
+        position = "0, -200"; # TODO change -200 to -20% at 25.05
         halign = "center";
         valign = "center";
       };

home-manager/hyprland/hyprpanel/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ inputs, ... }:
 let
   common = import ../../../common.nix;
   theme = import ../../../theme.nix;
@@ -58,47 +58,40 @@ in
         customModules.kbLayout.leftClick = "hyprctl switchxkblayout keychron-keychron-k8-pro next";
         launcher.autoDetectIcon = true;
         network.label = false;
-        volume = {
-          scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -1'";
-          scrollUp = "${pkgs.hyprpanel}/bin/hyprpanel 'vol +1'";
-        };
         workspaces = {
           show_icons = false;
           show_numbered = true;
         };
       };
 
-      menus = {
+      menus.clock = {
-        clock = {
+        time = {
-          time = {
+          military = true;
-            military = true;
+          hideSeconds = true;
-            hideSeconds = true;
-          };
-          weather = {
-            unit = "metric";
-            location = "Bergen, Norway"; # TODO not working
-          };
         };
+        weather = {
+          unit = "metric";
+          location = "Bergen, Norway"; # TODO not working
+        };
+      };
 
-        dashboard = {
+      menus.dashboard = {
-          directories.enabled = false;
+        directories.enabled = false;
-          powermenu.avatar.image = "${../../face.png}";
+        shortcuts.left = {
-          shortcuts.left = {
+          shortcut1 = {
-            shortcut1 = {
+            command = common.default.browser;
-              command = common.default.browser;
+            icon = ""; # TODO replace with Zen icon
-              icon = ""; # TODO replace with Zen icon
+            tooltip = "Zen";
-              tooltip = "Zen";
-            };
-            shortcut2 = {
-              command = "spotify";
-              icon = "";
-              tooltip = "Spotify";
-            };
-            ## shortcut3 === discord
-            ## shortcut4 === rofi -show drun
           };
-          stats.enable_gpu = true;
+          shortcut2 = {
+            command = "spotify";
+            icon = "";
+            tooltip = "Spotify";
+          };
+          ## shortcut3 === discord
+          ## shortcut4 === rofi -show drun
         };
+        stats.enable_gpu = true;
       };
 
       scalingPriority = "hyprland";

home-manager/hyprland/settings.nix

@@ -8,7 +8,7 @@ in
   wayland.windowManager.hyprland.settings = {
     monitor = [
       "DP-1, 1920x1080@144, 0x0, 1"
-      "DP-3, 3840x2160@60, 1920x0, 1.5"
+      "DP-3, 2560x1440@59.95, 1920x0, 1"
     ];
 
     # Autostart
@@ -96,7 +96,9 @@ in
       preserve_split = true; # You probably want this
     };
 
-    master.new_status = "master";
+    master = {
+      new_status = "master";
+    };
 
     misc = {
       force_default_wallpaper = 0;

home-manager/spicetify.nix

@@ -1,34 +0,0 @@
-{
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
-
-{
-  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
-  programs.spicetify =
-    let
-      spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
-      theme = import ../theme.nix;
-    in
-    {
-      enable = true;
-
-      enabledExtensions = with spicePkgs.extensions; [
-        adblock
-        hidePodcasts
-        shuffle # shuffle+ (special characters are sanitized out of extension names)
-      ];
-      enabledCustomApps = with spicePkgs.apps; [
-        newReleases
-        ncsVisualizer
-      ];
-      enabledSnippets = with spicePkgs.snippets; [
-        pointer
-      ];
-
-      theme = lib.mkForce spicePkgs.themes.catppuccin;
-      colorScheme = lib.mkForce theme.flavor;
-    };
-}

modules/stylix.nix

@@ -5,7 +5,7 @@ in
 {
   stylix = {
     enable = true;
-    image = ../tropic_island_night.jpg; # TODO overrides swww
+    image = ../catppuccin.png;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-${theme.flavor}.yaml";
     polarity = "dark";
     opacity.terminal = 0.8;