server with fish?

This commit is contained in:
Till 2024-12-05 23:43:05 +01:00
parent 66c8d3ee0c
commit 047e005308
5 changed files with 102 additions and 114 deletions

View file

@ -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 { romulus = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
@ -100,6 +86,13 @@
]; ];
}; };
"till@romulus" = home-manager.lib.homeManagerConfiguration { "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; pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay;
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
modules = [ modules = [
@ -113,13 +106,6 @@
./home/alt.nix ./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
];
};
}; };
}; };
} }

View file

@ -19,16 +19,11 @@
libreoffice libreoffice
poppler_utils poppler_utils
zotero zotero
pdftk
# graphics # graphics
drawing
gimp gimp
godot_4 godot_4
inkscape inkscape
imagemagick
ghostscript
scrcpy
# web # web
chromium chromium
@ -38,7 +33,6 @@
bookworm bookworm
heroic heroic
anki-bin anki-bin
castget
freetube freetube
qbittorrent qbittorrent
nicotine-plus nicotine-plus
@ -49,7 +43,7 @@
]; ];
imports = [ imports = [
./minimal.nix ./slim-desktop.nix
./gnome ./gnome
./firefox.nix ./firefox.nix
./tex.nix ./tex.nix

View file

@ -35,12 +35,6 @@
}; };
}; };
profiles = { profiles = {
# bkup = {
# id = 1;
# name = "alt";
# isDefault = false;
# path = "f6h6bcj5.default-release";
# };
${config.home.username} = { ${config.home.username} = {
name = config.home.username; name = config.home.username;
isDefault = true; isDefault = true;
@ -49,6 +43,9 @@
linkhints linkhints
keepassxc-browser keepassxc-browser
libredirect libredirect
vimium
tampermonkey
zotero-connector
]; ];
search = { search = {
force = true; force = true;

View file

@ -16,7 +16,6 @@
xdg.userDirs = { xdg.userDirs = {
enable = true; enable = true;
createDirectories = true;
download = "${config.home.homeDirectory}/tmp"; download = "${config.home.homeDirectory}/tmp";
music = "${config.home.homeDirectory}/media/music"; music = "${config.home.homeDirectory}/media/music";
pictures = "${config.home.homeDirectory}/media/img"; pictures = "${config.home.homeDirectory}/media/img";
@ -25,80 +24,20 @@
templates = "${config.xdg.dataHome}/templates"; 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; [ home.packages = with pkgs; [
du-dust
# commandline
fzf fzf
jq jq
progress progress
silver-searcher silver-searcher
tmux
wl-clipboard
tldr tldr
du-dust tmux
# 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
]; ];
imports = [ imports = [
./calendars.nix
./fish.nix ./fish.nix
./foot.nix
./tmux ./tmux
./mail
./nvim ./nvim
./openconnect.nix
./r.nix
]; ];
programs.nix-index = { 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 = { programs.bottom = {
enable = true; enable = true;
settings.flags.color = "default-light"; settings.flags.color = "default-light";
}; };
services.syncthing.enable = true;
} }

89
home/slim-desktop.nix Normal file
View file

@ -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;
}