diff --git a/system/default.nix b/system/default.nix index 5d958f4f..4513c59f 100644 --- a/system/default.nix +++ b/system/default.nix @@ -56,6 +56,15 @@ max-free = ${toString (1024 * 1024 * 1024)} ''; }; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-unwrapped" + "steam-original" + "steam-run" + "nomachine-client" + ]; system.autoUpgrade = { enable = true; persistent = true; @@ -122,11 +131,16 @@ useUserPackages = true; backupFileExtension = "backup"; users.${username} = { - imports = [ ./home/default.nix ]; + imports = [ + ./home/shell/default.nix + ./home/scripts/default.nix + ./home/password-store/default.nix + ]; home = { inherit username; homeDirectory = "/home/${username}"; }; + programs.home-manager.enable = true; }; extraSpecialArgs = { inherit inputs; @@ -189,7 +203,7 @@ console.useXkbConfig = true; stylix = { enable = true; - image = ./home/desktop/wallpapers/tropic_island_day.jpg; + image = ./wallpapers/tropic_island_day.jpg; base16Scheme = ./one-light.yaml; # Base24 scheme polarity = "light"; opacity.popups = 0.8; diff --git a/system/desktop.nix b/system/desktop.nix index ee97a590..002d0759 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -1,6 +1,5 @@ { pkgs, username, ... }: { - home-manager.users.${username}.imports = [ ./home/desktop/default.nix ]; nixpkgs.config.chromium.commandLineArgs = "--password-store='gnome-libsecret' --enable-features=UseOzonePlatform --ozone-platform=wayland"; hardware.bluetooth.enable = true; environment = { @@ -15,9 +14,24 @@ libsecret libnotify xdg-utils + wl-clipboard hunspell hunspellDicts.en_GB-large gnome.nautilus + libreoffice-fresh + evince + image-roll + clapper + g4music + ffmpeg + remmina + fractal + webcord + signal-desktop + whatsapp-for-linux + teams-for-linux + twinkle + nomachine-client ]; }; security = { @@ -96,4 +110,81 @@ config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; }; + home-manager.users.${username} = + { + config, + pkgs, + osConfig, + ... + }: + { + imports = [ + ./home/hyprland.nix + ./home/email/default.nix + ./home/calendar/default.nix + ./home/terminal/default.nix + ./home/emacs/default.nix + ./home/browser/default.nix + ]; + home.file.${config.gtk.gtk2.configLocation}.force = true; + services = { + syncthing.enable = true; + gammastep = { + inherit (osConfig.location) latitude longitude provider; + enable = true; + tray = true; + }; + }; + gtk = { + enable = true; + gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + iconTheme = { + package = (pkgs.papirus-icon-theme.override { color = "magenta"; }); + name = "Papirus-Light"; + }; + }; + stylix.targets.gtk.extraCss = with config.lib.stylix.scheme.withHashtag; '' + @define-color accent_color ${base0E-hex}; + @define-color accent_bg_color ${base0E-hex}; + ''; + xdg = { + mime.enable = true; + mimeApps = + let + defaultApplications = import ./mimeapps.nix; + in + { + enable = true; + inherit defaultApplications; + associations.added = defaultApplications; + }; + userDirs = { + enable = true; + createDirectories = true; + extraConfig = { + XDG_PROJECTS_DIR = "${config.home.homeDirectory}/Projects"; + }; + }; + configFile = { + # Stop programs from overriding mimeapps + "mimeapps.list".force = true; + # Ensure GTK config is set + "gtk-3.0/gtk.css".force = true; + "gtk-3.0/settings.ini".force = true; + "gtk-4.0/gtk.css".force = true; + "gtk-4.0/settings.ini".force = true; + # Autostart some programs + "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop"; + "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop"; + "teams-for-linux/config.json".text = builtins.toJSON { + awayOnSystemIdle = true; + closeAppOnCross = false; + followSystemTheme = true; + notificationMethod = "electron"; + optInTeamsV2 = true; + spellCheckerLanguages = [ "en_GB" ]; + }; + }; + }; + }; } diff --git a/system/home/desktop/browser/bookmarks.json b/system/home/browser/bookmarks.json similarity index 100% rename from system/home/desktop/browser/bookmarks.json rename to system/home/browser/bookmarks.json diff --git a/system/home/desktop/browser/config.lisp b/system/home/browser/config.lisp similarity index 100% rename from system/home/desktop/browser/config.lisp rename to system/home/browser/config.lisp diff --git a/system/home/desktop/browser/default.nix b/system/home/browser/default.nix similarity index 100% rename from system/home/desktop/browser/default.nix rename to system/home/browser/default.nix diff --git a/system/home/desktop/browser/firefox.nix b/system/home/browser/firefox.nix similarity index 100% rename from system/home/desktop/browser/firefox.nix rename to system/home/browser/firefox.nix diff --git a/system/home/desktop/browser/librewolf.nix b/system/home/browser/librewolf.nix similarity index 100% rename from system/home/desktop/browser/librewolf.nix rename to system/home/browser/librewolf.nix diff --git a/system/home/desktop/browser/nyxt.nix b/system/home/browser/nyxt.nix similarity index 100% rename from system/home/desktop/browser/nyxt.nix rename to system/home/browser/nyxt.nix diff --git a/system/home/desktop/calendar/default.nix b/system/home/calendar/default.nix similarity index 100% rename from system/home/desktop/calendar/default.nix rename to system/home/calendar/default.nix diff --git a/system/home/default.nix b/system/home/default.nix deleted file mode 100644 index a136ce2c..00000000 --- a/system/home/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: -{ - imports = [ - ./shell/default.nix - ./scripts/default.nix - ./password-store/default.nix - ]; - programs.home-manager.enable = true; -} diff --git a/system/home/desktop/default.nix b/system/home/desktop/default.nix deleted file mode 100644 index 1b5813c0..00000000 --- a/system/home/desktop/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - config, - pkgs, - osConfig, - ... -}: -{ - imports = [ - ./hyprland.nix - ./email/default.nix - ./calendar/default.nix - ./terminal/default.nix - ./emacs/default.nix - ./browser/default.nix - ]; - home = { - packages = with pkgs; [ - wl-clipboard - libreoffice-fresh - evince - image-roll - clapper - g4music - ffmpeg - remmina - fractal - webcord - signal-desktop - whatsapp-for-linux - teams-for-linux - twinkle - ]; - file.${config.gtk.gtk2.configLocation}.force = true; - }; - services = { - syncthing.enable = true; - gammastep = { - inherit (osConfig.location) latitude longitude provider; - enable = true; - tray = true; - }; - }; - gtk = { - enable = true; - gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - iconTheme = { - package = (pkgs.papirus-icon-theme.override { color = "magenta"; }); - name = "Papirus-Light"; - }; - }; - stylix.targets.gtk.extraCss = with config.lib.stylix.scheme.withHashtag; '' - @define-color accent_color ${base0E-hex}; - @define-color accent_bg_color ${base0E-hex}; - ''; - xdg = { - mime.enable = true; - mimeApps = - let - defaultApplications = import ./mimeapps.nix; - in - { - enable = true; - inherit defaultApplications; - associations.added = defaultApplications; - }; - userDirs = { - enable = true; - createDirectories = true; - extraConfig = { - XDG_PROJECTS_DIR = "${config.home.homeDirectory}/Projects"; - }; - }; - configFile = { - # Stop programs from overriding mimeapps - "mimeapps.list".force = true; - # Ensure GTK config is set - "gtk-3.0/gtk.css".force = true; - "gtk-3.0/settings.ini".force = true; - "gtk-4.0/gtk.css".force = true; - "gtk-4.0/settings.ini".force = true; - # Autostart some programs - "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop"; - "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop"; - "teams-for-linux/config.json".text = builtins.toJSON { - awayOnSystemIdle = true; - closeAppOnCross = false; - followSystemTheme = true; - notificationMethod = "electron"; - optInTeamsV2 = true; - spellCheckerLanguages = [ "en_GB" ]; - }; - }; - }; -} diff --git a/system/home/desktop/emacs/default.nix b/system/home/emacs/default.nix similarity index 97% rename from system/home/desktop/emacs/default.nix rename to system/home/emacs/default.nix index f890a22d..0e93087c 100644 --- a/system/home/desktop/emacs/default.nix +++ b/system/home/emacs/default.nix @@ -1,9 +1,9 @@ { config, pkgs, ... }: { imports = [ - ../../shell/default.nix - ../../shell/git.nix - ../../gpg/default.nix + ../shell/default.nix + ../shell/git.nix + ../gpg/default.nix ]; stylix.targets.emacs.enable = false; services.emacs = { diff --git a/system/home/desktop/emacs/emacs-packages.nix b/system/home/emacs/emacs-packages.nix similarity index 100% rename from system/home/desktop/emacs/emacs-packages.nix rename to system/home/emacs/emacs-packages.nix diff --git a/system/home/desktop/emacs/luarocks/graph-toolkit.nix b/system/home/emacs/luarocks/graph-toolkit.nix similarity index 100% rename from system/home/desktop/emacs/luarocks/graph-toolkit.nix rename to system/home/emacs/luarocks/graph-toolkit.nix diff --git a/system/home/desktop/emacs/luarocks/scilua.nix b/system/home/emacs/luarocks/scilua.nix similarity index 100% rename from system/home/desktop/emacs/luarocks/scilua.nix rename to system/home/emacs/luarocks/scilua.nix diff --git a/system/home/desktop/emacs/luarocks/xsys.nix b/system/home/emacs/luarocks/xsys.nix similarity index 100% rename from system/home/desktop/emacs/luarocks/xsys.nix rename to system/home/emacs/luarocks/xsys.nix diff --git a/system/home/desktop/emacs/pypoetry.toml b/system/home/emacs/pypoetry.toml similarity index 100% rename from system/home/desktop/emacs/pypoetry.toml rename to system/home/emacs/pypoetry.toml diff --git a/system/home/desktop/emacs/ruff.toml b/system/home/emacs/ruff.toml similarity index 100% rename from system/home/desktop/emacs/ruff.toml rename to system/home/emacs/ruff.toml diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/README.md b/system/home/emacs/texlive/latex-beamer-ukaea/README.md similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/README.md rename to system/home/emacs/texlive/latex-beamer-ukaea/README.md diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty b/system/home/emacs/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty rename to system/home/emacs/texlive/latex-beamer-ukaea/beamercolorthemeukaea.sty diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty b/system/home/emacs/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty rename to system/home/emacs/texlive/latex-beamer-ukaea/beamerfontthemeukaea.sty diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty b/system/home/emacs/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty rename to system/home/emacs/texlive/latex-beamer-ukaea/beamerinnerthemeukaea.sty diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty b/system/home/emacs/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty rename to system/home/emacs/texlive/latex-beamer-ukaea/beamerouterthemeukaea.sty diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerthemeukaea.sty b/system/home/emacs/texlive/latex-beamer-ukaea/beamerthemeukaea.sty similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/beamerthemeukaea.sty rename to system/home/emacs/texlive/latex-beamer-ukaea/beamerthemeukaea.sty diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/default.nix b/system/home/emacs/texlive/latex-beamer-ukaea/default.nix similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/default.nix rename to system/home/emacs/texlive/latex-beamer-ukaea/default.nix diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/ukaea-jet.jpg b/system/home/emacs/texlive/latex-beamer-ukaea/ukaea-jet.jpg similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/ukaea-jet.jpg rename to system/home/emacs/texlive/latex-beamer-ukaea/ukaea-jet.jpg diff --git a/system/home/desktop/emacs/texlive/latex-beamer-ukaea/ukaea_logo.png b/system/home/emacs/texlive/latex-beamer-ukaea/ukaea_logo.png similarity index 100% rename from system/home/desktop/emacs/texlive/latex-beamer-ukaea/ukaea_logo.png rename to system/home/emacs/texlive/latex-beamer-ukaea/ukaea_logo.png diff --git a/system/home/desktop/email/davmail.properties b/system/home/email/davmail.properties similarity index 100% rename from system/home/desktop/email/davmail.properties rename to system/home/email/davmail.properties diff --git a/system/home/desktop/email/default.nix b/system/home/email/default.nix similarity index 100% rename from system/home/desktop/email/default.nix rename to system/home/email/default.nix diff --git a/system/home/desktop/email/signatures/personal b/system/home/email/signatures/personal similarity index 100% rename from system/home/desktop/email/signatures/personal rename to system/home/email/signatures/personal diff --git a/system/home/desktop/email/signatures/work b/system/home/email/signatures/work similarity index 100% rename from system/home/desktop/email/signatures/work rename to system/home/email/signatures/work diff --git a/system/home/desktop/fuzzel.nix b/system/home/fuzzel.nix similarity index 100% rename from system/home/desktop/fuzzel.nix rename to system/home/fuzzel.nix diff --git a/system/home/desktop/hyprland.nix b/system/home/hyprland.nix similarity index 100% rename from system/home/desktop/hyprland.nix rename to system/home/hyprland.nix diff --git a/system/home/desktop/mako.nix b/system/home/mako.nix similarity index 100% rename from system/home/desktop/mako.nix rename to system/home/mako.nix diff --git a/system/home/desktop/pfp/personal.png b/system/home/pfp/personal.png similarity index 100% rename from system/home/desktop/pfp/personal.png rename to system/home/pfp/personal.png diff --git a/system/home/desktop/pfp/personal_micro.jpg b/system/home/pfp/personal_micro.jpg similarity index 100% rename from system/home/desktop/pfp/personal_micro.jpg rename to system/home/pfp/personal_micro.jpg diff --git a/system/home/desktop/pfp/work.jpg b/system/home/pfp/work.jpg similarity index 100% rename from system/home/desktop/pfp/work.jpg rename to system/home/pfp/work.jpg diff --git a/system/home/desktop/pfp/work_micro.jpg b/system/home/pfp/work_micro.jpg similarity index 100% rename from system/home/desktop/pfp/work_micro.jpg rename to system/home/pfp/work_micro.jpg diff --git a/system/home/desktop/plasma.nix b/system/home/plasma.nix similarity index 100% rename from system/home/desktop/plasma.nix rename to system/home/plasma.nix diff --git a/system/home/desktop/sway.nix b/system/home/sway.nix similarity index 100% rename from system/home/desktop/sway.nix rename to system/home/sway.nix diff --git a/system/home/desktop/terminal/alacritty.nix b/system/home/terminal/alacritty.nix similarity index 100% rename from system/home/desktop/terminal/alacritty.nix rename to system/home/terminal/alacritty.nix diff --git a/system/home/desktop/terminal/default.nix b/system/home/terminal/default.nix similarity index 100% rename from system/home/desktop/terminal/default.nix rename to system/home/terminal/default.nix diff --git a/system/home/desktop/waybar.nix b/system/home/waybar.nix similarity index 100% rename from system/home/desktop/waybar.nix rename to system/home/waybar.nix diff --git a/system/home/desktop/zathura/default.nix b/system/home/zathura/default.nix similarity index 100% rename from system/home/desktop/zathura/default.nix rename to system/home/zathura/default.nix diff --git a/system/home/desktop/zathura/emacs-keys-for-zathura.txt b/system/home/zathura/emacs-keys-for-zathura.txt similarity index 100% rename from system/home/desktop/zathura/emacs-keys-for-zathura.txt rename to system/home/zathura/emacs-keys-for-zathura.txt diff --git a/system/home/desktop/mimeapps.nix b/system/mimeapps.nix similarity index 100% rename from system/home/desktop/mimeapps.nix rename to system/mimeapps.nix diff --git a/system/services/satisfactory/default.nix b/system/services/satisfactory/default.nix index 594707b4..dc79fb2d 100644 --- a/system/services/satisfactory/default.nix +++ b/system/services/satisfactory/default.nix @@ -1,13 +1,6 @@ { lib, ... }: { imports = [ ./module.nix ]; - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "steam-original" - "steam-run" - "steamcmd" - ]; services.satisfactory-server = { enable = true; openFirewall = true; diff --git a/system/steam.nix b/system/steam.nix index 456ef765..0410da43 100644 --- a/system/steam.nix +++ b/system/steam.nix @@ -1,19 +1,10 @@ { config, - lib, pkgs, username, ... }: { - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-unwrapped" - "steam-original" - "steam-run" - ]; environment = { sessionVariables.MANGOHUD = 1; systemPackages = [ pkgs.mangohud ]; diff --git a/system/home/desktop/wallpapers/Clearday.jpg b/system/wallpapers/Clearday.jpg similarity index 100% rename from system/home/desktop/wallpapers/Clearday.jpg rename to system/wallpapers/Clearday.jpg diff --git a/system/home/desktop/wallpapers/Clearnight.jpg b/system/wallpapers/Clearnight.jpg similarity index 100% rename from system/home/desktop/wallpapers/Clearnight.jpg rename to system/wallpapers/Clearnight.jpg diff --git a/system/home/desktop/wallpapers/Cloudsday.jpg b/system/wallpapers/Cloudsday.jpg similarity index 100% rename from system/home/desktop/wallpapers/Cloudsday.jpg rename to system/wallpapers/Cloudsday.jpg diff --git a/system/home/desktop/wallpapers/Cloudsnight.jpg b/system/wallpapers/Cloudsnight.jpg similarity index 100% rename from system/home/desktop/wallpapers/Cloudsnight.jpg rename to system/wallpapers/Cloudsnight.jpg diff --git a/system/home/desktop/wallpapers/Rainnight.jpg b/system/wallpapers/Rainnight.jpg similarity index 100% rename from system/home/desktop/wallpapers/Rainnight.jpg rename to system/wallpapers/Rainnight.jpg diff --git a/system/home/desktop/wallpapers/blake.png b/system/wallpapers/blake.png similarity index 100% rename from system/home/desktop/wallpapers/blake.png rename to system/wallpapers/blake.png diff --git a/system/home/desktop/wallpapers/default.jpg b/system/wallpapers/default.jpg similarity index 100% rename from system/home/desktop/wallpapers/default.jpg rename to system/wallpapers/default.jpg diff --git a/system/home/desktop/wallpapers/evening-sky.png b/system/wallpapers/evening-sky.png similarity index 100% rename from system/home/desktop/wallpapers/evening-sky.png rename to system/wallpapers/evening-sky.png diff --git a/system/home/desktop/wallpapers/forrest.png b/system/wallpapers/forrest.png similarity index 100% rename from system/home/desktop/wallpapers/forrest.png rename to system/wallpapers/forrest.png diff --git a/system/home/desktop/wallpapers/salty_mountains.png b/system/wallpapers/salty_mountains.png similarity index 100% rename from system/home/desktop/wallpapers/salty_mountains.png rename to system/wallpapers/salty_mountains.png diff --git a/system/home/desktop/wallpapers/science/2422830.jpg b/system/wallpapers/science/2422830.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/2422830.jpg rename to system/wallpapers/science/2422830.jpg diff --git a/system/home/desktop/wallpapers/science/5636374.png b/system/wallpapers/science/5636374.png similarity index 100% rename from system/home/desktop/wallpapers/science/5636374.png rename to system/wallpapers/science/5636374.png diff --git a/system/home/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg b/system/wallpapers/science/JET interior with superimposed plasma 2560px.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg rename to system/wallpapers/science/JET interior with superimposed plasma 2560px.jpg diff --git a/system/home/desktop/wallpapers/science/JET plasmas.png b/system/wallpapers/science/JET plasmas.png similarity index 100% rename from system/home/desktop/wallpapers/science/JET plasmas.png rename to system/wallpapers/science/JET plasmas.png diff --git a/system/home/desktop/wallpapers/science/JET wallpaper.jpg b/system/wallpapers/science/JET wallpaper.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/JET wallpaper.jpg rename to system/wallpapers/science/JET wallpaper.jpg diff --git a/system/home/desktop/wallpapers/science/LHC Science.jpg b/system/wallpapers/science/LHC Science.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/LHC Science.jpg rename to system/wallpapers/science/LHC Science.jpg diff --git a/system/home/desktop/wallpapers/science/MAST wallpaper.png b/system/wallpapers/science/MAST wallpaper.png similarity index 100% rename from system/home/desktop/wallpapers/science/MAST wallpaper.png rename to system/wallpapers/science/MAST wallpaper.png diff --git a/system/home/desktop/wallpapers/science/MAST-U 16x9.jpg b/system/wallpapers/science/MAST-U 16x9.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/MAST-U 16x9.jpg rename to system/wallpapers/science/MAST-U 16x9.jpg diff --git a/system/home/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg b/system/wallpapers/science/chang_hyun_vvts6_1a.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg rename to system/wallpapers/science/chang_hyun_vvts6_1a.jpg diff --git a/system/home/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png b/system/wallpapers/science/jet_glass_side_auto_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png rename to system/wallpapers/science/jet_glass_side_auto_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png b/system/wallpapers/science/jet_glass_side_s100_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png rename to system/wallpapers/science/jet_glass_side_s100_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png b/system/wallpapers/science/jet_glass_side_s250_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png rename to system/wallpapers/science/jet_glass_side_s250_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png b/system/wallpapers/science/jet_glass_side_s50_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png rename to system/wallpapers/science/jet_glass_side_s50_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png b/system/wallpapers/science/jet_glass_top_auto_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png rename to system/wallpapers/science/jet_glass_top_auto_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png b/system/wallpapers/science/jet_glass_top_s100_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png rename to system/wallpapers/science/jet_glass_top_s100_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png b/system/wallpapers/science/jet_glass_top_s250_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png rename to system/wallpapers/science/jet_glass_top_s250_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png b/system/wallpapers/science/jet_glass_top_s50_pass_latest.png similarity index 100% rename from system/home/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png rename to system/wallpapers/science/jet_glass_top_s50_pass_latest.png diff --git a/system/home/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg b/system/wallpapers/science/luca_z_56_iter_i_small.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg rename to system/wallpapers/science/luca_z_56_iter_i_small.jpg diff --git a/system/home/desktop/wallpapers/science/mastu_glass_side_s3.png b/system/wallpapers/science/mastu_glass_side_s3.png similarity index 100% rename from system/home/desktop/wallpapers/science/mastu_glass_side_s3.png rename to system/wallpapers/science/mastu_glass_side_s3.png diff --git a/system/home/desktop/wallpapers/science/oct5-selfie.jpg b/system/wallpapers/science/oct5-selfie.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/oct5-selfie.jpg rename to system/wallpapers/science/oct5-selfie.jpg diff --git a/system/home/desktop/wallpapers/science/pit_02-07-2021_small.jpg b/system/wallpapers/science/pit_02-07-2021_small.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/pit_02-07-2021_small.jpg rename to system/wallpapers/science/pit_02-07-2021_small.jpg diff --git a/system/home/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg b/system/wallpapers/science/vsm6_almost_there_1_small.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg rename to system/wallpapers/science/vsm6_almost_there_1_small.jpg diff --git a/system/home/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg b/system/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg similarity index 100% rename from system/home/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg rename to system/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg diff --git a/system/home/desktop/wallpapers/shaded_landscape.png b/system/wallpapers/shaded_landscape.png similarity index 100% rename from system/home/desktop/wallpapers/shaded_landscape.png rename to system/wallpapers/shaded_landscape.png diff --git a/system/home/desktop/wallpapers/space.png b/system/wallpapers/space.png similarity index 100% rename from system/home/desktop/wallpapers/space.png rename to system/wallpapers/space.png diff --git a/system/home/desktop/wallpapers/tropic_island_day.jpg b/system/wallpapers/tropic_island_day.jpg similarity index 100% rename from system/home/desktop/wallpapers/tropic_island_day.jpg rename to system/wallpapers/tropic_island_day.jpg diff --git a/system/home/desktop/wallpapers/tropic_island_evening.jpg b/system/wallpapers/tropic_island_evening.jpg similarity index 100% rename from system/home/desktop/wallpapers/tropic_island_evening.jpg rename to system/wallpapers/tropic_island_evening.jpg diff --git a/system/home/desktop/wallpapers/tropic_island_morning.jpg b/system/wallpapers/tropic_island_morning.jpg similarity index 100% rename from system/home/desktop/wallpapers/tropic_island_morning.jpg rename to system/wallpapers/tropic_island_morning.jpg diff --git a/system/home/desktop/wallpapers/tropic_island_night.jpg b/system/wallpapers/tropic_island_night.jpg similarity index 100% rename from system/home/desktop/wallpapers/tropic_island_night.jpg rename to system/wallpapers/tropic_island_night.jpg diff --git a/system/home/desktop/wallpapers/windows-error.jpg b/system/wallpapers/windows-error.jpg similarity index 100% rename from system/home/desktop/wallpapers/windows-error.jpg rename to system/wallpapers/windows-error.jpg diff --git a/system/home/desktop/wallpapers/yosemite.png b/system/wallpapers/yosemite.png similarity index 100% rename from system/home/desktop/wallpapers/yosemite.png rename to system/wallpapers/yosemite.png diff --git a/system/work.nix b/system/work.nix index 0d9e4009..e8f53278 100644 --- a/system/work.nix +++ b/system/work.nix @@ -1,12 +1,5 @@ +{ lib, username, ... }: { - lib, - pkgs, - username, - ... -}: -{ - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nomachine-client" ]; - environment.systemPackages = [ pkgs.nomachine-client ]; home-manager.users.${username} = { config, ... }: {