Merge branch 'master' of https://git.4o1x5.dev/4o1x5/dotfiles

flake.lock

@@ -281,11 +281,11 @@
         "nixvim": "nixvim"
       },
       "locked": {
-        "lastModified": 1736114968,
-        "narHash": "sha256-SLObAEcr36MpD59gdEtRw2t3DDXPepeAHSgOigf+kLg=",
+        "lastModified": 1737310220,
+        "narHash": "sha256-2aS+mqzCPcPOaSMel+3ASRB2Xyh80jAEO3H7jT4JPuQ=",
         "ref": "refs/heads/master",
-        "rev": "0256cebaca7690307fbf71b310b8fdb422160210",
-        "revCount": 13,
+        "rev": "a5a723785017784ce40be12521880dac8583c274",
+        "revCount": 19,
         "type": "git",
         "url": "https://git.4o1x5.dev/4o1x5/neo2005"
       },

hosts/strix/configs/cmus.nix

@@ -0,0 +1,9 @@
+{ user, ... }:
+{
+
+  home-manager.users.${user}.programs.cmus = {
+    enable = true;
+    # TODO  shades of purple theme here
+    # extraConfig
+  };
+}

hosts/strix/configs/sshfs.nix

@@ -0,0 +1,22 @@
+{ ... }:
+{
+
+  # ssh fs from jelylfin user on carbon for music
+  # TODO mkdir Music
+  # https://discourse.nixos.org/t/how-to-auto-mount-with-sshfs-as-a-normal-user/48276
+  fileSystems."/home/grape/Music" = {
+    device = "root@32.54.31.180:/home/jellyfin/music/Music";
+    fsType = "fuse.sshfs";
+    options = [
+      "IdentityFile=/home/grape/.ssh/id_ed25519"
+      "idmap=user"
+      #"sshfs_debug"
+      "x-systemd.automount" # < mount the filesystem automatically on first access
+      "allow_other" # < don't restrict access to only the user which `mount`s it (because that's probably systemd who mounts it, not you)
+      "user" # < allow manual `mount`ing, as ordinary user.
+      "_netdev"
+    ];
+  };
+  boot.supportedFilesystems."fuse.sshfs" = true;
+
+}

hosts/strix/configs/tmux.nix

@@ -6,8 +6,9 @@
       set -g allow-passthrough on
       set -g default-shell "${pkgs.zsh}/bin/zsh"
       set-window-option -g mode-keys vi
+      set -g default-terminal xterm-256color
     '';
-    terminal = "screen-256color";
+    #terminal = "screen-256color";
     #shell = "${pkgs.zsh}/bin/zsh";
   };
 

hosts/strix/configuration.nix

@@ -26,6 +26,7 @@
 
     # music
     ./apps/music.nix
+    ./configs/sshfs.nix # mount jellyfin music to local ~/Music
 
     # gayming
     ./gaming.nix
@@ -49,7 +50,6 @@
     ./apps/office.nix
 
     # node xporter
-    #./configs/prometheus.nix
     ./configs/neofetch.nix
     ./configs/logseq.nix
     ./configs/i3.nix
@@ -67,6 +67,7 @@
     ./configs/nvim.nix
     ./configs/node_exporter.nix
     ./configs/tmux.nix
+    ./configs/cmus.nix
 
     # terminal
     #./configs/st.nix # too minimal, most things dont work without a million tweaks
@@ -109,9 +110,6 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  # kernel
-  #boot.kernelPackages = pkgs.linuxPackages_xanmod; # Gaming
-
   #boot.initrd.luks.devices."luks-f7e86dde-55a5-4306-a7c2-cf2d93c9ee0b".device = "/dev/disk/by-uuid/f7e86dde-55a5-4306-a7c2-cf2d93c9ee0b"; # old dead ssd rip 24.07.28
   boot.initrd.luks.devices."luks-da1b2f8c-877a-4c39-8965-a4af625718c".device =
     "/dev/disk/by-uuid/da1b2f8c-877a-4c39-8965-a4af6a25718c";
@@ -144,9 +142,10 @@
     description = "grape";
     extraGroups = [
       "networkmanager"
-      "wheel"
+      "wheel" # fo doas/sudo
       "audio"
       "docker"
+      "fuse" # for sshfs
     ];
   };
 

hosts/thinkpad/configs/tmux.nix

@@ -5,9 +5,10 @@
     extraConfig = ''
       set -g allow-passthrough on
       set -g default-shell "${pkgs.zsh}/bin/zsh"
+      set -g default-terminal xterm-256color
       set-window-option -g mode-keys vi
     '';
-    terminal = "screen-256color";
+    #terminal = "screen-256color";
     #shell = "${pkgs.zsh}/bin/zsh";
   };