From c33c521aadf8348c1c29ea603a2886ff3ae36d14 Mon Sep 17 00:00:00 2001 From: Till Date: Thu, 9 Jan 2025 18:37:17 +0100 Subject: [PATCH 1/9] diesdas --- home/castget/castget.conf | 5 ++--- home/firefox.nix | 2 +- system/btrbk.nix | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 8db9a89..58d0c6e 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -27,9 +27,8 @@ url=https://www.eintracht-podcast.de/feed/mp3 # url=https://cdn.julephosting.de/podcasts/573-edeltalk-mit-dominik-kevin/feed.rss # id3album=Edeltalk -[musikisteinewaffe] -url=https://www.radioeins.de/archiv/podcast/ton_steine_scherben.xml/feed=podcast.xml -id3album=Musik ist eine Waffe +[logbuchnetzpolitik] +url=https://logbuch-netzpolitik.de/feed/mp3 [*] id3contenttype=Podcast diff --git a/home/firefox.nix b/home/firefox.nix index e4856d0..efb192b 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -143,7 +143,7 @@ user_pref("intl.regional_prefs.use_os_locales", true); user_pref("media.eme.enabled", true); user_pref("network.trr.custom_uri", "https://dns.quad9.net/dns-query "); - user_pref("network.trr.mode", 3); + user_pref("network.trr.mode", 2); user_pref("network.trr.uri", "https://dns.quad9.net/dns-query"); user_pref("permissions.default.desktop-notification", 2); user_pref("privacy.annotate_channels.strict_list.enabled", true); diff --git a/system/btrbk.nix b/system/btrbk.nix index 2d23e69..0981e09 100644 --- a/system/btrbk.nix +++ b/system/btrbk.nix @@ -10,7 +10,7 @@ snapshot_preserve_min = "4d"; snapshot_dir = "/btrbk_snapshots"; target = "/run/media/till/backup/${config.networking.hostName}"; - target_preserve_min = "latest"; + target_preserve_min = "no"; target_preserve = "10d 10w 24m"; }; }; From 572ae7c8762e1c4685a2f5e22eec290b66fb3005 Mon Sep 17 00:00:00 2001 From: Till Date: Sun, 19 Jan 2025 13:31:34 +0100 Subject: [PATCH 2/9] guest --- flake.nix | 8 +++++ home/castget/castget.conf | 3 +- home/fonts.nix | 2 ++ home/guest.nix | 55 +++++++++++++++++++++++++++++++++ home/nvim/ftplugin/markdown.vim | 1 - home/r.nix | 24 ++------------ 6 files changed, 69 insertions(+), 24 deletions(-) create mode 100644 home/guest.nix diff --git a/flake.nix b/flake.nix index 84254a8..f3c1a1f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ ./system/btrbk.nix ./system/yubikey.nix ./system/alt.nix + ./system/guest.nix ]; }; @@ -108,6 +109,13 @@ ./home/alt.nix ]; }; + guest = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlays.default; + extraSpecialArgs = { inherit inputs; }; + modules = [ + ./home/guest.nix + ]; + }; }; }; } diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 58d0c6e..27691f7 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -28,7 +28,8 @@ url=https://www.eintracht-podcast.de/feed/mp3 # id3album=Edeltalk [logbuchnetzpolitik] -url=https://logbuch-netzpolitik.de/feed/mp3 +url=https://feeds.metaebene.me/lnp/mp3 +id3album=Logbuch Netzpolitik [*] id3contenttype=Podcast diff --git a/home/fonts.nix b/home/fonts.nix index 6db14f8..1aca76a 100644 --- a/home/fonts.nix +++ b/home/fonts.nix @@ -4,6 +4,7 @@ home.packages = with pkgs; [ anonymousPro cantarell-fonts + cascadia-code charis-sil cm_unicode corefonts @@ -11,6 +12,7 @@ dotcolon-fonts freefont_ttf gyre-fonts + hack-font hubot-sans liberation_ttf libertine diff --git a/home/guest.nix b/home/guest.nix new file mode 100644 index 0000000..c7f43a7 --- /dev/null +++ b/home/guest.nix @@ -0,0 +1,55 @@ +{ config, pkgs, inputs, lib, ... }: + +{ + home.username = "guest"; + home.homeDirectory = "/home/guest"; + home.stateVersion = "22.11"; + + nixpkgs = { + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + }; + + programs.home-manager.enable = true; + + xdg.userDirs = { + enable = true; + createDirectories = true; + download = "${config.home.homeDirectory}/tmp"; + music = "${config.home.homeDirectory}/media/music"; + pictures = "${config.home.homeDirectory}/media/img"; + videos = "${config.home.homeDirectory}/media/vid"; + documents = "${config.home.homeDirectory}/misc"; + templates = "${config.xdg.dataHome}/templates"; + }; + + home.packages = with pkgs; [ + fzf + silver-searcher + tmux + nodejs + wl-clipboard + qbittorrent + vlc + # mullvad-vpn + ffmpeg + libnotify + ]; + + imports = [ + ./gnome + ./firefox.nix + ./foot.nix + ./fish.nix + ./tmux + ./nvim + ]; + + programs.nix-index = { + enable = true; + enableFishIntegration = true; + }; + +} diff --git a/home/nvim/ftplugin/markdown.vim b/home/nvim/ftplugin/markdown.vim index a80f805..8d0d7af 100644 --- a/home/nvim/ftplugin/markdown.vim +++ b/home/nvim/ftplugin/markdown.vim @@ -5,7 +5,6 @@ setlocal breakat-=@ setlocal makeprg=Rscript\ -e\ 'publishR::render(\\"%\\")' -" nnoremap oh :! xdg-open %:r.html nnoremap oh :! xdg-open %:r.html nnoremap op :! xdg-open %:r.pdf nnoremap ow :! xdg-open %:r.docx diff --git a/home/r.nix b/home/r.nix index 7ac8a13..c215563 100644 --- a/home/r.nix +++ b/home/r.nix @@ -34,27 +34,6 @@ propagatedBuildInputs = []; nativeBuildInputs = []; }; - readODS = pkgs.rPackages.buildRPackage { - name = "readODS"; - src = pkgs.fetchFromGitHub { - owner = "ropensci"; - repo = "readODS"; - rev = "011a89f57169d6f7c8796954e2365f0bd9b5765f"; - sha256 = "1hg8w46l5ifbaifmkmxxdvbamlj7bkadq956fab5063a5yrxfzwm"; - }; - propagatedBuildInputs = [xml2 cellranger readr stringi purrr zip]; - nativeBuildInputs = []; - }; - # readODS = pkgs.rPackages.buildRPackage { - # name = "readODS"; - # src = builtins.fetchGit { - # url = "https://git@github.com/ktiu/readODS/"; - # ref = "v1.8"; - # rev = "d7e9c54a3a193979ea4195ac36938aa55cd5360f"; - # }; - # propagatedBuildInputs = [xml2 cellranger readr stringi purrr zip]; - # nativeBuildInputs = []; - # }; in [ bookdown catmaply @@ -88,6 +67,7 @@ rvest sf stringr + swirl testthat tidyr tidyverse @@ -96,7 +76,7 @@ yaml lectuR publishR - goethR + # goethR ggtree ]; R-packed = rWrapper.override { packages = customPackages; }; From 9f74d8a29334e9267a429bfdf7b85d92d98614d7 Mon Sep 17 00:00:00 2001 From: Till Date: Sun, 19 Jan 2025 13:32:33 +0100 Subject: [PATCH 3/9] alt sys --- system/alt.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/system/alt.nix b/system/alt.nix index 3fd8b7e..c515663 100644 --- a/system/alt.nix +++ b/system/alt.nix @@ -2,16 +2,13 @@ { users.users.alt = { - home = "/home/alt"; + home = "/home/guest"; isSystemUser = true; group = "users"; - description = "Alt"; + description = "Guest"; extraGroups = [ "networkmanager" ]; shell = pkgs.fish; }; - services.xserver.displayManager.gdm.settings = { - greeter.Exclude = "bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap,alt"; - }; } From 329853591dbfbe8284ad2cc06ca221d72a582a32 Mon Sep 17 00:00:00 2001 From: Till Date: Sun, 19 Jan 2025 13:33:54 +0100 Subject: [PATCH 4/9] guest --- system/alt.nix | 4 ++-- system/guest.nix | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 system/guest.nix diff --git a/system/alt.nix b/system/alt.nix index c515663..726c48b 100644 --- a/system/alt.nix +++ b/system/alt.nix @@ -2,10 +2,10 @@ { users.users.alt = { - home = "/home/guest"; + home = "/home/alt"; isSystemUser = true; group = "users"; - description = "Guest"; + description = "Alt"; extraGroups = [ "networkmanager" ]; diff --git a/system/guest.nix b/system/guest.nix new file mode 100644 index 0000000..6c9ba17 --- /dev/null +++ b/system/guest.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + users.users.guest = { + home = "/home/guest"; + isSystemUser = true; + group = "users"; + description = "Guest"; + extraGroups = [ + "networkmanager" + ]; + shell = pkgs.fish; + }; +} From 47a684d78fbf5e5e89dfbe65e49140375a9c080a Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 20 Jan 2025 09:24:02 +0100 Subject: [PATCH 5/9] guest --- system/guest.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/guest.nix b/system/guest.nix index 6c9ba17..31b9b71 100644 --- a/system/guest.nix +++ b/system/guest.nix @@ -3,7 +3,7 @@ { users.users.guest = { home = "/home/guest"; - isSystemUser = true; + isNormalUser = true; group = "users"; description = "Guest"; extraGroups = [ From 7dd4cb58fe24ba353b8ed00ac3ffec0a08989631 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 11 Feb 2025 23:59:20 +0100 Subject: [PATCH 6/9] diesdas --- flake.lock | 24 ++++++++++++------------ flake.nix | 1 + home/default.nix | 2 ++ home/gnome/default.nix | 8 +++++++- home/gnome/run-or-raise.conf | 8 +++----- home/mail/default.nix | 4 ++-- system/default.nix | 2 ++ system/gnome.nix | 6 +++++- system/hyprland.nix | 17 +++++++++++++++++ system/plasma.nix | 4 ++-- 10 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 system/hyprland.nix diff --git a/flake.lock b/flake.lock index 687391e..4f5b153 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734616194, - "narHash": "sha256-J90ItNNG+V2tneyHGHDCTb/WBxrpobxl+SsiQGVxOAI=", + "lastModified": 1739229047, + "narHash": "sha256-sSTgA86wdk8d544c2+gzrfvVPHQF4mbsomvLOW2thn0=", "owner": "nix-community", "repo": "nur", - "rev": "89621e43228d2941138a4d54a24924cd70d12bfe", + "rev": "8348d89f30598a73fee7efb4b5d34c3de201e71b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3c1a1f..9eb3829 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix + ./system/hyprland.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/home/default.nix b/home/default.nix index f63ed39..1630d0a 100644 --- a/home/default.nix +++ b/home/default.nix @@ -48,5 +48,7 @@ ]; programs.obs-studio.enable = true; + programs.kitty.enable = true; + } diff --git a/home/gnome/default.nix b/home/gnome/default.nix index d21b3c1..6a2eaf4 100644 --- a/home/gnome/default.nix +++ b/home/gnome/default.nix @@ -31,13 +31,16 @@ }; "org/gnome/settings-daemon/plugins/media-keys" = { screenreader = []; - magnifier = []; + magnifier = ["z"]; magnifier-zoom-in = []; magnifier-zoom-out = []; help = []; + logout = ["q"]; }; "org/gnome/shell/keybindings" = { toggle-quick-settings = ["comma"]; + toggle-message-tray = ["n"]; + toggle-overview = ["a"]; }; "org/gnome/desktop/wm/keybindings" = { move-to-monitor-down = []; @@ -47,6 +50,7 @@ move-to-workspace-last = []; switch-applications = ["Tab"]; switch-applications-backward = ["Tab"]; + switch-monitor = []; cycle-panels = []; cycle-panels-backward = []; cycle-group = []; @@ -84,6 +88,8 @@ switch-to-application-2 = []; switch-to-application-3 = []; switch-to-application-4 = []; + toggle-fullscreen = ["f"]; + begin-resize = ["r"]; }; }; xdg.configFile."run-or-raise/shortcuts.conf".source = ./run-or-raise.conf; diff --git a/home/gnome/run-or-raise.conf b/home/gnome/run-or-raise.conf index 2361354..783e5a5 100644 --- a/home/gnome/run-or-raise.conf +++ b/home/gnome/run-or-raise.conf @@ -14,12 +14,10 @@ # # This line cycles any open gnome-terminal (matched by wm_class = Gnome-terminal on Ubuntu 17.10) OR if not found, launches new one. # If you're using Arch, you may want to match by wm_class = gnome-terminal-server , just check yourself by Alt+F2/lg/Windows -t,gnome-terminal,gnome-terminal-server, -n,nautilus,, -f,firefox,, +b,firefox,, +f,nautilus,, return,foot,, -x,keepassxc,,, -q,qutebrowser,, +p,keepassxc,,, # You may use regular expression in title or wm_class. # Just put the regular expression between slashes. diff --git a/home/mail/default.nix b/home/mail/default.nix index 4898270..060cc3f 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -35,7 +35,7 @@ passwordCommand = "secret-tool lookup server uni-frankfurt.de account tstraube"; signature = { text = '' - Dr. Till Straube (he, him, his) + Dr. Till Straube (he/him) Dept. of Human Geography Goethe University Frankfurt ''; @@ -88,7 +88,7 @@ notmuch.enable = true; userName = "till"; signature.text = '' - Till Straube (he, him, his) + Till Straube (he/him) PGP: https://keys.openpgp.org/search?q=till@ktiu.net ''; signature.showSignature = "append"; diff --git a/system/default.nix b/system/default.nix index db0d1ec..b30e810 100644 --- a/system/default.nix +++ b/system/default.nix @@ -12,6 +12,8 @@ programs.fish.enable = true; + users.mutableUsers = true; + users.users.till = { isNormalUser = true; description = "Till"; diff --git a/system/gnome.nix b/system/gnome.nix index 06799f8..2b2ae55 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -2,7 +2,11 @@ { services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager = { + gdm.enable = true; + autoLogin.user = "till"; + }; + services.xserver.desktopManager.gnome.enable = true; services.gnome.gnome-browser-connector.enable = true; environment.gnome.excludePackages = (with pkgs; [ diff --git a/system/hyprland.nix b/system/hyprland.nix new file mode 100644 index 0000000..af157b3 --- /dev/null +++ b/system/hyprland.nix @@ -0,0 +1,17 @@ +{ config, pkgs, ... }: + +{ + programs.uwsm.enable = true; + + programs.hyprland = { + enable = true; + withUWSM = true; + }; + + programs.waybar.enable = true; + + environment.systemPackages = with pkgs; [ + swaynotificationcenter + tofi + ]; +} diff --git a/system/plasma.nix b/system/plasma.nix index 6ebe62e..91ceacc 100644 --- a/system/plasma.nix +++ b/system/plasma.nix @@ -1,6 +1,6 @@ { config, pkgs, ... }: { - services.xserver.enable = true; - services.xserver.desktopManager.plasma6.enable = true; + services.xserver.enable = true; + services.xserver.desktopManager.plasma6.enable = true; } From 133eee5975d531b3469ccab35a670e346a38e012 Mon Sep 17 00:00:00 2001 From: Till Date: Fri, 14 Feb 2025 17:06:24 +0100 Subject: [PATCH 7/9] diesdas --- flake.lock | 18 +++++++++--------- home/castget/castget.conf | 15 ++++++++++++++- home/gnome/default.nix | 4 +++- system/gnome.nix | 1 - 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4f5b153..0604612 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739055578, - "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739229047, - "narHash": "sha256-sSTgA86wdk8d544c2+gzrfvVPHQF4mbsomvLOW2thn0=", + "lastModified": 1739538383, + "narHash": "sha256-lc4FWHP4VWOKHBxD19/AQWmbsUCwdefMiJIdFa6KQuY=", "owner": "nix-community", "repo": "nur", - "rev": "8348d89f30598a73fee7efb4b5d34c3de201e71b", + "rev": "35198d73b581574847341314fff8a99ba3d122bb", "type": "github" }, "original": { diff --git a/home/castget/castget.conf b/home/castget/castget.conf index 27691f7..0b9d87a 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -6,9 +6,22 @@ id3album=drei90 [50plus2] url=https://50plus2.podigee.io/feed/mp3 +id3album=50+2 [latenightlinux] -url=https://latenightlinux.com/feed/all +url=https://latenightlinux.com/feed/mp3 + +[linuxdevtime] +url=https://latenightlinux.com/feed/extra + +[linuxafterdark] +url=https://linuxafterdark.net/feed/podcast + +[linuxmatters] +url=https://linuxmatters.sh/episode/index.xml + +[2.5admins] +url=https://2.5admins.com/feed/podcast [schlusskonferenz] url=https://schlusskonferenz.podigee.io/feed/mp3 diff --git a/home/gnome/default.nix b/home/gnome/default.nix index 6a2eaf4..19c77f1 100644 --- a/home/gnome/default.nix +++ b/home/gnome/default.nix @@ -23,6 +23,9 @@ "org/gnome/mutter" = { dynamic-workspaces = true; }; + "org/gnome/mutter/keybindings" = { + switch-monitor = []; + }; "org/gnome/desktop/session" = { idle-delay = 0; }; @@ -50,7 +53,6 @@ move-to-workspace-last = []; switch-applications = ["Tab"]; switch-applications-backward = ["Tab"]; - switch-monitor = []; cycle-panels = []; cycle-panels-backward = []; cycle-group = []; diff --git a/system/gnome.nix b/system/gnome.nix index 2b2ae55..923c542 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -4,7 +4,6 @@ services.xserver.enable = true; services.xserver.displayManager = { gdm.enable = true; - autoLogin.user = "till"; }; services.xserver.desktopManager.gnome.enable = true; From 3e8d9e6b844f097348f50b673f61cb21ebbe1b83 Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 19 Mar 2025 16:15:29 +0100 Subject: [PATCH 8/9] before upgrade? --- flake.lock | 24 ++++++++++++------------ flake.nix | 2 +- home/default.nix | 2 ++ home/librewolf.nix | 5 +++++ home/minimal.nix | 2 +- home/r.nix | 1 + home/slim-desktop.nix | 2 ++ home/tex.nix | 2 ++ system/sway.nix | 20 ++++++++++++++++++++ 9 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 home/librewolf.nix create mode 100644 system/sway.nix diff --git a/flake.lock b/flake.lock index 0604612..cc741bb 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739538383, - "narHash": "sha256-lc4FWHP4VWOKHBxD19/AQWmbsUCwdefMiJIdFa6KQuY=", + "lastModified": 1740494722, + "narHash": "sha256-Yl3bKdrUEwBJPMaukZobKvnQCygTgpQVN2bEXgOETMU=", "owner": "nix-community", "repo": "nur", - "rev": "35198d73b581574847341314fff8a99ba3d122bb", + "rev": "2f870320a423b88592fc6f4dffa6ece86eb06dc4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9eb3829..1faa32a 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ ./system/desktop.nix ./system/hardware/nova.nix ./system/gnome.nix - ./system/hyprland.nix + ./system/sway.nix ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix diff --git a/home/default.nix b/home/default.nix index 1630d0a..5db21a5 100644 --- a/home/default.nix +++ b/home/default.nix @@ -15,6 +15,7 @@ # text publishing libreoffice + jdk poppler_utils zotero @@ -43,6 +44,7 @@ ./slim-desktop.nix ./gnome ./firefox.nix + ./librewolf.nix ./tex.nix ./fonts.nix ]; diff --git a/home/librewolf.nix b/home/librewolf.nix new file mode 100644 index 0000000..3991dc1 --- /dev/null +++ b/home/librewolf.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + programs.librewolf.enable = true; +} diff --git a/home/minimal.nix b/home/minimal.nix index 4a0c137..11d51ec 100644 --- a/home/minimal.nix +++ b/home/minimal.nix @@ -64,6 +64,6 @@ programs.bottom = { enable = true; - settings.flags.color = "default-light"; + settings.styles.theme = "default-light"; }; } diff --git a/home/r.nix b/home/r.nix index c215563..8c82e4b 100644 --- a/home/r.nix +++ b/home/r.nix @@ -50,6 +50,7 @@ languageserver magrittr mapproj + networkD3 openxlsx plotly progress diff --git a/home/slim-desktop.nix b/home/slim-desktop.nix index 419c414..4668a71 100644 --- a/home/slim-desktop.nix +++ b/home/slim-desktop.nix @@ -40,6 +40,8 @@ hunspellDicts.en_US hunspellDicts.th_TH hyphen + hyphenDicts.de_DE + hyphenDicts.en_US pandoc imagemagick ghostscript diff --git a/home/tex.nix b/home/tex.nix index 79537f9..33892ed 100644 --- a/home/tex.nix +++ b/home/tex.nix @@ -32,6 +32,7 @@ let nowidow pdfcol pdfpages + pdfx pgf qrcode scheme-medium @@ -51,6 +52,7 @@ let transparent was wrapfig + xmpincl xpatch xstring xtab diff --git a/system/sway.nix b/system/sway.nix new file mode 100644 index 0000000..609c87d --- /dev/null +++ b/system/sway.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: + +{ + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + + programs.waybar.enable = true; + + services.gnome.gnome-keyring.enable = true; + + environment.systemPackages = with pkgs; [ + grim + slurp + wl-clipboard + swaynotificationcenter + tofi + ]; +} From 5f42c8d0c40656bcfe9841b30ad6daa268bdcecb Mon Sep 17 00:00:00 2001 From: Till Date: Wed, 19 Mar 2025 18:13:15 +0100 Subject: [PATCH 9/9] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cc741bb..41156a4 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1742234739, + "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740339700, - "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740494722, - "narHash": "sha256-Yl3bKdrUEwBJPMaukZobKvnQCygTgpQVN2bEXgOETMU=", + "lastModified": 1742392354, + "narHash": "sha256-zWsw/tQ45G92yoG+ievU9nVUa3e807nQ6YpsdxcoOYM=", "owner": "nix-community", "repo": "nur", - "rev": "2f870320a423b88592fc6f4dffa6ece86eb06dc4", + "rev": "339f1d2fd68fc1e33ece1f94ee2ab4b4badecbf7", "type": "github" }, "original": {