feat: lots of things, really

kittywitch · Nov 14, 2024 · 185833d · 185833d
1 parent 5448280
commit 185833d
Show file tree

Hide file tree

Showing 28 changed files with 200 additions and 168 deletions.
diff --git a/ci/common.nix b/ci/common.nix
@@ -17,7 +17,7 @@
     };
   };
 
-    nix.config.max-silent-time = 60 * 60;
+  nix.config.max-silent-time = 60 * 60;
   /*
     nix.config = {
     extra-platforms = ["aarch64-linux" "armv6l-linux" "armv7l-linux"];

diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix
@@ -1,13 +1,9 @@
 {
   lib,
   config,
-  channels,
-  pkgs,
   ...
 }:
-with lib; let
-  inherit (channels.std) string list set;
-in {
+with lib; {
   imports = [./common.nix];
   config = {
     name = "flake-update";
@@ -43,9 +39,9 @@ in {
           name = "flake update build";
           order = 500;
           run = "nix run .#nf-update";
-  env = {
+          env = {
             CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
-        CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
+            CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
             DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
             NF_UPDATE_GIT_COMMIT = "1";
             NF_UPDATE_CACHIX_PUSH = "1";

diff --git a/ci/nodes.nix b/ci/nodes.nix
@@ -42,7 +42,7 @@ in {
               run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS";
               env = {
                 CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
-        CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
+                CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
                 DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
                 NF_UPDATE_CACHIX_PUSH = "1";
                 NF_CONFIG_ROOT = "\${{ github.workspace }}";
@@ -57,7 +57,7 @@ in {
               run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home";
               env = {
                 CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}";
-        CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
+                CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}";
                 DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}";
                 NF_UPDATE_CACHIX_PUSH = "1";
                 NF_CONFIG_ROOT = "\${{ github.workspace }}";

diff --git a/common/overlay.nix b/common/overlay.nix
@@ -6,10 +6,10 @@
   nixpkgs = {
     overlays = import tree.overlays {inherit inputs tree;};
     config = {
-        allowUnfree = true;
-        permittedInsecurePackages = [
-            "olm-3.2.16"
-        ];
-     };
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "olm-3.2.16"
+      ];
+    };
   };
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -28,11 +28,11 @@
       };
     };
     wezterm = {
-        url = "github:wez/wezterm/main?dir=nix";
-        inputs = {
-            nixpkgs.follows = "nixpkgs";
-            flake-utils.follows = "utils";
-        };
+      url = "github:wez/wezterm/main?dir=nix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "utils";
+      };
     };
     ci = {
       url = "github:arcnmx/ci/v0.7";

diff --git a/home/environments/gnome/extensions.nix b/home/environments/gnome/extensions.nix
@@ -15,7 +15,7 @@
         ];
       };
       "org/gnome/shell/extensions/date-menu-formatter" = {
-        pattern = "y-MM-dd kk:mm XXX";
+        pattern = "y-MM-dd HH:mm Z";
         "font-size" = "12";
       };
       "org/gnome/shell/extensions/vitals" = {
@@ -28,6 +28,7 @@
     space-bar
     user-themes
     tray-icons-reloaded
+    appindicator
     vitals
     dash-to-panel
     date-menu-formatter

diff --git a/home/environments/gnome/gtk.nix b/home/environments/gnome/gtk.nix
@@ -0,0 +1,21 @@
+{pkgs, ...}: {
+  gtk = {
+    enable = true;
+    iconTheme = {
+      name = "Numix-Square";
+      package = pkgs.numix-icon-theme-square;
+    };
+
+    theme = {
+      name = "Arc-Dark";
+      package = pkgs.arc-theme;
+    };
+
+    cursorTheme = {
+      name = "Numix-Cursor";
+      package = pkgs.numix-cursor-theme;
+    };
+  };
+
+  home.sessionVariables.GTK_THEME = "Arc-Dark";
+}
diff --git a/home/environments/gnome/konawall.nix b/home/environments/gnome/konawall.nix
@@ -3,7 +3,26 @@
   pkgs,
   inputs,
   ...
-}: {
+}: let
+  konawallConfig = {
+    interval = 30 * 60;
+    rotate = true;
+    source = "konachan";
+    tags = [
+      "rating:s"
+      "touhou"
+      "score:>=50"
+      "width:>=1500"
+    ];
+    logging = {
+      file = "INFO";
+      console = "DEBUG";
+    };
+  };
+in {
+  xdg.configFile = {
+    "konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig;
+  };
   systemd.user.services.konawall-py-gnome = {
     Unit = {
       Description = "konawall-py";

diff --git a/home/environments/gnome/ssh.nix b/home/environments/gnome/ssh.nix
@@ -9,7 +9,7 @@ in {
 
   # Disable gnome-keyring ssh-agent
   xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
-    ${fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
+    ${fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
     Hidden=true
   '';
 }
diff --git a/home/environments/kde/kde.nix b/home/environments/kde/kde.nix
@@ -57,7 +57,7 @@
       "kdeglobals"."WM"."inactiveBlend" = "231,232,235";
       "kdeglobals"."WM"."inactiveForeground" = "163,165,172";
       "kdeglobals"."General"."BrowserApplication" = "firefox.desktop";
-      "kdeglobals"."General"."TerminalApplication" = "wezterm start --cwd .";
+      "kdeglobals"."General"."TerminalApplication" = "konsole";
       "kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop";
       "kxkbrc"."Layout"."ResetOldOptions" = true;
       "plasmarc"."Theme"."name" = "Arc";

diff --git a/home/profiles/common/base16.nix b/home/profiles/common/base16.nix
@@ -22,6 +22,6 @@ in {
         ansi.palette.background.alpha = "ee00";
       };
     };
-    defaultSchemeName = "light";
+    defaultSchemeName = "dark";
   };
 }
diff --git a/home/profiles/graphical/packages.nix b/home/profiles/graphical/packages.nix
@@ -12,6 +12,7 @@
 
     # Music
     spotify
+    strawberry-qt6
 
     # Chat
     fractal # Matrix
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
         # Music
         spotify
+        strawberry-qt6
         # Chat
         fractal # Matrix
@@ Expand Down @@