rolling update in 20241007

Signed-off-by: iosmanthus <[email protected]>
iosmanthus · Oct 7, 2024 · dd1604c · dd1604c
1 parent 7c0d744
commit dd1604c
Show file tree

Hide file tree

Showing 17 changed files with 129 additions and 99 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "God does not play dice";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/954e8210477d1d22cfaebebcfae9fa86e254e3a0";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
 
     master.url = "github:NixOS/nixpkgs";
 

diff --git a/nixos/iosmanthus-xps/monitors.nix b/nixos/iosmanthus-xps/monitors.nix
@@ -16,7 +16,7 @@ in
     };
   };
   services.autorandr = {
-    enable = true;
+    enable = false;
     profiles = {
       default = {
         fingerprint = {

diff --git a/nixos/workstation/default.nix b/nixos/workstation/default.nix
@@ -146,14 +146,19 @@
 
   hardware = {
     enableAllFirmware = true;
-    pulseaudio.enable = true;
+    pulseaudio = {
+      enable = true;
+      package = pkgs.pulseaudioFull;
+    };
     alsa.enablePersistence = true;
     bluetooth = {
       enable = true;
       powerOnBoot = true;
     };
   };
 
+  services.pipewire.enable = false;
+
   virtualisation = {
     docker = {
       enable = true;

diff --git a/nixos/workstation/desktop/default.nix b/nixos/workstation/desktop/default.nix
@@ -25,8 +25,24 @@
     };
   };
 
+  environment.xfce.excludePackages = with pkgs.xfce; [
+    xfce4-notifyd
+    xfce4-volumed-pulse
+  ];
+
+  environment.systemPackages = with pkgs.xfce // pkgs; [
+    xfce4-panel
+    xfwm4
+
+    xfce4-systemload-plugin
+    xfce4-netload-plugin
+    xfce4-pulseaudio-plugin
+    xfce4-volumed-pulse
+    xfce4-sensors-plugin
+  ];
+
   services.displayManager = {
-    defaultSession = "none+i3";
+    defaultSession = "xfce+i3";
   };
 
   services.xserver = {
@@ -36,6 +52,14 @@
     xkb.layout = "us";
     autoRepeatInterval = 20;
     autoRepeatDelay = 200;
+    desktopManager = {
+      xterm.enable = false;
+      xfce = {
+        enable = true;
+        noDesktop = true;
+        enableXfwm = false;
+      };
+    };
     displayManager.lightdm = {
       enable = true;
       background = config.wallpaper.package.gnomeFilePath;
@@ -46,6 +70,10 @@
           name = "Yaru";
           size = 48;
         };
+        iconTheme = {
+          package = pkgs.papirus-icon-theme;
+          name = "Papirus";
+        };
         theme = config.gtk.globalTheme;
         indicators = [
           "~host"
@@ -58,6 +86,7 @@
         extraConfig = ''
           xft-dpi=192
           font-name=sans-serif
+          user-background=false
         '';
       };
     };

diff --git a/nixos/workstation/desktop/monitors.nix b/nixos/workstation/desktop/monitors.nix
@@ -57,7 +57,7 @@ in
   };
 
   services.autorandr = {
-    enable = true;
+    enable = false;
     inherit hooks;
     profiles =
       mkProfile {

diff --git a/nixos/workstation/home/default.nix b/nixos/workstation/home/default.nix
@@ -38,12 +38,13 @@
       feishu
       flameshot
       flyctl
+      follow
       fzf
       gedit
       geoipWithDatabase
       gh
-      gnome-font-viewer
       gnome-clocks
+      gnome-font-viewer
       go-musicfox
       go-tools
       google-cloud-sdk
@@ -65,6 +66,7 @@
       networkmanagerapplet
       nix-output-monitor
       nnn
+      nur.repos.linyinfeng.wemeet
       pavucontrol
       peek
       pgcli
@@ -95,8 +97,6 @@
       xxd
       yesplaymusic
       zoom-us
-      nur.repos.linyinfeng.wemeet
-      follow
       (wechat-uos.override {
         uosLicense = builtins.fetchurl {
           url = "https://github.com/archlinux/aur/raw/6e9a4ad47ff090ecd98170e26bd55219e55109fc/license.tar.gz";
@@ -135,16 +135,8 @@
 
   home.activation = {
     createGoPath = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-      $DRY_RUN_CMD mkdir -p $VERBOSE_ARG $HOME/.go
+      run mkdir -p $VERBOSE_ARG $HOME/.go
     '';
-
-    restartSopsNix = lib.hm.dag.entryAfter [ "reloadSystemd" ] ''
-      (
-            if ${pkgs.systemd}/bin/systemctl --user list-unit-files | grep -q sops-nix.service; then
-              echo "restart sops-nix.service"
-              $DRY_RUN_CMD ${pkgs.systemd}/bin/systemctl --user restart sops-nix.service
-            fi
-          )'';
   };
 
   home.keyboard.options = [ "caps:escape" ];

diff --git a/nixos/workstation/home/desktop/default.nix b/nixos/workstation/home/desktop/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./i3.nix
+    ./xfce.nix
     ./dunst.nix
   ];
 
@@ -20,8 +21,8 @@
   gtk = {
     enable = true;
     iconTheme = {
-      package = pkgs.tela-icon-theme;
-      name = "Tela";
+      package = pkgs.papirus-icon-theme;
+      name = "Papirus-Dark";
     };
     theme = config.gtk.globalTheme;
   };

diff --git a/nixos/workstation/home/desktop/dunst.nix b/nixos/workstation/home/desktop/dunst.nix
@@ -46,8 +46,8 @@ in
     };
 
     iconTheme = {
-      name = "Tela";
-      package = pkgs.tela-icon-theme;
+      package = pkgs.papirus-icon-theme;
+      name = "Papirus-Dark";
       size = "32x32";
     };
   };

diff --git a/nixos/workstation/home/desktop/i3.nix b/nixos/workstation/home/desktop/i3.nix
@@ -7,7 +7,6 @@
 let
   modifier0 = "Mod4";
   modifier1 = "Mod1";
-  betterlockscreen = "${pkgs.betterlockscreen}/bin/betterlockscreen";
   colors = config.scheme.withHashtag;
   i3 = {
     enable = true;
@@ -100,12 +99,10 @@ let
         "${modifier0}+Shift+k" = "move up";
 
         "${modifier0}+Shift+q" = "exec i3-msg restart";
-        "${modifier0}+Shift+x" = ''
-          exec ${betterlockscreen} -l dim
-        '';
+        "${modifier0}+Shift+x" = "exec xflock4";
         "${modifier0}+c" = "exec env CM_LAUNCHER=rofi clipmenu";
-        "${modifier0}+m" = "exec autorandr --change";
-        "${modifier0}+w" = "exec brave";
+        "${modifier0}+m" = "exec xfce4-display-settings -m";
+        "${modifier0}+w" = "exec firefox-nightly";
         "${modifier0}+p" = "exec rofi -show combi";
         "${modifier0}+d" = "exec Discord";
         "${modifier0}+t" = "exec telegram-desktop";
@@ -114,7 +111,7 @@ let
         "${modifier0}+Shift+n" = "exec dunstctl close-all";
         "${modifier0}+g" = "exec gedit";
         "${modifier0}+space" = "exec wmfocus";
-        "${modifier0}+b" = "exec polybar-msg cmd toggle";
+        # "${modifier0}+b" = "exec polybar-msg cmd toggle";
 
         # Disable tiling_drag before there is a threshold for it.
         "button1" = "focus";
@@ -156,9 +153,10 @@ let
           { class = "^firefox-nightly$"; }
           { class = "^Brave-browser$"; }
           { class = "^logseq$"; }
+          { class = "^kitty$"; }
         ];
         "2: chat" = [
-          { class = "^Discord$"; }
+          { class = "^discord$"; }
           { class = "^TelegramDesktop$"; }
         ];
         "3: mail" = [ { class = "^thunderbird$"; } ];
@@ -174,23 +172,15 @@ let
           command = "feh --bg-scale --conversion-timeout 1 ~/.background-image";
           always = true;
         }
-        {
-          command = "${betterlockscreen} -u ~/.background-image --fx dim,pixel";
-          always = true;
-        }
-        {
-          command = "systemctl restart --user polybar.service";
-          always = true;
-        }
-        {
-          command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-          always = true;
-        }
         { command = "i3-msg workspace 1: main"; }
         { command = "firefox-nightly"; }
         { command = "logseq"; }
         { command = "kitty tmux"; }
         { command = "thunderbird"; }
+        # {
+        #   command = "systemctl restart --user polybar.service";
+        #   always = true;
+        # }
       ];
       bars = lib.mkForce [ ];
     };
@@ -226,6 +216,9 @@ in
 {
   xsession = {
     enable = true;
+    initExtra = ''
+      ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
+    '';
     windowManager = {
       inherit i3;
     };

diff --git a/nixos/workstation/home/desktop/xfce.nix b/nixos/workstation/home/desktop/xfce.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  xfconf.settings = {
+    keyboards = {
+      "Default/KeyRepeat/Delay" = 200;
+      "Default/KeyRepeat/Rate" = 50;
+    };
+  };
+}