home: reorganize · koi.rip/flake@c31c728

external/cargo.toml home/external/files/cargo.toml

external/config/quickshell/Modules/Bar/Bar.qml home/external/config/quickshell/Modules/Bar/Bar.qml

external/config/quickshell/Modules/Bar/Music.qml home/external/config/quickshell/Modules/Bar/Music.qml

external/config/quickshell/Modules/Bar/Spacer.qml home/external/config/quickshell/Modules/Bar/Spacer.qml

external/config/quickshell/Modules/Bar/Txt.qml home/external/config/quickshell/Modules/Bar/Txt.qml

external/config/quickshell/Modules/Bar/Workspaces.qml home/external/config/quickshell/Modules/Bar/Workspaces.qml

external/config/quickshell/Services/Niri/Niri.qml home/external/config/quickshell/Services/Niri/Niri.qml

external/config/quickshell/Services/Niri/niri.mjs home/external/config/quickshell/Services/Niri/niri.mjs

external/config/quickshell/shell.qml home/external/config/quickshell/shell.qml

external/gitmessage.txt home/external/files/gitmessage.txt

external/npmrc home/external/files/npmrc

external/rofi-evergarden.rasi home/external/files/rofi-evergarden.rasi

external/scripts/nix-shell-generate.sh home/external/scripts/nix-shell-generate.sh

external/scripts/shreddir.sh home/external/scripts/shreddir.sh

external/userChrome.css home/external/files/userChrome.css

external/wallpaper.png home/external/files/wallpaper.png

external/zsh/functions.zsh home/external/zsh/functions.zsh

external/zsh/keymap.zsh home/external/zsh/keymap.zsh

external/zsh/profile.zsh home/external/zsh/profile.zsh

external/zsh/prompt.zsh home/external/zsh/prompt.zsh

+8 -7

home/koi.nix home/default.nix

··· 7 7 }; 8 8 9 9 imports = [ 10 - ./modules/external.nix 11 - ./modules/xdg.nix 12 - ./modules/age.nix 13 - ./modules/theme.nix 14 - ./modules/packages.nix 15 - ./modules/wayland 16 - ./modules/programs 10 + ./xdg.nix 11 + ./age.nix 12 + ./theme.nix 13 + ./packages.nix 14 + ./external 15 + ./wayland 16 + ./programs 17 + ./services 17 18 18 19 inputs.evergarden.homeManagerModules.default 19 20 ];

-2

home/modules/age.nix home/age.nix

··· 1 1 { config, inputs, ... }: 2 - 3 2 { 4 3 imports = [ inputs.agenix.homeManagerModules.default ]; 5 - 6 4 age.identityPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; 7 5 }

+4 -4

home/modules/external.nix home/external/default.nix

