diff --git a/flake.nix b/flake.nix index a1c8dce..7f523e6 100644 --- a/flake.nix +++ b/flake.nix @@ -44,20 +44,6 @@ ]; }; - ernst = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - { - networking.hostName = "ernst"; - } - ./system - ./system/hardware-ernst.nix - ./system/desktop.nix - ./system/plasma.nix - ./system/laura.nix - ]; - }; - romulus = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ @@ -100,6 +86,13 @@ ]; }; "till@romulus" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay; + extraSpecialArgs = { inherit inputs; }; + modules = [ + ./home/slim-desktop.nix + ]; + }; + "till@arielle" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay; extraSpecialArgs = { inherit inputs; }; modules = [ @@ -113,13 +106,6 @@ ./home/alt.nix ]; }; - "lisa@ernst" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay; - extraSpecialArgs = { inherit inputs; }; - modules = [ - ./home/lisa.nix - ]; - }; }; }; } diff --git a/home/default.nix b/home/default.nix index e8b7a26..7937745 100644 --- a/home/default.nix +++ b/home/default.nix @@ -19,16 +19,11 @@ libreoffice poppler_utils zotero - pdftk # graphics - drawing gimp godot_4 inkscape - imagemagick - ghostscript - scrcpy # web chromium @@ -38,7 +33,6 @@ bookworm heroic anki-bin - castget freetube qbittorrent nicotine-plus @@ -49,7 +43,7 @@ ]; imports = [ - ./minimal.nix + ./slim-desktop.nix ./gnome ./firefox.nix ./tex.nix diff --git a/home/firefox.nix b/home/firefox.nix index 46d3df4..f8afa6d 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -35,12 +35,6 @@ }; }; profiles = { - # bkup = { - # id = 1; - # name = "alt"; - # isDefault = false; - # path = "f6h6bcj5.default-release"; - # }; ${config.home.username} = { name = config.home.username; isDefault = true; @@ -49,6 +43,9 @@ linkhints keepassxc-browser libredirect + vimium + tampermonkey + zotero-connector ]; search = { force = true; diff --git a/home/minimal.nix b/home/minimal.nix index 98d0c39..882b477 100644 --- a/home/minimal.nix +++ b/home/minimal.nix @@ -16,7 +16,6 @@ xdg.userDirs = { enable = true; - createDirectories = true; download = "${config.home.homeDirectory}/tmp"; music = "${config.home.homeDirectory}/media/music"; pictures = "${config.home.homeDirectory}/media/img"; @@ -25,80 +24,20 @@ templates = "${config.xdg.dataHome}/templates"; }; - home.file.".npmrc".text = '' - prefix = ${config.xdg.dataHome}/npm/packages - ''; - - xdg.configFile."castget/castget.conf".source = ./castget/castget.conf; - home.packages = with pkgs; [ - - # commandline + du-dust fzf jq progress silver-searcher - tmux - wl-clipboard tldr - du-dust - - # email - msmtp - notmuch - w3m - openssl - gnupg - urlscan - ripmime - - # office - khal - khard - taskopen - zathura - - # publishing - hunspell - hunspellDicts.de_DE - hunspellDicts.en_US - hunspellDicts.th_TH - hyphen - pandoc - imagemagick - ghostscript - - # web - nyxt - - # media - rhythmbox - vlc - - # development - bundler - bundix - nodejs - yarn - android-studio - netlify-cli - appimage-run - - # secrets - libsecret - keepassxc - yubikey-manager-qt + tmux ]; imports = [ - ./calendars.nix ./fish.nix - ./foot.nix ./tmux - ./mail ./nvim - ./openconnect.nix - ./r.nix ]; programs.nix-index = { @@ -120,25 +59,8 @@ }; }; - programs.taskwarrior = { - enable = true; - dataLocation = "${config.xdg.dataHome}/taskwarrior/tasks"; - colorTheme = "light-256"; - config = { - report.list.columns = ["id" "depends.indicator" "priority" "project" "recur.indicator" "scheduled.countdown" "due" "until.age" "status.short" "description.count" "tags"]; - report.list.labels= ["ID" "D" "Prio" "Proj" "R" "Scheduled" "Due" "Until" "S" "Description" "Tags"]; - }; - extraConfig = " - hooks.location=${config.xdg.dataHome}/taskwarrior/hooks - verbose=affected,context,edit,label,header,new-id,project,special,sync,recur - "; - }; - programs.bottom = { enable = true; settings.flags.color = "default-light"; }; - - services.syncthing.enable = true; } - diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix new file mode 100644 index 0000000..4efa1fa --- /dev/null +++ b/home/slim-desktop.nix @@ -0,0 +1,89 @@ +{ config, pkgs, inputs, lib, ... }: + +{ + xdg.userDirs.createDirectories = true; + + home.file.".npmrc".text = '' + prefix = ${config.xdg.dataHome}/npm/packages + ''; + + xdg.configFile."castget/castget.conf".source = ./castget/castget.conf; + + home.packages = with pkgs; [ + + wl-clipboard + + # email + msmtp + notmuch + w3m + openssl + gnupg + urlscan + ripmime + + # office + khal + khard + taskopen + zathura + pdftk + imagemagick + ghostscript + drawing + castget + + # publishing + hunspell + hunspellDicts.de_DE + hunspellDicts.en_US + hunspellDicts.th_TH + hyphen + pandoc + imagemagick + ghostscript + + # media + rhythmbox + vlc + + # development + bundler + bundix + nodejs + yarn + android-studio + netlify-cli + appimage-run + + # secrets + libsecret + keepassxc + yubikey-manager-qt + ]; + + imports = [ + ./minimal.nix + ./calendars.nix + ./foot.nix + ./mail + ./openconnect.nix + ./r.nix + ]; + + programs.taskwarrior = { + enable = true; + dataLocation = "${config.xdg.dataHome}/taskwarrior/tasks"; + colorTheme = "light-256"; + config = { + report.list.columns = ["id" "depends.indicator" "priority" "project" "recur.indicator" "scheduled.countdown" "due" "until.age" "status.short" "description.count" "tags"]; + report.list.labels= ["ID" "D" "Prio" "Proj" "R" "Scheduled" "Due" "Until" "S" "Description" "Tags"]; + }; + extraConfig = " + hooks.location=${config.xdg.dataHome}/taskwarrior/hooks + verbose=affected,context,edit,label,header,new-id,project,special,sync,recur + "; + }; + + services.syncthing.enable = true; +}