42willow.bsky.social / flake
my system configurations ^-^
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

refactor: move home manager configuration to root directory

willow 6c5966c0 5cc45984

+38 -18
+1
docs/darwin.md
··· 1 + https://github.com/nix-darwin/nix-darwin/issues/655#issuecomment-1551771624
-1
flake.nix
··· 72 72 inputs.nixpkgs.follows = "darwin-stable"; 73 73 }; 74 74 75 - 76 75 # themes 77 76 catppuccin = { 78 77 url = "github:catppuccin/nix";
+1 -1
hosts/anemone/default.nix
··· 14 14 inputs.nixos-hardware.nixosModules.raspberry-pi-3 15 15 (modulesPath + "/installer/scan/not-detected.nix") 16 16 (modulesPath + "/installer/sd-card/sd-image-aarch64.nix") 17 - "${self}/modules/home" 17 + "${self}/user" 18 18 "${self}/modules/nixos" 19 19 ]; 20 20
+1 -1
hosts/earthy/default.nix
··· 8 8 in { 9 9 imports = [ 10 10 ./hardware-configuration.nix 11 - "${self}/modules/home" 11 + "${self}/user" 12 12 "${self}/modules/nixos" 13 13 ]; 14 14
-1
hosts/starling/default.nix
··· 9 9 in { 10 10 imports = [ 11 11 "${self}/modules/darwin" 12 - "${self}/modules/shared" 13 12 ]; 14 13 15 14 networking = {
+1 -1
modules/darwin/default.nix
··· 1 1 { 2 - imports = [ ./homebrew.nix ]; 2 + imports = [./homebrew.nix ../shared]; 3 3 4 4 system = { 5 5 stateVersion = 6;
modules/home/default.nix user/default.nix
modules/home/desktop/bspwm/default.nix user/desktop/bspwm/default.nix
modules/home/desktop/default.nix user/desktop/default.nix
modules/home/desktop/hyprland/autostart.nix user/desktop/hyprland/autostart.nix
modules/home/desktop/hyprland/binds.nix user/desktop/hyprland/binds.nix
modules/home/desktop/hyprland/default.nix user/desktop/hyprland/default.nix
modules/home/desktop/hyprland/env.nix user/desktop/hyprland/env.nix
modules/home/desktop/hyprland/hypridle.nix user/desktop/hyprland/hypridle.nix
modules/home/desktop/hyprland/hyprlock.nix user/desktop/hyprland/hyprlock.nix
modules/home/desktop/hyprland/hyprpaper.nix user/desktop/hyprland/hyprpaper.nix
modules/home/desktop/hyprland/rules.nix user/desktop/hyprland/rules.nix
modules/home/desktop/hyprland/settings.nix user/desktop/hyprland/settings.nix
modules/home/desktop/niri/binds.nix user/desktop/niri/binds.nix
modules/home/desktop/niri/default.nix user/desktop/niri/default.nix
modules/home/home.nix user/home.nix
modules/home/programs/cli/beets.nix user/programs/cli/beets.nix
modules/home/programs/cli/bun.nix user/programs/cli/bun.nix
modules/home/programs/cli/default.nix user/programs/cli/default.nix
modules/home/programs/cli/direnv.nix user/programs/cli/direnv.nix
modules/home/programs/cli/eza.nix user/programs/cli/eza.nix
modules/home/programs/cli/fzf.nix user/programs/cli/fzf.nix
modules/home/programs/cli/git.nix user/programs/cli/git.nix
modules/home/programs/cli/hyfetch.nix user/programs/cli/hyfetch.nix
modules/home/programs/cli/nushell.nix user/programs/cli/nushell.nix
modules/home/programs/cli/ripgrep.nix user/programs/cli/ripgrep.nix
modules/home/programs/cli/starship.nix user/programs/cli/starship.nix
modules/home/programs/cli/zoxide.nix user/programs/cli/zoxide.nix
modules/home/programs/cli/zsh.nix user/programs/cli/zsh.nix
modules/home/programs/default.nix user/programs/default.nix
modules/home/programs/gui/browsers/chromium.nix user/programs/gui/browsers/chromium.nix
modules/home/programs/gui/browsers/default.nix user/programs/gui/browsers/default.nix
modules/home/programs/gui/browsers/firefox/containers.nix user/programs/gui/browsers/firefox/containers.nix
modules/home/programs/gui/browsers/firefox/default.nix user/programs/gui/browsers/firefox/default.nix
modules/home/programs/gui/browsers/firefox/engines.nix user/programs/gui/browsers/firefox/engines.nix
modules/home/programs/gui/browsers/firefox/policies.nix user/programs/gui/browsers/firefox/policies.nix
modules/home/programs/gui/browsers/floorp.nix user/programs/gui/browsers/floorp.nix
modules/home/programs/gui/default.nix user/programs/gui/default.nix
modules/home/programs/gui/lightburn.nix user/programs/gui/lightburn.nix
modules/home/programs/gui/obs-studio.nix user/programs/gui/obs-studio.nix
modules/home/programs/gui/quickshell.nix user/programs/gui/quickshell.nix
modules/home/programs/gui/spicetify.nix user/programs/gui/spicetify.nix
modules/home/programs/gui/terminals/alacritty.nix user/programs/gui/terminals/alacritty.nix
modules/home/programs/gui/terminals/default.nix user/programs/gui/terminals/default.nix
modules/home/programs/gui/terminals/ghostty.nix user/programs/gui/terminals/ghostty.nix
modules/home/programs/gui/terminals/kitty.nix user/programs/gui/terminals/kitty.nix
modules/home/programs/gui/thunderbird.nix user/programs/gui/thunderbird.nix
modules/home/programs/gui/tofi.nix user/programs/gui/tofi.nix
modules/home/programs/gui/waybar/default.nix user/programs/gui/waybar/default.nix
modules/home/programs/gui/waybar/style.css user/programs/gui/waybar/style.css
modules/home/programs/gui/zathura.nix user/programs/gui/zathura.nix
modules/home/programs/gui/zed/default.nix user/programs/gui/zed/default.nix
modules/home/programs/gui/zed/keymap.json user/programs/gui/zed/keymap.json
modules/home/programs/gui/zed/settings.json user/programs/gui/zed/settings.json
modules/home/programs/tui/bat.nix user/programs/tui/bat.nix
modules/home/programs/tui/btop.nix user/programs/tui/btop.nix
modules/home/programs/tui/default.nix user/programs/tui/default.nix
modules/home/programs/tui/gitui.nix user/programs/tui/gitui.nix
modules/home/programs/tui/helix.nix user/programs/tui/helix.nix
modules/home/programs/tui/lazygit.nix user/programs/tui/lazygit.nix
modules/home/programs/tui/ncmpcpp.nix user/programs/tui/ncmpcpp.nix
modules/home/programs/tui/yazi.nix user/programs/tui/yazi.nix
modules/home/scripts/default.nix user/scripts/default.nix
modules/home/scripts/spotdl.nix user/scripts/spotdl.nix
modules/home/services/default.nix user/services/default.nix
modules/home/services/gammastep.nix user/services/gammastep.nix
modules/home/services/mpd.nix user/services/mpd.nix
modules/home/system/default.nix user/system/default.nix
modules/home/system/env.nix user/system/env.nix
modules/home/system/xdg.nix user/system/xdg.nix
modules/home/themes/catppuccin.nix user/themes/catppuccin.nix
modules/home/themes/default.nix user/themes/default.nix
modules/home/themes/gtk.nix user/themes/gtk.nix
modules/home/themes/qt.nix user/themes/qt.nix
modules/home/themes/stylix.nix user/themes/stylix.nix
+29 -10
modules/shared/nix/age.nix
··· 6 6 }: let 7 7 inherit (inputs) self; 8 8 9 - mainUser = if config ? settings && config.settings ? system && config.settings.system ? mainUser 10 - then config.settings.system.mainUser 11 - else null; 9 + mainUser = 10 + if config ? settings && config.settings ? system && config.settings.system ? mainUser 11 + then config.settings.system.mainUser 12 + else null; 12 13 13 - userGroup = if mainUser != null then config.users.users.${mainUser}.group else null; 14 - sshDir = if mainUser != null then config.users.users.${mainUser}.home + "/.ssh" else null; 14 + userGroup = 15 + if mainUser != null 16 + then config.users.users.${mainUser}.group 17 + else null; 18 + sshDir = 19 + if mainUser != null 20 + then config.users.users.${mainUser}.home + "/.ssh" 21 + else null; 15 22 16 23 # https://github.com/isabelroses/dotfiles/blob/0827bb1893b8072b65c66a6919f8abbe6df9a55a/modules/flake/lib/secrets.nix 17 24 mkSecret = { ··· 20 27 ... 21 28 }: { 22 29 file = "${self}/secrets/${file}.age"; 23 - owner = if mainUser != null then mainUser else "root"; 24 - group = if userGroup != null then userGroup else "root"; 30 + owner = 31 + if mainUser != null 32 + then mainUser 33 + else "root"; 34 + group = 35 + if userGroup != null 36 + then userGroup 37 + else "root"; 25 38 inherit mode; 26 39 }; 27 40 in { ··· 34 47 ]; 35 48 36 49 age = { 37 - identityPaths = [ 38 - "/etc/ssh/ssh_host_ed25519_key" 39 - ] ++ (if sshDir != null then ["${sshDir}/id_ed25519" ] else []); 50 + identityPaths = 51 + [ 52 + "/etc/ssh/ssh_host_ed25519_key" 53 + ] 54 + ++ ( 55 + if sshDir != null 56 + then ["${sshDir}/id_ed25519"] 57 + else [] 58 + ); 40 59 41 60 secrets = { 42 61 gh = mkSecret {
+5 -3
modules/shared/nix/default.nix
··· 2 2 pkgs, 3 3 lib, 4 4 ... 5 - }: { 5 + }: let 6 + primaryUser = builtins.getEnv "SUDO_USER"; 7 + in { 6 8 imports = [ 7 9 ./age.nix 8 10 ]; ··· 11 13 experimental-features = ["nix-command" "flakes"]; 12 14 warn-dirty = false; 13 15 keep-going = true; 14 - allowed-users = ["willow"]; 15 - trusted-users = ["root" "willow"]; 16 + allowed-users = ["willow" primaryUser]; 17 + trusted-users = ["root" "willow" primaryUser]; 16 18 17 19 # cachix 18 20 extra-substituters = ["https://nix-community.cachix.org"];