commit cae75d197fd433191f14f6b4ec45101a33675d03
parent 76c8c56742a31b5ea4ac9e5d1ae1a854d4f0bcc6
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Mon, 13 Oct 2025 17:36:00 +0200
parent 76c8c56742a31b5ea4ac9e5d1ae1a854d4f0bcc6
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Mon, 13 Oct 2025 17:36:00 +0200
Merge branch 'wip/void/catchup' of ssh://git.srv.eukaryote.eu/zaphoid/config into wip/zaphyra/main
109 files changed, 322 insertions(+), 90 deletions(-)
R
|
0
R
|
0
R
config/home-manager/zaphyra/programs/libreoffice.nix -> config/home/zaphyra/programs/libreoffice.nix
|
0
A
|
69
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
|
0
R
config/home-manager/zaphyra/programs/pdfarranger.nix -> config/home/zaphyra/programs/pdfarranger.nix
|
0
R
config/home-manager/zaphyra/programs/thunderbird.nix -> config/home/zaphyra/programs/thunderbird.nix
|
0
R
|
0
diff --git a/.sops.yaml b/.sops.yaml @@ -1,4 +1,5 @@ keys: + - &void AB27F5D1136B20D3149FBCC00389451731A3ADDD - &zaphyra BFE6386C8D66BCD4DAE14FC895F0FE7CD7E6A022 - &huntii age1laajqafnm4ft2m73wq7yqug4ts04ddn59wlqs4t30upeqa35dpdqu8fu3n - &morio age1wpffcr5p88a2x9dzx5v3sq4jqurvygu94fx773n229fqk4p95qzs840cmn
diff --git a/config/home-manager/common/home.nix b/config/home-manager/common/home.nix @@ -1,20 +0,0 @@ -{ - inputs, - lib, - ... -}: - -{ - - imports = [ - inputs.impermanence.homeManagerModules.impermanence - inputs.niriFlake.homeModules.config - inputs.sopsNix.homeManagerModules.sops - inputs.sherlock.homeManagerModules.default - inputs.airpodsctl.homeManagerModules.kairpodsd - inputs.tgcNUR.homeManagerModules.default - ]; - - home.stateVersion = lib.mkDefault "25.05"; - -}
diff --git a/config/home-manager/zaphyra/home.nix b/config/home-manager/zaphyra/home.nix @@ -1,51 +0,0 @@ -{ - homeManagerModules, - pkgs, - ... -}: - -{ - - i18n.glibcLocales = pkgs.glibcLocales.override { - allLocales = false; - locales = [ - "en_GB.UTF-8/UTF-8" - "de_DE.UTF-8/UTF-8" - ]; - }; - - home.language = { - base = "en_GB.UTF-8"; - messages = "en_GB.UTF-8"; - ctype = "en_GB.UTF-8"; - address = "de_DE.UTF-8"; - collate = "de_DE.UTF-8"; - measurement = "de_DE.UTF-8"; - monetary = "de_DE.UTF-8"; - name = "de_DE.UTF-8"; - numeric = "en_GB.UTF-8"; - paper = "de_DE.UTF-8"; - telephone = "de_DE.UTF-8"; - time = "en_GB.UTF-8"; - }; - - imports = with homeManagerModules.zaphyra; [ - homeManagerModules.common.programs.starship - programs.fish - programs.mcfly - programs.zoxide - programs.eza - programs.bat - - programs.chawan - programs.yazi - programs.micro - programs.helix - programs.tmux - programs.htop - - programs.deploymentUtilities - programs.shellUtilities - ]; - -}
diff --git a/config/home-manager/zaphyra/programs/app2unit.nix b/config/home-manager/zaphyra/programs/app2unit.nix @@ -1,11 +0,0 @@ -{ pkgs, ... }: - -{ - - home.packages = with pkgs; [ - unstable.app2unit - xdg-launch - xdg-terminal-exec-mkhl - ]; - -}
diff --git a/config/home/common/home.nix b/config/home/common/home.nix @@ -0,0 +1,20 @@ +{ + inputs, + lib, + ... +}: + +{ + + imports = [ + inputs.impermanence.homeManagerModules.impermanence + #inputs.niriFlake.homeModules.config + inputs.sopsNix.homeManagerModules.sops + #inputs.sherlock.homeManagerModules.default + #inputs.airpodsctl.homeManagerModules.kairpodsd + #inputs.tgcNUR.homeManagerModules.default + ]; + + home.stateVersion = lib.mkDefault "25.05"; + +}
diff --git a/config/home/common/programs/app2unit.nix b/config/home/common/programs/app2unit.nix @@ -0,0 +1,14 @@ +{ + pkgs, + ... +}: + +{ + + home.packages = with pkgs; [ + unstable.app2unit + xdg-launch + xdg-terminal-exec-mkhl + ]; + +}
diff --git a/config/home/void/programs/ssh.nix b/config/home/void/programs/ssh.nix @@ -3,13 +3,15 @@ config = { programs.ssh = { enable = true; - controlMaster = "auto"; - controlPersist = "10m"; - serverAliveInterval = 30; extraConfig = '' VisualHostKey yes ''; matchBlocks = { + "*" = { + controlMaster = "auto"; + controlPersist = "10m"; + serverAliveInterval = 30; + }; hortorum = { hostname = "37.120.168.131"; port = 18810;
diff --git a/config/home-manager/zaphyra/configure/niri.nix b/config/home/zaphyra/configure/niri.nix
diff --git a/config/home/zaphyra/configure/xdg.nix b/config/home/zaphyra/configure/xdg.nix @@ -0,0 +1,38 @@ +{ config, ... }: + +{ + + home.preferXdgDirectories = true; + + gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + + xdg = { + enable = true; + mime.enable = true; + + userDirs = { + enable = true; + + desktop = config.home.homeDirectory; + publicShare = config.home.homeDirectory; + templates = config.home.homeDirectory; + + documents = "${config.home.homeDirectory}/Documents"; + download = "${config.home.homeDirectory}/Downloads"; + videos = "${config.home.homeDirectory}/Videos"; + music = "${config.home.homeDirectory}/Music"; + pictures = "${config.home.homeDirectory}/Pictures"; + }; + }; + + xdg.configFile."gtk-3.0/bookmarks".force = true; + gtk.gtk3.bookmarks = [ + "file://${config.home.homeDirectory}/Downloads" + "file://${config.home.homeDirectory}/Documents" + "file://${config.home.homeDirectory}/proj Projects" + "file://${config.home.homeDirectory}/Audiobooks" + "file://${config.home.homeDirectory}/Music" + "file://${config.home.homeDirectory}/Pictures" + ]; + +}
diff --git a/config/home/zaphyra/home.nix b/config/home/zaphyra/home.nix @@ -0,0 +1,52 @@ +{ + homeManagerModules, + pkgs, + ... +}: + +{ + + i18n.glibcLocales = pkgs.glibcLocales.override { + allLocales = false; + locales = [ + "en_GB.UTF-8/UTF-8" + "de_DE.UTF-8/UTF-8" + ]; + }; + + home.language = { + base = "en_GB.UTF-8"; + messages = "en_GB.UTF-8"; + ctype = "en_GB.UTF-8"; + address = "de_DE.UTF-8"; + collate = "de_DE.UTF-8"; + measurement = "de_DE.UTF-8"; + monetary = "de_DE.UTF-8"; + name = "de_DE.UTF-8"; + numeric = "en_GB.UTF-8"; + paper = "de_DE.UTF-8"; + telephone = "de_DE.UTF-8"; + time = "en_GB.UTF-8"; + }; + + imports = with homeManagerModules.zaphyra; [ + homeManagerModules.common.programs.starship + homeManagerModules.common.programs.app2unit + programs.fish + programs.mcfly + programs.zoxide + programs.eza + programs.bat + + programs.chawan + programs.yazi + programs.micro + programs.helix + programs.tmux + programs.htop + + programs.deploymentUtilities + programs.shellUtilities + ]; + +}
diff --git a/config/home/zaphyra/programs/celluloid.nix b/config/home/zaphyra/programs/celluloid.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + + home.packages = [ pkgs.celluloid ]; + + dconf.settings = { + "io/github/celluloid-player/celluloid" = { + always-append-to-playlist = true; + draggable-video-area-enable = true; + always-autohide-cursor = true; + }; + }; + +}
diff --git a/config/home-manager/zaphyra/programs/gajim.nix b/config/home/zaphyra/programs/gajim.nix
diff --git a/config/home-manager/zaphyra/programs/helix.nix b/config/home/zaphyra/programs/helix.nix
diff --git a/config/home-manager/zaphyra/programs/loupe.nix b/config/home/zaphyra/programs/loupe.nix
diff --git a/config/home-manager/zaphyra/programs/mcfly.nix b/config/home/zaphyra/programs/mcfly.nix
diff --git a/config/home-manager/zaphyra/programs/micro.nix b/config/home/zaphyra/programs/micro.nix
diff --git a/config/home/zaphyra/programs/nautilus.nix b/config/home/zaphyra/programs/nautilus.nix @@ -0,0 +1,69 @@ +{ + config, + lib, + pkgs, + ... +}: + +{ + + home.packages = with pkgs; [ + nautilus + sushi # quick-preview for nautilus + ]; + + home.sessionVariables = { + NAUTILUS_4_EXTENSION_DIR = "${config.home.profileDirectory}/lib/nautilus/extensions-4"; + }; + + xdg.mimeApps.enable = true; + xdg.mimeApps.defaultApplications = lib.genAttrs [ + "inode/directory" + "application/x-7z-compressed" + "application/x-7z-compressed-tar" + "application/x-bzip" + "application/x-bzip-compressed-tar" + "application/x-compress" + "application/x-compressed-tar" + "application/x-cpio" + "application/x-gzip" + "application/x-lha" + "application/x-lzip" + "application/x-lzip-compressed-tar" + "application/x-lzma" + "application/x-lzma-compressed-tar" + "application/x-tar" + "application/x-tarz" + "application/x-xar" + "application/x-xz" + "application/x-xz-compressed-tar" + "application/zip" + "application/gzip" + "application/bzip2" + "application/x-bzip2-compressed-tar" + "application/vnd.rar;application/zstd" + "application/x-zstd-compressed-tar" + ] (name: [ "org.gnome.Nautilus.desktop" ]); + + gtk.gtk4.extraCss = '' + /* remove 'starred' in nautilus side-panel */ + .nautilus-window .navigation-sidebar > .sidebar-row:nth-child(2) { + min-height:0; + font-size: 0; + -gtk-icon-size: 0; + margin-top: -2px; + } + ''; + + dconf.settings = { + "org/gnome/nautilus/list-view" = { + use-tree-view = true; + default-zoom-level = "small"; + }; + "org/gnome/nautilus/preferences" = { + date-time-format = "detailed"; + default-folder-viewer = "list-view"; + }; + }; + +}
diff --git a/config/home-manager/zaphyra/programs/nmgui.nix b/config/home/zaphyra/programs/nmgui.nix
diff --git a/config/home-manager/zaphyra/programs/typst.nix b/config/home/zaphyra/programs/typst.nix
diff --git a/config/home/zaphyra/services/wpaperd.nix b/config/home/zaphyra/services/wpaperd.nix @@ -0,0 +1,49 @@ +{ + config, + pkgs, + lib, + ... +}: + +{ + + home.persistence."/nix/persist/home/${config.home.username}".directories = [ + "wpaperd/.local/state/wpaperd" + ]; + + services.wpaperd = { + enable = true; + settings = { + default = { + duration = "30m"; + mode = "center"; + sorting = "ascending"; + transition.bounce = { }; + }; + + any.path = pkgs.buildEnv { + name = "nixos-artwork"; + paths = lib.pipe pkgs.nixos-artwork.wallpapers [ + lib.attrNames + (lib.remove "override") + (lib.remove "overrideDerivation") + # removed because too bright + (lib.remove "binary-white") + (lib.remove "catppuccin-latte") + (lib.remove "moonscape") + (lib.remove "nineish-catppuccin-latte") + (lib.remove "nineish-catppuccin-latte-alt") + (lib.remove "nineish-solarized-light") + (lib.remove "nineish") + (lib.remove "simple-light-gray") + (map (name: "${pkgs.nixos-artwork.wallpapers.${name}}/share/backgrounds/nixos")) + ]; + }; + }; + }; + + programs.niri.settings.binds = with config.lib.niri.actions; { + "Mod+Home".action = spawn (lib.getExe' pkgs.wpaperd "wpaperctl") "next"; + }; + +}
diff --git a/config/nixos/modules/hardware/bluetooth.nix b/config/nixos/modules/hardware/bluetooth.nix @@ -1,7 +1,7 @@ { - povSelf, config, lib, + povSelf, ... }: let @@ -21,7 +21,11 @@ in "/var/lib/bluetooth" ]; - hardware.bluetooth.enable = true; + hardware.bluetooth = { + enable = true; + powerOnBoot = lib.mkDefault false; + settings.General.Experimental = lib.mkDefault true; + }; }; }
diff --git a/config/nixos/modules/hardware/thunderbolt.nix b/config/nixos/modules/hardware/thunderbolt.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + povSelf, + ... +}: +let + inherit (lib) types; + cfg = lib.getAttrFromPath povSelf config; + +in +{ + + options.enable = { + type = types.bool; + default = false; + }; + + config = lib.mkIf cfg.enable { + boot.initrd.availableKernelModules = [ "thunderbolt" ]; + services.hardware.bolt.enable = true; + }; + +}
diff --git a/config/nixos/modules/presets/graphical/enable.nix b/config/nixos/modules/presets/graphical/enable.nix @@ -17,6 +17,13 @@ in }; config = lib.mkIf cfg { + environment.sessionVariables = { + _JAVA_AWT_WM_NONREPARENTING = "1"; + NIXOS_OZONE_WL = "1"; + SDL_VIDEODRIVER = "wayland"; # Can break some native games + WLR_NO_HARDWARE_CURSORS = "1"; + }; + modules = { audio.enable = true; boot = {
diff --git a/config/nixos/modules/programs/shellUtilities.nix b/config/nixos/modules/programs/shellUtilities.nix @@ -29,7 +29,6 @@ in eza file gnupg - helix nmap nvd openssh
diff --git a/config/nixos/modules/programs/steam.nix b/config/nixos/modules/programs/steam.nix @@ -28,7 +28,7 @@ in ''; } { - assertion = cfg.enable -> config.modules.filesystem.impermernance.home.enable; + assertion = cfg.enable -> !config.modules.filesystem.impermanence.home.enable; message = '' The programs.steam module can't be used when impermancence is used inside of home-directories. ''; @@ -36,6 +36,8 @@ in ]; modules.unfree.list = [ "steam" + "steam-original" + "steam-run" "steam-unwrapped" ]; programs.steam = {
diff --git a/flake.lock b/flake.lock @@ -902,6 +902,21 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1751949589, @@ -1087,6 +1102,7 @@ "niriFlake": "niriFlake", "nixStd": "nixStd", "nixSystemsDefault": "nixSystemsDefault", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgsUnstable": "nixpkgsUnstable", "oeffisearch": "oeffisearch",
diff --git a/flake.nix b/flake.nix @@ -48,7 +48,7 @@ nixosModules.default = ./config/nixosModules.nix; - homeManagerModules = loadDir pathLoader ./config/home-manager; + homeManagerModules = loadDir pathLoader ./config/home; nixpkgsOverlays = [ inputs.zaphyraWebsite.overlays.default @@ -228,6 +228,8 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixos-hardware.url = "github:NixOS/nixos-hardware"; + impermanence.url = "github:nix-community/impermanence"; nixStd.url = "github:chessai/nix-std";