··· 1 1 let 2 - configs = ../../external/config; 3 - scripts = ../../external/scripts; 4 - cargoConfig = ../../external/cargo.toml; 5 - npmConfig = ../../external/npmrc; 2 + configs = ./config; 3 + scripts = ./scripts; 4 + cargoConfig = ./files/cargo.toml; 5 + npmConfig = ./files/npmrc; 6 6 in 7 7 { 8 8 home.file = builtins.listToAttrs (

home/modules/packages.nix home/packages.nix

home/modules/programs/aerc.nix home/programs/console/aerc.nix

-4

home/modules/programs/awww.nix

··· 1 - { 2 - home.file.".wallpaper.png".source = ../../../external/wallpaper.png; 3 - services.awww.enable = true; 4 - }

-1

home/modules/programs/cuteff.nix home/programs/console/cuteff.nix

··· 1 1 { inputs, ... }: 2 - 3 2 { 4 3 imports = [ inputs.cuteff.homeManagerModules.default ]; 5 4 programs.cuteff = {

-31

home/modules/programs/default.nix

··· 1 - { 2 - imports = [ 3 - ./fd.nix 4 - ./gpg.nix 5 - ./git.nix 6 - ./eza.nix 7 - ./fzf.nix 8 - ./zsh.nix 9 - ./aerc.nix 10 - ./halloy.nix 11 - ./direnv.nix 12 - ./zoxide.nix 13 - ./neovim.nix 14 - ./meowtd.nix 15 - ./cuteff.nix 16 - ./jujutsu.nix 17 - 18 - ./user-desktop.nix 19 - ./jellyfin-rpc.nix 20 - ./vita-presence.nix 21 - 22 - ./awww.nix 23 - ./rofi.nix 24 - ./foot.nix 25 - ./dunst.nix 26 - ./quickshell.nix 27 - 28 - ./vesktop.nix 29 - ./zen-browser.nix 30 - ]; 31 - }

-1

home/modules/programs/direnv.nix home/programs/console/direnv.nix

··· 1 1 { pkgs, ... }: 2 - 3 2 { 4 3 programs.direnv = { 5 4 enable = true;

home/modules/programs/dunst.nix home/services/graphical/dunst.nix

home/modules/programs/eza.nix home/programs/console/eza.nix

home/modules/programs/fd.nix home/programs/console/fd.nix

home/modules/programs/foot.nix home/programs/graphical/foot.nix

home/modules/programs/fzf.nix home/programs/console/fzf.nix

+1 -1

home/modules/programs/git.nix home/programs/console/git.nix

··· 65 65 remoteBranch = "magenta"; 66 66 }; 67 67 68 - commit.template = toString ../../../external/gitmessage.txt; 68 + commit.template = toString ../../external/files/gitmessage.txt; 69 69 init.defaultBranch = "main"; 70 70 }; 71 71 };

home/modules/programs/gpg.nix home/programs/console/gpg.nix

home/modules/programs/halloy.nix home/programs/graphical/halloy.nix

home/modules/programs/jellyfin-rpc.nix home/services/discord/jellyfin-rpc.nix

+1 -1

home/modules/programs/jujutsu.nix home/programs/console/jujutsu.nix

··· 64 64 builtin_draft_commit_description, 65 65 "${ 66 66 builtins.replaceStrings [ "# " " at " ] [ "JJ: " "@" ] ( 67 - builtins.readFile ../../../external/gitmessage.txt 67 + builtins.readFile ../../external/files/gitmessage.txt 68 68 ) 69 69 }", 70 70 "\nJJ: ignore-rest\n",

home/modules/programs/meowtd.nix home/programs/console/meowtd.nix

-1

home/modules/programs/neovim.nix home/programs/console/neovim.nix

··· 1 1 { inputs, pkgs, ... }: 2 - 3 2 { 4 3 imports = [ inputs.anvim.homeManagerModules.default ]; 5 4

home/modules/programs/quickshell.nix home/services/graphical/quickshell.nix

+1 -1

home/modules/programs/rofi.nix home/programs/graphical/rofi.nix

··· 1 1 { pkgs, ... }: 2 2 let 3 - evergarden = ../../../external/rofi-evergarden.rasi; 3 + evergarden = ../../external/files/rofi-evergarden.rasi; 4 4 config = pkgs.fetchurl { 5 5 url = "https://raw.githubusercontent.com/catppuccin/rofi/71fb15577ccb091df2f4fc1f65710edbc61b5a53/catppuccin-default.rasi"; 6 6 hash = "sha256-v2DtDReDvkJ70rdbF5ldH9mS6acLlrg7Q3L6nJU3ebg=";

-26

home/modules/programs/spicetify.nix

··· 1 - { pkgs, inputs, ... }: 2 - 3 - let 4 - inherit (inputs) spicetify-nix; 5 - spicePkgs = spicetify-nix.legacyPackages.${pkgs.stdenv.system}; 6 - in 7 - { 8 - imports = [ 9 - spicetify-nix.homeManagerModules.spicetify 10 - ]; 11 - 12 - programs.spicetify = { 13 - enable = true; 14 - theme = spicePkgs.themes.catppuccin; 15 - colorScheme = "mocha"; 16 - wayland = true; 17 - enabledExtensions = with spicePkgs.extensions; [ 18 - catJamSynced 19 - seekSong 20 - fullAlbumDate 21 - songStats 22 - adblock 23 - playNext 24 - ]; 25 - }; 26 - }

home/modules/programs/user-desktop.nix home/services/discord/user-desktop.nix

home/modules/programs/vesktop.nix home/programs/graphical/vesktop.nix

home/modules/programs/vita-presence-package.nix home/services/discord/vita-presence-package.nix

+9 -9

home/modules/programs/vita-presence.nix home/services/discord/vita-presence.nix

··· 2 2 let 3 3 name = "vita-presence-the-server"; 4 4 package = pkgs.callPackage ./vita-presence-package.nix { }; 5 - config = pkgs.runCommand "vita-presence-config" {} '' 6 - mkdir -p $out 7 - cat > $out/${name}.ini <<'EOF' 8 - [General] 9 - appID = 1509590848625578226 10 - vitaIP = 192.168.55.180 11 - updateTimer = 5000 12 - vitaTimeout = 5000 13 - EOF 5 + config = pkgs.runCommand "vita-presence-config" { } '' 6 + mkdir -p $out 7 + cat > $out/${name}.ini <<'EOF' 8 + [General] 9 + appID = 1509590848625578226 10 + vitaIP = 192.168.55.180 11 + updateTimer = 5000 12 + vitaTimeout = 5000 13 + EOF 14 14 ''; 15 15 in 16 16 {

+1 -1

home/modules/programs/zen-browser.nix home/programs/graphical/zen-browser.nix

··· 67 67 "media.videocontrols.picture-in-picture.video-toggle.enabled" = true; 68 68 "layout.css.prefers-color-scheme.content-override" = 0; # dark mode 69 69 }; 70 - userChrome = builtins.readFile ../../../external/userChrome.css; 70 + userChrome = builtins.readFile ../../external/files/userChrome.css; 71 71 keyboardShortcutsVersion = 19; 72 72 keyboardShortcuts = [ 73 73 {

home/modules/programs/zoxide.nix home/programs/console/zoxide.nix

+1 -1

home/modules/programs/zsh.nix home/programs/console/zsh.nix

··· 1 1 { pkgs, ... }: 2 2 3 3 let 4 - external = ../../../external/zsh; 4 + external = ../../external/zsh; 5 5 in 6 6 { 7 7 home.shell.enableZshIntegration = true;

home/modules/theme.nix home/theme.nix

+1

home/modules/wayland/default.nix home/wayland/default.nix

··· 1 1 { 2 2 imports = [ 3 + ./xdg.nix 3 4 ./environment.nix 4 5 ./niri.nix 5 6 ];

home/modules/wayland/environment.nix home/wayland/environment.nix

home/modules/wayland/niri.nix home/wayland/niri.nix

+1 -19

home/modules/xdg.nix home/xdg.nix

··· 1 - { config, pkgs, ... }: 1 + { config, ... }: 2 2 let 3 3 home = config.home.homeDirectory; 4 4 in ··· 16 16 publicShare = "/tmp/garbage"; 17 17 templates = "/tmp/garbage"; 18 18 videos = "/tmp/garbage"; 19 - }; 20 - 21 - portal = { 22 - enable = true; 23 - extraPortals = [ 24 - pkgs.xdg-desktop-portal-gtk 25 - pkgs.xdg-desktop-portal-gnome 26 - ]; 27 - 28 - config.common = { 29 - default = [ 30 - "gtk" 31 - "gnome" 32 - ]; 33 - 34 - "org.freedesktop.impl.portal.Access" = [ "gtk" ]; 35 - "org.freedesktop.impl.portal.Notification" = [ "gtk" ]; 36 - }; 37 19 }; 38 20 }; 39 21

+30

home/programs/console/default.nix

··· 1 + { 2 + imports = [ 3 + # encryption 4 + ./gpg.nix 5 + 6 + # version control 7 + ./jujutsu.nix 8 + ./git.nix 9 + 10 + # shell 11 + ./zsh.nix 12 + ./zoxide.nix 13 + ./direnv.nix 14 + ./eza.nix 15 + 16 + # file management 17 + ./fd.nix 18 + ./fzf.nix 19 + 20 + # info 21 + ./cuteff.nix 22 + 23 + # text 24 + ./neovim.nix 25 + ./aerc.nix 26 + 27 + # network 28 + ./meowtd.nix 29 + ]; 30 + }

+6

home/programs/default.nix

··· 1 + { 2 + imports = [ 3 + ./console 4 + ./graphical 5 + ]; 6 + }

+16

home/programs/graphical/default.nix

··· 1 + { 2 + imports = [ 3 + # terminal emulators 4 + ./foot.nix 5 + 6 + # launchers 7 + ./rofi.nix 8 + 9 + # web 10 + ./vesktop.nix 11 + ./zen-browser.nix 12 + 13 + # communication 14 + ./halloy.nix 15 + ]; 16 + }

+6

home/services/default.nix

··· 1 + { 2 + imports = [ 3 + ./graphical 4 + ./discord 5 + ]; 6 + }

+7

home/services/discord/default.nix

··· 1 + { 2 + imports = [ 3 + ./jellyfin-rpc.nix 4 + ./user-desktop.nix 5 + ./vita-presence.nix 6 + ]; 7 + }

+4

home/services/graphical/awww.nix

··· 1 + { 2 + home.file.".wallpaper.png".source = ../../external/files/wallpaper.png; 3 + services.awww.enable = true; 4 + }

+7

home/services/graphical/default.nix

··· 1 + { 2 + imports = [ 3 + ./awww.nix 4 + ./dunst.nix 5 + ./quickshell.nix 6 + ]; 7 + }

+20

home/wayland/xdg.nix

··· 1 + { pkgs, ... }: 2 + { 3 + xdg.portal = { 4 + enable = true; 5 + extraPortals = [ 6 + pkgs.xdg-desktop-portal-gtk 7 + pkgs.xdg-desktop-portal-gnome 8 + ]; 9 + 10 + config.common = { 11 + default = [ 12 + "gtk" 13 + "gnome" 14 + ]; 15 + 16 + "org.freedesktop.impl.portal.Access" = [ "gtk" ]; 17 + "org.freedesktop.impl.portal.Notification" = [ "gtk" ]; 18 + }; 19 + }; 20 + }

+1 -1

modules/home.nix

··· 13 13 inputs 14 14 ; 15 15 }; # TODO: optimize maybe 16 - users.koi = import ../home/koi.nix; 16 + users.koi = import ../home; 17 17 }; 18 18 }

Configure Feed

Configure Feed