Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos

desktop/pkgs/sddm-catppuccin-macchiato/default.nix

@@ -1,21 +1,23 @@
 {
-  lib,
   stdenvNoCC,
   fetchFromGitHub,
-}: {
+}:
-  sddm-catppuccin-macchiato = stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "sddm-catppuccin-macchiato-theme";
   version = "1.0";
   dontBuild = true;
-    installPhase = ''
+
-      mkdir -p $out/share/sddm/themes
-      cp -aR $src/src/catppuccin-macchiato $out/share/sddm/themes/catppuccin-macchiato
-    '';
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "sddm";
     rev = "bde6932e1ae0f8fdda76eff5c81ea8d3b7d653c0";
     sha256 = "ceaK/I5lhFz6c+UafQyQVJIzzPxjmsscBgj8130D4dE=";
   };
-  };
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/sddm/themes
+    cp -aR $src/src/catppuccin-macchiato $out/share/sddm/themes/catppuccin-macchiato
+    runHook postInstall
+  '';
 }

desktop/sddm.nix

@@ -2,9 +2,7 @@
   sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato {};
 in {
   imports = [./xserver.nix];
-  environment.systemPackages = [
+  environment.systemPackages = [sddm-catppuccin-macchiato];
-    sddm-catppuccin-macchiato.sddm-catppuccin-macchiato
-  ];
   services.xserver.displayManager.sddm = {
     enable = true;
     theme = "catppuccin-macchiato";

home/Northstar/xenia.nix

@@ -1,7 +1,10 @@
-{pkgs, ...}: {
+{pkgs, ...}: let
+  rot8 = pkgs.callPackage ../desktop/pkgs/rot8 {};
+in {
   imports = [
     ../env
     ../tui
+    ../gui/chromium.nix
     ../gui/foot.nix
     ../desktop/sway.nix
     ../ssh/personal.nix
@@ -10,11 +13,16 @@
   home.username = "xenia";
   home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
-  home.packages = with pkgs; [home-manager];
+  home.packages = with pkgs; [home-manager rot8];
   programs.bash.bashrcExtra = ''
     source $HOME/.nix-profile/etc/profile.d/nix.sh
   '';
-  programs.firefox.enable = true;
+
+  services.syncthing = {
+    enable = true;
+    tray = {enable = false;};
+  };
+  fonts.fontconfig.enable = true;
 
   wayland.windowManager.sway = {
     config = {
@@ -32,9 +40,17 @@
           bg = "~/nixos/wallpaper.jpg fill";
         };
       };
+      gaps = {
+        inner = 5;
+        top = 5;
+        bottom = 5;
+        left = 20;
+        right = 20;
+      };
       startup = [
         {command = "dunst";}
         {command = "waybar";}
+        {command = "rot8";}
       ];
     };
   };

home/default.nix

@@ -1 +1,4 @@
-{...}: {imports = [./env ./gui ./tui];}
+{...}: {
+  imports = [./env ./gui ./tui];
+  fonts.fontconfig.enable = true;
+}

home/desktop/config/hypr/keybinds.conf

@@ -1,5 +1,6 @@
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-bind = SUPER, Return, exec, wezterm
+# bind = SUPER, Return, exec, wezterm
+bind = SUPER, Return, exec, kitty
 bind = SUPER, Q, killactive,
 bind = SUPER, E, exec, power-profiles
 bind = SUPER, P, exec, powermenu

home/desktop/gtk.nix

@@ -3,12 +3,12 @@
   config,
   ...
 }: let
-  candy = pkgs.callPackage ./pkgs/candy-icon-theme {};
+  candy-icon-theme = pkgs.callPackage ./pkgs/candy-icon-theme {};
-  sweet-folder = pkgs.callPackage ./pkgs/sweet-folder-theme {};
+  sweet-folder-theme = pkgs.callPackage ./pkgs/sweet-folder-theme {};
 in {
   home.packages = [
-    candy.candy-icon-theme
+    candy-icon-theme
-    sweet-folder.sweet-folder-theme
+    sweet-folder-theme
     pkgs.breeze-gtk
     pkgs.gnome.adwaita-icon-theme
     pkgs.hicolor-icon-theme
@@ -20,7 +20,7 @@ in {
       name = "Catppuccin-Macchiato-Dark-Cursors";
     };
     iconTheme = {
-      package = sweet-folder.sweet-folder-theme;
+      package = sweet-folder-theme.sweet-folder-theme;
       name = "Sweet-Rainbow";
     };
     theme = {

home/desktop/pkgs/candy-icon-theme/default.nix

@@ -1,10 +1,9 @@
 {
-  lib,
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-}: {
+}:
-  candy-icon-theme = stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "candy-icon-theme";
   version = "6a35be5cb133c6be8314807f55da3d795e24fb86";
   dontBuild = true;
@@ -31,5 +30,4 @@
 
     runHook postInstall
   '';
-  };
 }

home/desktop/pkgs/delta-icon-theme/default.nix

@@ -1,10 +1,9 @@
 {
-  lib,
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-}: {
+}:
-  delta-icon-theme = stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "delta-icon-theme";
   version = "194df98e422c0a81912194808b76712bf5d78803";
   dontBuild = true;
@@ -31,14 +30,4 @@
 
     runHook postInstall
   '';
-
-    # meta = with lib; {
-    #   description = "Delta icon theme";
-    #   homepage = "https://github.com/Delta-Icons/Linux";
-    #   license = licenses.gpl3Only;
-    #   # darwin gives hash mismatch in source, probably because of file names differing only in case
-    #   platforms = platforms.linux;
-    #   maintainers = with maintainers; [];
-    # };
-  };
 }

home/desktop/pkgs/rot8/default.nix

@@ -0,0 +1,17 @@
+{
+  fetchFromGitHub,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "rot8";
+  version = "7ed926f6d94a999cd2cb702af9f3de0f566095b1";
+
+  src = fetchFromGitHub {
+    owner = "efernau";
+    repo = pname;
+    rev = version;
+    hash = "sha256-i+VLVA/XKZiFPEeFHR3CpZKi8CWA/tiaZJerciqQHJ0=";
+  };
+
+  cargoHash = "sha256-BoBuc3YkVdAR+gZZf5WxxRj/LCsBNSW7FSSU2OnNPgM=";
+}

home/desktop/pkgs/sweet-folder-theme/default.nix

@@ -1,10 +1,9 @@
 {
-  lib,
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-}: {
+}:
-  sweet-folder-theme = stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "sweet-folder-theme";
   version = "b2192ff1412472f036fdf9778c6b9dbcb6c044ec";
   dontBuild = true;
@@ -31,5 +30,4 @@
 
     runHook postInstall
   '';
-  };
 }

