All my system configs and packages in one repo

hjem: use the new native XDG attributes

pluie.me 75e2a2b9 774bc122

verified
+36 -28
+2 -2
modules/hjem-ctp/fcitx5.nix
··· 19 19 }; 20 20 21 21 config = lib.mkIf cfg.enable { 22 - files.".local/share/fcitx5/themes/catppuccin-${cfg.flavor}-${cfg.accent}".source = 22 + xdg.data.files."fcitx5/themes/catppuccin-${cfg.flavor}-${cfg.accent}".source = 23 23 "${finalPackage}/share/fcitx5/themes/catppuccin-${cfg.flavor}-${cfg.accent}"; 24 24 25 - files.".config/fcitx5/conf/classicui.conf".source = format.generate "fcitx5-classicui.conf" { 25 + xdg.config.files."fcitx5/conf/classicui.conf".source = format.generate "fcitx5-classicui.conf" { 26 26 globalSection = { 27 27 Theme = "catppuccin-${cfg.flavor}-${cfg.accent}"; 28 28 };
+1 -1
modules/hjem-ctp/fish.nix
··· 21 21 options.ctp.fish = ctp-lib.mkCatppuccinOptions "Fish" { }; 22 22 23 23 config = lib.mkIf cfg.enable { 24 - files.".config/fish/themes/${themeName}.theme".source = "${src}/themes/${themeName}.theme"; 24 + xdg.config.files."fish/themes/${themeName}.theme".source = "${src}/themes/${themeName}.theme"; 25 25 26 26 rum.programs.fish.earlyConfigFiles.ctp-fish = '' 27 27 fish_config theme choose "${themeName}"
+1 -1
modules/hjem-ctp/wleave.nix
··· 38 38 }; 39 39 40 40 config = lib.mkIf cfg.enable { 41 - files.".config/wleave/style.css".source = pkgs.concatText "wleave-style.css" [ 41 + xdg.config.files."wleave/style.css".source = pkgs.concatText "wleave-style.css" [ 42 42 "${src}/themes/${cfg.flavor}/${cfg.accent}.css" 43 43 (pkgs.writeText "wleave-icons.css" iconsCss) 44 44 ];
+1 -1
modules/hjem-ext/programs/direnv.nix
··· 25 25 ${lib.getExe cfg.package} hook fish | source 26 26 ''; 27 27 28 - files.".config/direnv/lib/hm-nix-direnv.sh".source = 28 + xdg.config.files."direnv/lib/hm-nix-direnv.sh".source = 29 29 lib.mkIf cfg.nix-direnv.enable "${cfg.nix-direnv.package}/share/nix-direnv/direnvrc"; 30 30 }; 31 31 }
+1 -1
modules/hjem-ext/programs/hyfetch.nix
··· 39 39 ++ lib.optional (cfg.settings.backend == "neofetch") pkgs.neofetch; 40 40 # TODO: add qwqfetch when it's added to nixpkgs 41 41 42 - files.".config/hyfetch.json".source = lib.mkIf (cfg.settings != { }) configFile; 42 + xdg.config.files."hyfetch.json".source = lib.mkIf (cfg.settings != { }) configFile; 43 43 }; 44 44 }
+1 -1
modules/hjem-ext/programs/jujutsu.nix
··· 23 23 24 24 config = lib.mkIf cfg.enable { 25 25 packages = [ cfg.package ]; 26 - files.".config/jj/config.toml".source = lib.mkIf (cfg.settings != { }) ( 26 + xdg.config.files."jj/config.toml".source = lib.mkIf (cfg.settings != { }) ( 27 27 format.generate "jj-config.toml" cfg.settings 28 28 ); 29 29 };
+6 -4
modules/hjem-ext/programs/swayosd.nix
··· 30 30 config = lib.mkIf cfg.enable { 31 31 packages = [ cfg.package ]; 32 32 33 - files.".config/swayosd/config.toml".source = lib.mkIf (cfg.settings != { }) ( 34 - format.generate "swayosd-config.toml" cfg.settings 35 - ); 36 - files.".config/swayosd/style.css".source = lib.mkIf (cfg.style != null) cfg.style; 33 + xdg.config.files = { 34 + "swayosd/config.toml".source = lib.mkIf (cfg.settings != { }) ( 35 + format.generate "swayosd-config.toml" cfg.settings 36 + ); 37 + "swayosd/style.css".source = lib.mkIf (cfg.style != null) cfg.style; 38 + }; 37 39 }; 38 40 }
+4 -4
modules/hjem-ext/programs/vesktop.nix
··· 56 56 }) 57 57 ]; 58 58 59 - files = 59 + xdg.config.files = 60 60 { 61 - ".config/vesktop/settings.json".source = format.generate "vesktop-settings.json" cfg.settings; 61 + "vesktop/settings.json".source = format.generate "vesktop-settings.json" cfg.settings; 62 62 } 63 63 // lib.optionalAttrs cfg.vencord.enable { 64 - ".config/vesktop/settings/settings.json".source = 64 + "vesktop/settings/settings.json".source = 65 65 format.generate "vencord-settings.json" cfg.vencord.settings; 66 66 67 - ".config/vesktop/settings/quickCss.css".text = cfg.vencord.css; 67 + "vesktop/settings/quickCss.css".text = cfg.vencord.css; 68 68 }; 69 69 }; 70 70 }
+5 -4
users/leah/presets/niri/default.nix
··· 34 34 resources 35 35 ]; 36 36 37 - files.".config/niri/config.kdl".source = ./config.kdl; 38 - 39 - files.".config/swaync/style.css".source = ./swaync/style.css; 40 - files.".config/swaync/config.json".source = ./swaync/config.json; 37 + xdg.config.files = { 38 + "niri/config.kdl".source = ./config.kdl; 39 + "swaync/style.css".source = ./swaync/style.css; 40 + "swaync/config.json".source = ./swaync/config.json; 41 + }; 41 42 }; 42 43 43 44 hjem.users.leah.rum.programs.fuzzel = {
+4 -2
users/leah/presets/niri/waybar/default.nix
··· 10 10 hjem.users.leah = { 11 11 packages = [ pkgs.waybar ]; 12 12 13 - files.".config/waybar/style.css".source = ./style.css; 14 - files.".config/waybar/config.jsonc".source = jsonFormat.generate "waybar-config.jsonc" config; 13 + xdg.config.files = { 14 + "waybar/style.css".source = ./style.css; 15 + "waybar/config.jsonc".source = jsonFormat.generate "waybar-config.jsonc" config; 16 + }; 15 17 }; 16 18 }
+4 -4
users/leah/programs/fcitx5.nix
··· 27 27 ]; 28 28 }; 29 29 30 - hjem.users.leah.files = { 31 - ".local/share/fcitx5/rime/default.custom.yaml".source = yaml.generate "default.yaml" { 30 + hjem.users.leah.xdg.data.files = { 31 + "fcitx5/rime/default.custom.yaml".source = yaml.generate "default.yaml" { 32 32 patch.schema_list = [ 33 33 { schema = "luna_pinyin_simp"; } 34 34 { schema = "luna_pinyin"; } 35 35 ]; 36 36 }; 37 - ".local/share/fcitx5/rime/luna_pinyin.custom.yaml".source = luna_pinyin; 38 - ".local/share/fcitx5/rime/luna_pinyin_simp.custom.yaml".source = luna_pinyin; 37 + "fcitx5/rime/luna_pinyin.custom.yaml".source = luna_pinyin; 38 + "fcitx5/rime/luna_pinyin_simp.custom.yaml".source = luna_pinyin; 39 39 }; 40 40 41 41 }
+1 -1
users/leah/programs/fish.nix
··· 28 28 ''; 29 29 }; 30 30 31 - hjem.users.leah.files.".config/starship.toml".source = ./starship.toml; 31 + hjem.users.leah.xdg.config.files."starship.toml".source = ./starship.toml; 32 32 }
+1 -1
users/leah/programs/ghostty.nix
··· 9 9 10 10 hjem.users.leah.rum.programs.ghostty = { 11 11 enable = true; 12 - package = inputs.ghostty.packages.${pkgs.system}.default; 12 + package = inputs.ghostty.packages.${pkgs.system}.ghostty; 13 13 14 14 settings = { 15 15 font-family = "Iosevka";
+4 -1
users/leah/programs/helix.nix
··· 3 3 environment.sessionVariables.EDITOR = "hx"; 4 4 5 5 # TODO: upstream this 6 - files.".config/helix/ignore".text = '' 6 + xdg.config.files."helix/ignore".text = '' 7 7 flake.lock 8 + result/ 9 + zig-out/ 10 + .zig-cache/ 8 11 ''; 9 12 10 13 rum.programs.helix = {