From 2c475dd0993245eec5db6c2db9e965af7be556e0 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Fri, 6 Jun 2025 11:15:32 +0200 Subject: [PATCH] remove home suites --- flake.nix | 5 +- home/{profiles => }/default.nix | 0 home/{profiles => }/develop/common.nix | 0 home/{profiles => }/develop/docs.nix | 0 home/{profiles => }/develop/langs/c.nix | 0 home/{profiles => }/develop/langs/csharp.nix | 0 home/{profiles => }/develop/langs/elixir.nix | 0 home/{profiles => }/develop/langs/go.nix | 0 home/{profiles => }/develop/langs/haskell.nix | 0 home/{profiles => }/develop/langs/js.nix | 0 home/{profiles => }/develop/langs/lua.nix | 0 home/{profiles => }/develop/langs/nix.nix | 0 home/{profiles => }/develop/langs/rust.nix | 0 home/{profiles => }/develop/langs/uiua.nix | 0 home/{profiles => }/develop/langs/zig.nix | 0 home/{profiles => }/editors/emacs.nix | 0 home/{profiles => }/editors/nvim.nix | 0 .../programs/browsers/chromium.nix | 0 .../programs/browsers/firefox/default.nix | 0 .../browsers/firefox/search-engines.nix | 0 .../programs/browsers/firefox/userChrome.css | 0 home/{profiles => }/programs/browsers/tor.nix | 0 .../programs/desktop/common/fuzzel.nix | 0 .../programs/desktop/common/wl-clipboard.nix | 0 .../programs/desktop/common/wob.nix | 0 .../programs/desktop/default.nix | 0 .../programs/desktop/sway/default.nix | 0 .../desktop/sway/waybar-workspace.patch | 0 .../programs/desktop/sway/waybar.nix | 0 .../{profiles => }/programs/desktop/theme.nix | 0 .../{profiles => }/programs/games/default.nix | 0 home/{profiles => }/programs/games/jc141.nix | 0 home/{profiles => }/programs/media/mpv.nix | 0 home/{profiles => }/programs/misc/discord.nix | 0 home/{profiles => }/programs/misc/obs.nix | 0 home/{profiles => }/programs/music/beets.nix | 0 home/{profiles => }/programs/music/cmus.nix | 0 home/{profiles => }/services/appusage.nix | 0 home/{profiles => }/services/playerctl.nix | 0 home/{profiles => }/services/polkit-agent.nix | 0 home/suites/nixdesk/default.nix | 138 --------------- home/suites/nixdesk/defaults.nix | 18 -- home/suites/nixdesk/kanshi.nix | 21 --- home/suites/nixdesk/outputs.nix | 13 -- .../{profiles => }/terminal/emulator/foot.nix | 0 .../terminal/emulator/wezterm.nix | 0 .../terminal/programs/comma.nix | 0 .../terminal/programs/direnv.nix | 0 home/{profiles => }/terminal/programs/git.nix | 0 .../terminal/programs/github.nix | 0 .../terminal/programs/irssi.nix | 0 .../terminal/programs/jujutsu.nix | 0 .../{profiles => }/terminal/programs/tmux.nix | 0 home/{profiles => }/terminal/programs/xdg.nix | 0 home/{profiles => }/terminal/shell/fish.nix | 0 home/{profiles => }/terminal/shell/zsh.nix | 0 home/{profiles => }/themes/dark/default.nix | 0 home/{profiles => }/themes/dark/fuzzel.nix | 0 home/{profiles => }/themes/dark/waybar.nix | 0 sys/machines/hopper/default.nix | 3 +- .../machines/hopper/home.nix | 0 sys/machines/nixdesk/default.nix | 4 +- sys/machines/nixdesk/home.nix | 159 ++++++++++++++++++ 63 files changed, 163 insertions(+), 198 deletions(-) rename home/{profiles => }/default.nix (100%) rename home/{profiles => }/develop/common.nix (100%) rename home/{profiles => }/develop/docs.nix (100%) rename home/{profiles => }/develop/langs/c.nix (100%) rename home/{profiles => }/develop/langs/csharp.nix (100%) rename home/{profiles => }/develop/langs/elixir.nix (100%) rename home/{profiles => }/develop/langs/go.nix (100%) rename home/{profiles => }/develop/langs/haskell.nix (100%) rename home/{profiles => }/develop/langs/js.nix (100%) rename home/{profiles => }/develop/langs/lua.nix (100%) rename home/{profiles => }/develop/langs/nix.nix (100%) rename home/{profiles => }/develop/langs/rust.nix (100%) rename home/{profiles => }/develop/langs/uiua.nix (100%) rename home/{profiles => }/develop/langs/zig.nix (100%) rename home/{profiles => }/editors/emacs.nix (100%) rename home/{profiles => }/editors/nvim.nix (100%) rename home/{profiles => }/programs/browsers/chromium.nix (100%) rename home/{profiles => }/programs/browsers/firefox/default.nix (100%) rename home/{profiles => }/programs/browsers/firefox/search-engines.nix (100%) rename home/{profiles => }/programs/browsers/firefox/userChrome.css (100%) rename home/{profiles => }/programs/browsers/tor.nix (100%) rename home/{profiles => }/programs/desktop/common/fuzzel.nix (100%) rename home/{profiles => }/programs/desktop/common/wl-clipboard.nix (100%) rename home/{profiles => }/programs/desktop/common/wob.nix (100%) rename home/{profiles => }/programs/desktop/default.nix (100%) rename home/{profiles => }/programs/desktop/sway/default.nix (100%) rename home/{profiles => }/programs/desktop/sway/waybar-workspace.patch (100%) rename home/{profiles => }/programs/desktop/sway/waybar.nix (100%) rename home/{profiles => }/programs/desktop/theme.nix (100%) rename home/{profiles => }/programs/games/default.nix (100%) rename home/{profiles => }/programs/games/jc141.nix (100%) rename home/{profiles => }/programs/media/mpv.nix (100%) rename home/{profiles => }/programs/misc/discord.nix (100%) rename home/{profiles => }/programs/misc/obs.nix (100%) rename home/{profiles => }/programs/music/beets.nix (100%) rename home/{profiles => }/programs/music/cmus.nix (100%) rename home/{profiles => }/services/appusage.nix (100%) rename home/{profiles => }/services/playerctl.nix (100%) rename home/{profiles => }/services/polkit-agent.nix (100%) delete mode 100644 home/suites/nixdesk/default.nix delete mode 100644 home/suites/nixdesk/defaults.nix delete mode 100644 home/suites/nixdesk/kanshi.nix delete mode 100644 home/suites/nixdesk/outputs.nix rename home/{profiles => }/terminal/emulator/foot.nix (100%) rename home/{profiles => }/terminal/emulator/wezterm.nix (100%) rename home/{profiles => }/terminal/programs/comma.nix (100%) rename home/{profiles => }/terminal/programs/direnv.nix (100%) rename home/{profiles => }/terminal/programs/git.nix (100%) rename home/{profiles => }/terminal/programs/github.nix (100%) rename home/{profiles => }/terminal/programs/irssi.nix (100%) rename home/{profiles => }/terminal/programs/jujutsu.nix (100%) rename home/{profiles => }/terminal/programs/tmux.nix (100%) rename home/{profiles => }/terminal/programs/xdg.nix (100%) rename home/{profiles => }/terminal/shell/fish.nix (100%) rename home/{profiles => }/terminal/shell/zsh.nix (100%) rename home/{profiles => }/themes/dark/default.nix (100%) rename home/{profiles => }/themes/dark/fuzzel.nix (100%) rename home/{profiles => }/themes/dark/waybar.nix (100%) rename home/suites/hopper/default.nix => sys/machines/hopper/home.nix (100%) create mode 100644 sys/machines/nixdesk/home.nix diff --git a/flake.nix b/flake.nix index 85db717..a2660f1 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,7 @@ ... } @ inputs: let systemProfiles = ./sys/profiles; - homeProfiles = ./home/profiles; - homeSuites = ./home/suites; + homeProfiles = ./home; vars = import ./vars; l = nixpkgs.lib; b = builtins; @@ -25,7 +24,7 @@ inputs.sops-nix.nixosModules.sops ]; specialArgs = { - inherit inputs self systemProfiles homeProfiles homeSuites vars; + inherit inputs self systemProfiles homeProfiles vars; }; }); diff --git a/home/profiles/default.nix b/home/default.nix similarity index 100% rename from home/profiles/default.nix rename to home/default.nix diff --git a/home/profiles/develop/common.nix b/home/develop/common.nix similarity index 100% rename from home/profiles/develop/common.nix rename to home/develop/common.nix diff --git a/home/profiles/develop/docs.nix b/home/develop/docs.nix similarity index 100% rename from home/profiles/develop/docs.nix rename to home/develop/docs.nix diff --git a/home/profiles/develop/langs/c.nix b/home/develop/langs/c.nix similarity index 100% rename from home/profiles/develop/langs/c.nix rename to home/develop/langs/c.nix diff --git a/home/profiles/develop/langs/csharp.nix b/home/develop/langs/csharp.nix similarity index 100% rename from home/profiles/develop/langs/csharp.nix rename to home/develop/langs/csharp.nix diff --git a/home/profiles/develop/langs/elixir.nix b/home/develop/langs/elixir.nix similarity index 100% rename from home/profiles/develop/langs/elixir.nix rename to home/develop/langs/elixir.nix diff --git a/home/profiles/develop/langs/go.nix b/home/develop/langs/go.nix similarity index 100% rename from home/profiles/develop/langs/go.nix rename to home/develop/langs/go.nix diff --git a/home/profiles/develop/langs/haskell.nix b/home/develop/langs/haskell.nix similarity index 100% rename from home/profiles/develop/langs/haskell.nix rename to home/develop/langs/haskell.nix diff --git a/home/profiles/develop/langs/js.nix b/home/develop/langs/js.nix similarity index 100% rename from home/profiles/develop/langs/js.nix rename to home/develop/langs/js.nix diff --git a/home/profiles/develop/langs/lua.nix b/home/develop/langs/lua.nix similarity index 100% rename from home/profiles/develop/langs/lua.nix rename to home/develop/langs/lua.nix diff --git a/home/profiles/develop/langs/nix.nix b/home/develop/langs/nix.nix similarity index 100% rename from home/profiles/develop/langs/nix.nix rename to home/develop/langs/nix.nix diff --git a/home/profiles/develop/langs/rust.nix b/home/develop/langs/rust.nix similarity index 100% rename from home/profiles/develop/langs/rust.nix rename to home/develop/langs/rust.nix diff --git a/home/profiles/develop/langs/uiua.nix b/home/develop/langs/uiua.nix similarity index 100% rename from home/profiles/develop/langs/uiua.nix rename to home/develop/langs/uiua.nix diff --git a/home/profiles/develop/langs/zig.nix b/home/develop/langs/zig.nix similarity index 100% rename from home/profiles/develop/langs/zig.nix rename to home/develop/langs/zig.nix diff --git a/home/profiles/editors/emacs.nix b/home/editors/emacs.nix similarity index 100% rename from home/profiles/editors/emacs.nix rename to home/editors/emacs.nix diff --git a/home/profiles/editors/nvim.nix b/home/editors/nvim.nix similarity index 100% rename from home/profiles/editors/nvim.nix rename to home/editors/nvim.nix diff --git a/home/profiles/programs/browsers/chromium.nix b/home/programs/browsers/chromium.nix similarity index 100% rename from home/profiles/programs/browsers/chromium.nix rename to home/programs/browsers/chromium.nix diff --git a/home/profiles/programs/browsers/firefox/default.nix b/home/programs/browsers/firefox/default.nix similarity index 100% rename from home/profiles/programs/browsers/firefox/default.nix rename to home/programs/browsers/firefox/default.nix diff --git a/home/profiles/programs/browsers/firefox/search-engines.nix b/home/programs/browsers/firefox/search-engines.nix similarity index 100% rename from home/profiles/programs/browsers/firefox/search-engines.nix rename to home/programs/browsers/firefox/search-engines.nix diff --git a/home/profiles/programs/browsers/firefox/userChrome.css b/home/programs/browsers/firefox/userChrome.css similarity index 100% rename from home/profiles/programs/browsers/firefox/userChrome.css rename to home/programs/browsers/firefox/userChrome.css diff --git a/home/profiles/programs/browsers/tor.nix b/home/programs/browsers/tor.nix similarity index 100% rename from home/profiles/programs/browsers/tor.nix rename to home/programs/browsers/tor.nix diff --git a/home/profiles/programs/desktop/common/fuzzel.nix b/home/programs/desktop/common/fuzzel.nix similarity index 100% rename from home/profiles/programs/desktop/common/fuzzel.nix rename to home/programs/desktop/common/fuzzel.nix diff --git a/home/profiles/programs/desktop/common/wl-clipboard.nix b/home/programs/desktop/common/wl-clipboard.nix similarity index 100% rename from home/profiles/programs/desktop/common/wl-clipboard.nix rename to home/programs/desktop/common/wl-clipboard.nix diff --git a/home/profiles/programs/desktop/common/wob.nix b/home/programs/desktop/common/wob.nix similarity index 100% rename from home/profiles/programs/desktop/common/wob.nix rename to home/programs/desktop/common/wob.nix diff --git a/home/profiles/programs/desktop/default.nix b/home/programs/desktop/default.nix similarity index 100% rename from home/profiles/programs/desktop/default.nix rename to home/programs/desktop/default.nix diff --git a/home/profiles/programs/desktop/sway/default.nix b/home/programs/desktop/sway/default.nix similarity index 100% rename from home/profiles/programs/desktop/sway/default.nix rename to home/programs/desktop/sway/default.nix diff --git a/home/profiles/programs/desktop/sway/waybar-workspace.patch b/home/programs/desktop/sway/waybar-workspace.patch similarity index 100% rename from home/profiles/programs/desktop/sway/waybar-workspace.patch rename to home/programs/desktop/sway/waybar-workspace.patch diff --git a/home/profiles/programs/desktop/sway/waybar.nix b/home/programs/desktop/sway/waybar.nix similarity index 100% rename from home/profiles/programs/desktop/sway/waybar.nix rename to home/programs/desktop/sway/waybar.nix diff --git a/home/profiles/programs/desktop/theme.nix b/home/programs/desktop/theme.nix similarity index 100% rename from home/profiles/programs/desktop/theme.nix rename to home/programs/desktop/theme.nix diff --git a/home/profiles/programs/games/default.nix b/home/programs/games/default.nix similarity index 100% rename from home/profiles/programs/games/default.nix rename to home/programs/games/default.nix diff --git a/home/profiles/programs/games/jc141.nix b/home/programs/games/jc141.nix similarity index 100% rename from home/profiles/programs/games/jc141.nix rename to home/programs/games/jc141.nix diff --git a/home/profiles/programs/media/mpv.nix b/home/programs/media/mpv.nix similarity index 100% rename from home/profiles/programs/media/mpv.nix rename to home/programs/media/mpv.nix diff --git a/home/profiles/programs/misc/discord.nix b/home/programs/misc/discord.nix similarity index 100% rename from home/profiles/programs/misc/discord.nix rename to home/programs/misc/discord.nix diff --git a/home/profiles/programs/misc/obs.nix b/home/programs/misc/obs.nix similarity index 100% rename from home/profiles/programs/misc/obs.nix rename to home/programs/misc/obs.nix diff --git a/home/profiles/programs/music/beets.nix b/home/programs/music/beets.nix similarity index 100% rename from home/profiles/programs/music/beets.nix rename to home/programs/music/beets.nix diff --git a/home/profiles/programs/music/cmus.nix b/home/programs/music/cmus.nix similarity index 100% rename from home/profiles/programs/music/cmus.nix rename to home/programs/music/cmus.nix diff --git a/home/profiles/services/appusage.nix b/home/services/appusage.nix similarity index 100% rename from home/profiles/services/appusage.nix rename to home/services/appusage.nix diff --git a/home/profiles/services/playerctl.nix b/home/services/playerctl.nix similarity index 100% rename from home/profiles/services/playerctl.nix rename to home/services/playerctl.nix diff --git a/home/profiles/services/polkit-agent.nix b/home/services/polkit-agent.nix similarity index 100% rename from home/profiles/services/polkit-agent.nix rename to home/services/polkit-agent.nix diff --git a/home/suites/nixdesk/default.nix b/home/suites/nixdesk/default.nix deleted file mode 100644 index 12a406d..0000000 --- a/home/suites/nixdesk/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ - self, - pkgs, - inputs, - homeProfiles, - ... -}: { - imports = - [ - ./defaults.nix - ./outputs.nix - ] - ++ (map (x: homeProfiles + x) [ - /default.nix - - /terminal/shell/zsh.nix - /terminal/shell/fish.nix - - /terminal/programs/xdg.nix - /terminal/programs/direnv.nix - /terminal/programs/tmux.nix - /terminal/programs/comma.nix - /terminal/programs/irssi.nix - /terminal/programs/git.nix - /terminal/programs/github.nix - /terminal/programs/jujutsu.nix - - /editors/nvim.nix - - /programs/browsers/firefox/default.nix - /programs/browsers/tor.nix - /programs/browsers/chromium.nix - - /terminal/emulator/foot.nix - - /themes/dark/default.nix - - # desktop - /programs/desktop/default.nix - /programs/desktop/sway/default.nix - - # development - /develop/common.nix - /develop/docs.nix - - /develop/langs/haskell.nix - /develop/langs/go.nix - /develop/langs/js.nix - /develop/langs/rust.nix - /develop/langs/elixir.nix - /develop/langs/nix.nix - /develop/langs/zig.nix - /develop/langs/lua.nix - /develop/langs/c.nix - /develop/langs/csharp.nix - - # programs - /programs/misc/discord.nix - /programs/misc/obs.nix - - /programs/music/beets.nix - /programs/music/cmus.nix - - /programs/media/mpv.nix - - # gaming - /programs/games/default.nix - /programs/games/jc141.nix - - /services/playerctl.nix - /services/polkit-agent.nix - ]); - - wayland.windowManager.sway.extraConfig = '' - exec obs --startreplaybuffer --disable-shutdown-check --minimize-to-tray - ''; - services = { - udiskie.enable = true; - }; - programs = { - starship.enable = true; - zoxide.enable = true; - lazygit.enable = true; - distrobox.enable = true; - }; - home.packages = with pkgs; [ - # coding - tokei - devenv - lazyjj - jjui - vscodium-fhs - android-studio - jetbrains.rider - jetbrains.idea-ultimate - - # communication - element-desktop - - # audio - pwvucontrol - qpwgraph - - # productivity - tdf # terminal pdf reader - obsidian - - # passwords - keepassxc - bitwarden-desktop - - # creating - krita - blender - godot - libreoffice-qt6 - - # system things - kdePackages.dolphin - - # music - puddletag - picard - - # media - stremio - feishin - foliate - - # games - heroic - lutris - ryubing # switch emu - prismlauncher - inputs.sobercookie.packages.${pkgs.system}.default - self.packages.${pkgs.system}.krunker - ]; -} diff --git a/home/suites/nixdesk/defaults.nix b/home/suites/nixdesk/defaults.nix deleted file mode 100644 index 5f1c7de..0000000 --- a/home/suites/nixdesk/defaults.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - xdg.mimeApps = { - enable = true; - defaultApplications = { - "text/html" = "firefox.desktop"; - "x-scheme-handler/http" = "firefox.desktop"; - "x-scheme-handler/https" = "firefox.desktop"; - "x-scheme-handler/about" = "firefox.desktop"; - "x-scheme-handler/unknown" = "firefox.desktop"; - }; - }; - - home.sessionVariables.DEFAULT_BROWSER = lib.getExe pkgs.firefox; -} diff --git a/home/suites/nixdesk/kanshi.nix b/home/suites/nixdesk/kanshi.nix deleted file mode 100644 index 814eae4..0000000 --- a/home/suites/nixdesk/kanshi.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - services.kanshi = { - enable = true; - settings = [ - { - profile.name = "default"; - profile.outputs = [ - { - criteria = "DP-3"; - mode = "1920x1080@165Hz"; - position = "0,0"; - } - { - criteria = "HDMI-A-1"; - position = "1920,0"; - } - ]; - } - ]; - }; -} diff --git a/home/suites/nixdesk/outputs.nix b/home/suites/nixdesk/outputs.nix deleted file mode 100644 index 1e3e5aa..0000000 --- a/home/suites/nixdesk/outputs.nix +++ /dev/null @@ -1,13 +0,0 @@ -{inputs, ...}: { - wayland.windowManager.sway.config.output = { - "DP-3" = { - mode = "1920x1080@165Hz"; - position = "1920 0"; - # allow_tearing = "yes"; - bg = "${inputs.wallpaper.outPath} fill"; - }; - "HDMI-A-1" = { - position = "0 0"; - }; - }; -} diff --git a/home/profiles/terminal/emulator/foot.nix b/home/terminal/emulator/foot.nix similarity index 100% rename from home/profiles/terminal/emulator/foot.nix rename to home/terminal/emulator/foot.nix diff --git a/home/profiles/terminal/emulator/wezterm.nix b/home/terminal/emulator/wezterm.nix similarity index 100% rename from home/profiles/terminal/emulator/wezterm.nix rename to home/terminal/emulator/wezterm.nix diff --git a/home/profiles/terminal/programs/comma.nix b/home/terminal/programs/comma.nix similarity index 100% rename from home/profiles/terminal/programs/comma.nix rename to home/terminal/programs/comma.nix diff --git a/home/profiles/terminal/programs/direnv.nix b/home/terminal/programs/direnv.nix similarity index 100% rename from home/profiles/terminal/programs/direnv.nix rename to home/terminal/programs/direnv.nix diff --git a/home/profiles/terminal/programs/git.nix b/home/terminal/programs/git.nix similarity index 100% rename from home/profiles/terminal/programs/git.nix rename to home/terminal/programs/git.nix diff --git a/home/profiles/terminal/programs/github.nix b/home/terminal/programs/github.nix similarity index 100% rename from home/profiles/terminal/programs/github.nix rename to home/terminal/programs/github.nix diff --git a/home/profiles/terminal/programs/irssi.nix b/home/terminal/programs/irssi.nix similarity index 100% rename from home/profiles/terminal/programs/irssi.nix rename to home/terminal/programs/irssi.nix diff --git a/home/profiles/terminal/programs/jujutsu.nix b/home/terminal/programs/jujutsu.nix similarity index 100% rename from home/profiles/terminal/programs/jujutsu.nix rename to home/terminal/programs/jujutsu.nix diff --git a/home/profiles/terminal/programs/tmux.nix b/home/terminal/programs/tmux.nix similarity index 100% rename from home/profiles/terminal/programs/tmux.nix rename to home/terminal/programs/tmux.nix diff --git a/home/profiles/terminal/programs/xdg.nix b/home/terminal/programs/xdg.nix similarity index 100% rename from home/profiles/terminal/programs/xdg.nix rename to home/terminal/programs/xdg.nix diff --git a/home/profiles/terminal/shell/fish.nix b/home/terminal/shell/fish.nix similarity index 100% rename from home/profiles/terminal/shell/fish.nix rename to home/terminal/shell/fish.nix diff --git a/home/profiles/terminal/shell/zsh.nix b/home/terminal/shell/zsh.nix similarity index 100% rename from home/profiles/terminal/shell/zsh.nix rename to home/terminal/shell/zsh.nix diff --git a/home/profiles/themes/dark/default.nix b/home/themes/dark/default.nix similarity index 100% rename from home/profiles/themes/dark/default.nix rename to home/themes/dark/default.nix diff --git a/home/profiles/themes/dark/fuzzel.nix b/home/themes/dark/fuzzel.nix similarity index 100% rename from home/profiles/themes/dark/fuzzel.nix rename to home/themes/dark/fuzzel.nix diff --git a/home/profiles/themes/dark/waybar.nix b/home/themes/dark/waybar.nix similarity index 100% rename from home/profiles/themes/dark/waybar.nix rename to home/themes/dark/waybar.nix diff --git a/sys/machines/hopper/default.nix b/sys/machines/hopper/default.nix index d0db51d..5189e35 100644 --- a/sys/machines/hopper/default.nix +++ b/sys/machines/hopper/default.nix @@ -1,7 +1,6 @@ { inputs, systemProfiles, - homeSuites, specialArgs, lib, ... @@ -23,7 +22,7 @@ home-manager = { backupFileExtension = "hm-backup"; users.desktop.imports = [ - (homeSuites + /hopper) + ./home.nix {home.stateVersion = "24.11";} ]; extraSpecialArgs = specialArgs; diff --git a/home/suites/hopper/default.nix b/sys/machines/hopper/home.nix similarity index 100% rename from home/suites/hopper/default.nix rename to sys/machines/hopper/home.nix diff --git a/sys/machines/nixdesk/default.nix b/sys/machines/nixdesk/default.nix index d155185..7cdb72b 100644 --- a/sys/machines/nixdesk/default.nix +++ b/sys/machines/nixdesk/default.nix @@ -4,8 +4,6 @@ inputs, systemProfiles, specialArgs, - self, - homeSuites, ... }: { # imports = with systemProfiles; [ @@ -25,7 +23,7 @@ home-manager = { backupFileExtension = "hm-backup"; users.xun.imports = [ - (homeSuites + /nixdesk) + ./home.nix inputs.sops-nix.homeManagerModules.sops {home.stateVersion = "23.11";} ]; diff --git a/sys/machines/nixdesk/home.nix b/sys/machines/nixdesk/home.nix new file mode 100644 index 0000000..575c315 --- /dev/null +++ b/sys/machines/nixdesk/home.nix @@ -0,0 +1,159 @@ +{ + self, + lib, + pkgs, + inputs, + homeProfiles, + ... +}: { + imports = map (x: homeProfiles + x) [ + /default.nix + + /terminal/shell/zsh.nix + /terminal/shell/fish.nix + + /terminal/programs/xdg.nix + /terminal/programs/direnv.nix + /terminal/programs/tmux.nix + /terminal/programs/comma.nix + /terminal/programs/irssi.nix + /terminal/programs/git.nix + /terminal/programs/github.nix + /terminal/programs/jujutsu.nix + + /editors/nvim.nix + + /programs/browsers/firefox/default.nix + /programs/browsers/tor.nix + /programs/browsers/chromium.nix + + /terminal/emulator/foot.nix + + /themes/dark/default.nix + + # desktop + /programs/desktop/default.nix + /programs/desktop/sway/default.nix + + # development + /develop/common.nix + /develop/docs.nix + + /develop/langs/haskell.nix + /develop/langs/go.nix + /develop/langs/js.nix + /develop/langs/rust.nix + /develop/langs/elixir.nix + /develop/langs/nix.nix + /develop/langs/zig.nix + /develop/langs/lua.nix + /develop/langs/c.nix + /develop/langs/csharp.nix + + # programs + /programs/misc/discord.nix + /programs/misc/obs.nix + + /programs/music/beets.nix + /programs/music/cmus.nix + + /programs/media/mpv.nix + + # gaming + /programs/games/default.nix + /programs/games/jc141.nix + + /services/playerctl.nix + /services/polkit-agent.nix + ]; + + wayland.windowManager.sway.extraConfig = '' + exec obs --startreplaybuffer --disable-shutdown-check --minimize-to-tray + ''; + + wayland.windowManager.sway.config.output = { + "DP-3" = { + mode = "1920x1080@165Hz"; + position = "1920 0"; + # allow_tearing = "yes"; + bg = "${inputs.wallpaper.outPath} fill"; + }; + "HDMI-A-1" = { + position = "0 0"; + }; + }; + xdg.mimeApps = { + enable = true; + defaultApplications = { + "text/html" = "firefox.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "x-scheme-handler/about" = "firefox.desktop"; + "x-scheme-handler/unknown" = "firefox.desktop"; + }; + }; + + home.sessionVariables.DEFAULT_BROWSER = lib.getExe pkgs.firefox; + + services = { + udiskie.enable = true; + }; + programs = { + starship.enable = true; + zoxide.enable = true; + lazygit.enable = true; + distrobox.enable = true; + }; + home.packages = with pkgs; [ + # coding + tokei + devenv + lazyjj + jjui + vscodium-fhs + android-studio + jetbrains.rider + jetbrains.idea-ultimate + + # communication + element-desktop + + # audio + pwvucontrol + qpwgraph + + # productivity + tdf # terminal pdf reader + obsidian + + # passwords + keepassxc + bitwarden-desktop + + # creating + krita + blender + godot + libreoffice-qt6 + + # system things + kdePackages.dolphin + + # music + puddletag + picard + + # media + stremio + feishin + foliate + + # games + heroic + lutris + ryubing # switch emu + prismlauncher + inputs.sobercookie.packages.${pkgs.system}.default + self.packages.${pkgs.system}.krunker + ]; +}