home/desktop/sway.nix

@@ -31,10 +31,6 @@ in {
         names = ["FiraCode Nerd Font" "FiraCode Nerd Font Mono"];
         size = 12.0;
       };
-      gaps = {
-        inner = 5;
-        outer = 20;
-      };
       bars = [];
       keybindings = lib.mkOptionDefault {
         "${modifier}+Return" = "exec ${term}";

home/gui/alacritty.nix

@@ -0,0 +1,42 @@
+{...}: {
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      font = {
+        normal.family = "FiraCode Nerd Font";
+        size = 14;
+      };
+      colors = {
+        # Default colors
+        primary = {
+          background = "0x1a1b26";
+          foreground = "0xa9b1d6";
+        };
+
+        # Normal colors
+        normal = {
+          black = "0x32344a";
+          red = "0xf7768e";
+          green = "0x9ece6a";
+          yellow = "0xe0af68";
+          blue = "0x7aa2f7";
+          magenta = "0xad8ee6";
+          cyan = "0x449dab";
+          white = "0x787c99";
+        };
+
+        # Bright colors
+        bright = {
+          black = "0x444b6a";
+          red = "0xff7a93";
+          green = "0xb9f27c";
+          yellow = "0xff9e64";
+          blue = "0x7da6ff";
+          magenta = "0xbb9af7";
+          cyan = "0x0db9d7";
+          white = "0xacb0d0";
+        };
+      };
+    };
+  };
+}

home/gui/kitty.nix

@@ -7,22 +7,20 @@
       size = 14;
     };
     settings = {
-      initial_window_width = 640;
+      background_opacity = "0.80";
-      initial_window_height = 400;
-      background_opacity = "0.95";
       disable_ligatures = "cursor";
       show_hyperlink_targets = true;
       copy_on_select = true;
       paste_actions = "confirm";
       enable_audio_bell = false;
-      window_border_width = 2;
+      window_border_width = 5;
       window_margin_width = 5;
       tab_bar_edge = "top";
       tab_bar_style = "powerline";
       tab_powerline_style = "round";
-      tab_bar_min_tabs = 1;
+      tab_bar_min_tabs = 2;
       update_check_interval = 0;
     };
-    theme = "Catppuccin-Macchiato";
+    theme = "Tokyo Night";
   };
 }

home/tui/neovim.nix

@@ -1,4 +1,15 @@
 {pkgs, ...}: {
+  home.packages = with pkgs; [
+    git
+    curl
+    gnutar
+    gnumake
+    gnused
+    gcc
+    fzf
+    ripgrep
+    tree-sitter
+  ];
   programs.neovim = {
     enable = true;
     defaultEditor = true;
@@ -9,17 +20,6 @@
     withRuby = true;
     withPython3 = true;
     extraPackages = with pkgs; [
-      # Used by installed plugins
-      git
-      curl
-      gnutar
-      gnumake
-      gnused
-      gcc
-      fzf
-      ripgrep
-      tree-sitter
-
       # Language servers
       nodePackages.pyright
       python3Packages.ruff-lsp
@@ -34,6 +34,7 @@
       alejandra
       beautysh
       black
+      nodePackages.cspell
       nodePackages.fixjson
       fprettify
       isort

nvim

@@ -1 +1 @@
-Subproject commit ca21787b0cf5470797c4ad9344f60b2f60284a6a
+Subproject commit 99ce5c68d811a7debe888a84497628dad3cb0c47

services/syncthing/Legion.nix

@@ -24,7 +24,7 @@
     group = "users";
     extraOptions.options.globalAnnounceEnabled = true;
     folders = {
-      "Archive".devices = ["ion" "monarch" "northstar" "vanguard"];
+      "Archive".devices = ["ion" "monarch" "vanguard"];
       "Books".devices = ["monarch" "northstar" "remarkable" "vanguard"];
       "Camera".devices = ["ion"];
       "Comics".devices = ["ion" "monarch" "northstar" "vanguard"];

services/syncthing/devices/Northstar.nix

@@ -1 +1 @@
-{...}: {services.syncthing.devices."northstar".id = "DMQZNMB-BM3SSE4-5XV2GHE-IDRNFTS-QNZSICS-6JWHUCV-O3NHMWY-2OBC2QD";}
+{...}: {services.syncthing.devices."northstar".id = "W3QZTFS-BB42JYB-NQBZ5IM-H3WLAUQ-M57I2CP-FALWGEX-JI2ZZOC-QWAX2QQ";}