From 4ff71d189c210a0c26e839ecd19b12749126746d Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Tue, 6 Jan 2026 21:07:19 +0100 Subject: Add hyprsunset to hyprland config --- home-modules/desktop/hyprland.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index 1fdc801..9703e0d 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -15,6 +15,7 @@ with lib; networkmanagerapplet wl-clipboard brightnessctl + hyprsunset ]; services.hyprpolkitagent.enable = true; @@ -299,6 +300,30 @@ with lib; ]; }; }; + services.hyprsunset = { + enable = true; + settings = { + max-gamma = 140; + profile = [ + { # Morning + time = "07:00"; + identity = true; + # temperature = 6500; + # gamme = 1; + } + { # Evening + time = "19:00"; + temperature = 4000; + gamma = 0.6; + } + { # Night + time = "22:00"; + temperature = 3000; + gamma = 0.4; + } + ]; + }; + }; services.hypridle.enable = true; services.hypridle.settings = { -- cgit v1.3.1 From 257e05df975ca7392c6fbcb11905769ce7fc914d Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Wed, 7 Jan 2026 15:14:13 +0100 Subject: Update NixOS --- flake.lock | 30 +++++++++++++++--------------- home-modules/desktop/hyprland.nix | 7 +++---- modules/desktop/wms/hyprland.nix | 14 +++++++------- users/wilkuu.nix | 1 - 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 3e3351a..a155bf4 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1763906693, - "narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=", + "lastModified": 1767702900, + "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b", + "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1767051569, + "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1763870012, - "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", + "lastModified": 1767499857, + "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", + "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1766000401, - "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", + "lastModified": 1767468822, + "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", + "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", "type": "github" }, "original": { diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index 9703e0d..caca14f 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -34,7 +34,6 @@ with lib; export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 export QT_AUTO_SCREEN_SCALE_FACTOR=1 export MOZ_ENABLE_WAYLAND=1 - export -n GTK_IM_MODULE ''; # Hyprland @@ -258,10 +257,10 @@ with lib; settings = { ipc = "on"; splash = false; - splash_offset = 2.0; + splash_offset = 2; preload = [ "${./wallpaper.png}" ]; - wallpaper = [ ",${./wallpaper.png}" ]; + wallpaper = [ ",${./wallpaper.png}," ]; }; }; @@ -309,7 +308,7 @@ with lib; time = "07:00"; identity = true; # temperature = 6500; - # gamme = 1; + gamme = 1; } { # Evening time = "19:00"; diff --git a/modules/desktop/wms/hyprland.nix b/modules/desktop/wms/hyprland.nix index d339f98..5beda89 100644 --- a/modules/desktop/wms/hyprland.nix +++ b/modules/desktop/wms/hyprland.nix @@ -20,13 +20,13 @@ in programs.hyprland.withUWSM = true; programs.uwsm = { enable = true; - waylandCompositors = { - hyprland = { - prettyName = "Hyprland"; - comment = "Hyprland compositor managed by UWSM"; - binPath = "/run/current-system/sw/bin/Hyprland"; - }; - }; + # waylandCompositors = { + # hyprland = { + # prettyName = "Hyprland"; + # comment = "Hyprland compositor managed by UWSM"; + # # binPath = "/run/current-system/sw/bin/Hyprland"; + # }; + # }; }; environment.systemPackages = with pkgs; [ diff --git a/users/wilkuu.nix b/users/wilkuu.nix index 8804ebb..cada172 100644 --- a/users/wilkuu.nix +++ b/users/wilkuu.nix @@ -5,7 +5,6 @@ { imports = [ ./user-common.nix ]; programs.zsh.enable = true; - programs.adb.enable = true; users.users.wilkuu = { shell = pkgs.zsh; isNormalUser = true; -- cgit v1.3.1 From 69e57b6f623251df0c28bcb8e4634fb24c9546ac Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Sat, 17 Jan 2026 19:30:50 +0100 Subject: CosmicWM additiona and testing Akonadi --- home-modules/apps/desktop/default.nix | 9 +++++- home-modules/desktop/hyprland.nix | 45 +++++++++++++++++------------ hosts/apocalypse/default.nix | 1 + hosts/apocalypse/hardware-configuration.nix | 37 ++++++++++++------------ modules/desktop/akonadi.nix | 8 +++++ modules/desktop/default.nix | 1 + modules/desktop/wms/cosmic.nix | 18 ++++++++++++ modules/desktop/wms/default.nix | 1 + 8 files changed, 82 insertions(+), 38 deletions(-) create mode 100644 modules/desktop/akonadi.nix create mode 100644 modules/desktop/wms/cosmic.nix diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix index 9a6f0e4..a732ded 100644 --- a/home-modules/apps/desktop/default.nix +++ b/home-modules/apps/desktop/default.nix @@ -67,7 +67,14 @@ in ]; }) (lib.mkIf cfg.note-taking.enable { - home.packages = with pkgs; [ obsidian ]; + home.packages = with pkgs; [ + obsidian + kdePackages.kdepim-runtime + ] ++ (with pkgs.kdePackages; [ + zanshin + kdepim-runtime + akonadi-calendar + ]); # Todo force synthing to be on here }) (lib.mkIf cfg.art.enable { diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index caca14f..80773d4 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -38,7 +38,7 @@ with lib; # Hyprland wayland.windowManager.hyprland = { - systemd.enable = false; + systemd.enable = true; enable = true; xwayland.enable = true; settings = { @@ -252,6 +252,9 @@ with lib; }; }; + systemd.user.services.hyprpaper = { + Install.WantedBy = [ "hyprland-session.target"]; + }; services.hyprpaper = { enable = true; settings = { @@ -301,6 +304,7 @@ with lib; }; services.hyprsunset = { enable = true; + systemdTarget = "hyprland-session.target"; settings = { max-gamma = 140; profile = [ @@ -324,25 +328,28 @@ with lib; }; }; - services.hypridle.enable = true; - services.hypridle.settings = { - general = { - lock_cmd = "pidof hyprlock || hyprlock"; - before_sleep_cmd = "loginctl lock-session"; - ignore_dbus_inhibit = false; - after_sleep_cmd = "hyprctl_dispatch dpms on"; + services.hypridle = { + enable = true; + systemdTarget = "hyprland-session.target"; + settings = { + general = { + lock_cmd = "pidof hyprlock || hyprlock"; + before_sleep_cmd = "loginctl lock-session"; + ignore_dbus_inhibit = false; + after_sleep_cmd = "hyprctl_dispatch dpms on"; + }; + listener = [ + { + timeout = 120; + on-timeout = "hyprlock"; + } + { + timeout = 300; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + ]; }; - listener = [ - { - timeout = 120; - on-timeout = "hyprlock"; - } - { - timeout = 300; - on-timeout = "hyprctl dispatch dpms off"; - on-resume = "hyprctl dispatch dpms on"; - } - ]; }; }; } diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix index 5e13448..8149611 100644 --- a/hosts/apocalypse/default.nix +++ b/hosts/apocalypse/default.nix @@ -14,6 +14,7 @@ addons = { desktop.hyprland.enable = true; desktop.xfce.enable = true; + desktop.cosmic.enable = true; steam.enable = true; virtualisation.guest = false; diff --git a/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix index 74b1101..a644cd9 100644 --- a/hosts/apocalypse/hardware-configuration.nix +++ b/hosts/apocalypse/hardware-configuration.nix @@ -144,23 +144,24 @@ # Copied from nix wiki to save on battery life. services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; - - #Optional helps save long term battery health - START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge - STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging - - }; + enable = false; }; + # settings = { + # CPU_SCALING_GOVERNOR_ON_AC = "performance"; + # CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + # + # CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + # CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + # + # CPU_MIN_PERF_ON_AC = 0; + # CPU_MAX_PERF_ON_AC = 100; + # CPU_MIN_PERF_ON_BAT = 0; + # CPU_MAX_PERF_ON_BAT = 20; + # + # #Optional helps save long term battery health + # START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge + # STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging + # + # }; + # }; } diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix new file mode 100644 index 0000000..93006b2 --- /dev/null +++ b/modules/desktop/akonadi.nix @@ -0,0 +1,8 @@ +{pkgs, config, ...}: { + programs.kde-pim = { + enable = true; + kmail = false; + merkuro = false; + kontact = false; + }; +} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 2cfe5bf..de32b42 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -22,6 +22,7 @@ in ./wayland.nix ./wms ./steam.nix + ./akonadi.nix ]; options.addons.desktop = with types; { wmMeta = mkOption { diff --git a/modules/desktop/wms/cosmic.nix b/modules/desktop/wms/cosmic.nix new file mode 100644 index 0000000..6f7c29e --- /dev/null +++ b/modules/desktop/wms/cosmic.nix @@ -0,0 +1,18 @@ +{pkgs, config, lib, ... }: let + cfg = config.addons.desktop.cosmic; +in { + options.addons.desktop.cosmic = { + enable = lib.mkEnableOption "Enable Cosmic WM"; + enableScheduler = lib.mkEnableOption "Enable the special scheduler from system76"; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + (import ../../../utils/makeWm.nix "Cosmic WM" "wayland") + { + services.desktopManager.cosmic.enable = true; + services.system76-scheduler.enable = cfg.enableScheduler; + } + ] + ); +} diff --git a/modules/desktop/wms/default.nix b/modules/desktop/wms/default.nix index 9f7a18d..ea6b61e 100644 --- a/modules/desktop/wms/default.nix +++ b/modules/desktop/wms/default.nix @@ -3,5 +3,6 @@ imports = [ ./hyprland.nix ./xfce.nix + ./cosmic.nix ]; } -- cgit v1.3.1 From a36426ffd6314bd367f042410d81ae9807df2eee Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Sat, 17 Jan 2026 20:13:22 +0100 Subject: Rewrite systemd service for mako so it only runs on hyprland --- home-modules/desktop/hyprland.nix | 1 + home-modules/desktop/wayland/mako.nix | 48 +++++++++++++++++++++++++++++------ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index 80773d4..442910e 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -22,6 +22,7 @@ with lib; homeprogs.waybar.enable = true; homeprogs.mako.enable = true; + homeprogs.mako.systemdWantedBy = [ "hyprland-session.target" ]; # Environment variables for hyprland. # This can be used to configure wayland/hyprland-specific things home.file.".config/uwsm/env-hyprland".text = '' diff --git a/home-modules/desktop/wayland/mako.nix b/home-modules/desktop/wayland/mako.nix index ddf0a91..9b13e77 100644 --- a/home-modules/desktop/wayland/mako.nix +++ b/home-modules/desktop/wayland/mako.nix @@ -1,16 +1,48 @@ { + pkgs, config, lib, ... }: +let + cfg = config.homeprogs.mako; +in { - options.homeprogs.mako.enable = lib.mkEnableOption "Enable Mako notification manager"; - config = lib.mkIf config.homeprogs.mako.enable { - services.mako = { - enable = true; + options.homeprogs.mako = { + enable = lib.mkEnableOption "Enable Mako notification manager"; + systemdWantedBy = lib.mkOption { + description = "SystemD targets where mako should start for."; + default = [ "graphical-session.target"]; + example = [ "hyprland-session.target" ]; + type = lib.types.listOf lib.types.str; + }; + package = lib.mkOption { + description = "mako package to use"; + default = pkgs.mako; + example = pkgs.mako; + type = lib.types.package; }; - xdg.configFile."mako/config".source = ./mako.ini; - - }; - + }; + config = lib.mkIf config.homeprogs.mako.enable ({ + home.packages = [ pkgs.mako ]; + xdg.configFile."mako/config" = { + onChange = "${pkgs.mako}/bin/makoctl reload || true"; + source = ./mako.ini; + }; + systemd.user.services.mako = { + Install.WantedBy = config.homeprogs.mako.systemdWantedBy; + Unit = { + Description = "Lightweight Wayland notification daemon"; + Documentation="man:mako(1)"; + After= "graphical-session.target"; + } ; + Service = { + Type = "dbus"; + BusName = "org.freedesktop.Notifications"; + ExecCondition="/bin/sh -c '[ -n \"$WAYLAND_DISPLAY\" ]'"; + ExecStart="${cfg.package}/bin/mako"; + ExecReload="${cfg.package}/bin/makoctl reload"; + }; + }; + }); } -- cgit v1.3.1 From 790f82e530c7c34b8685ee6a52ddbecf70639c6f Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Wed, 28 Jan 2026 12:29:40 +0100 Subject: Format and format --- flake.lock | 30 ++++++++++---------- home-modules/apps/desktop/default.nix | 19 +++++++------ home-modules/desktop/hyprland.nix | 25 +++++++++-------- home-modules/desktop/wayland/mako.nix | 43 +++++++++++++++-------------- hosts/apocalypse/default.nix | 2 +- hosts/apocalypse/firewall.nix | 2 +- hosts/apocalypse/hardware-configuration.nix | 2 +- modules/default.nix | 4 +-- modules/desktop/akonadi.nix | 13 +++++---- modules/desktop/wayland.nix | 1 - modules/desktop/wms/cosmic.nix | 18 ++++++------ overlays/stable_overrides.nix | 4 +-- users/user-common.nix | 2 +- 13 files changed, 87 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index a155bf4..8c8a7e6 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1767702900, - "narHash": "sha256-xMzHmNytl7JgFRov2jHf2GYsLVp/sAfYO0JvbZt0uDo=", + "lastModified": 1769289524, + "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", "owner": "nix-community", "repo": "home-manager", - "rev": "38e187fd2f9efac197e03be0c25f3ee215974144", + "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", "type": "github" }, "original": { @@ -55,11 +55,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767640445, - "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", "type": "github" }, "original": { @@ -71,11 +71,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1767499857, - "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", + "lastModified": 1769314333, + "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", + "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1767468822, - "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=", + "lastModified": 1769353635, + "narHash": "sha256-J0G1ACrUK29M0THPAsz429eZX07GmR9Bs/b0pB3N0dQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", + "rev": "f46bb205f239b415309f58166f8df6919fa88377", "type": "github" }, "original": { diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix index a732ded..5472dad 100644 --- a/home-modules/apps/desktop/default.nix +++ b/home-modules/apps/desktop/default.nix @@ -67,14 +67,17 @@ in ]; }) (lib.mkIf cfg.note-taking.enable { - home.packages = with pkgs; [ - obsidian - kdePackages.kdepim-runtime - ] ++ (with pkgs.kdePackages; [ - zanshin - kdepim-runtime - akonadi-calendar - ]); + home.packages = + with pkgs; + [ + obsidian + kdePackages.kdepim-runtime + ] + ++ (with pkgs.kdePackages; [ + zanshin + kdepim-runtime + akonadi-calendar + ]); # Todo force synthing to be on here }) (lib.mkIf cfg.art.enable { diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index 442910e..3a5864a 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -22,7 +22,7 @@ with lib; homeprogs.waybar.enable = true; homeprogs.mako.enable = true; - homeprogs.mako.systemdWantedBy = [ "hyprland-session.target" ]; + homeprogs.mako.systemdWantedBy = [ "hyprland-session.target" ]; # Environment variables for hyprland. # This can be used to configure wayland/hyprland-specific things home.file.".config/uwsm/env-hyprland".text = '' @@ -254,7 +254,7 @@ with lib; }; systemd.user.services.hyprpaper = { - Install.WantedBy = [ "hyprland-session.target"]; + Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; }; services.hyprpaper = { enable = true; @@ -305,33 +305,36 @@ with lib; }; services.hyprsunset = { enable = true; - systemdTarget = "hyprland-session.target"; + systemdTarget = "hyprland-session.target"; settings = { max-gamma = 140; profile = [ - { # Morning + { + # Morning time = "07:00"; - identity = true; + identity = true; # temperature = 6500; gamme = 1; } - { # Evening + { + # Evening time = "19:00"; - temperature = 4000; + temperature = 4000; gamma = 0.6; } - { # Night + { + # Night time = "22:00"; - temperature = 3000; + temperature = 3000; gamma = 0.4; } ]; }; }; - services.hypridle = { + services.hypridle = { enable = true; - systemdTarget = "hyprland-session.target"; + systemdTarget = "hyprland-session.target"; settings = { general = { lock_cmd = "pidof hyprlock || hyprlock"; diff --git a/home-modules/desktop/wayland/mako.nix b/home-modules/desktop/wayland/mako.nix index 9b13e77..99987db 100644 --- a/home-modules/desktop/wayland/mako.nix +++ b/home-modules/desktop/wayland/mako.nix @@ -1,47 +1,48 @@ { - pkgs, + pkgs, config, lib, ... }: let - cfg = config.homeprogs.mako; -in + cfg = config.homeprogs.mako; +in { - options.homeprogs.mako = { + options.homeprogs.mako = { enable = lib.mkEnableOption "Enable Mako notification manager"; systemdWantedBy = lib.mkOption { description = "SystemD targets where mako should start for."; - default = [ "graphical-session.target"]; - example = [ "hyprland-session.target" ]; - type = lib.types.listOf lib.types.str; - }; + # TODO: Put a null here, so that we can add a non-persistent default + default = [ ]; + example = [ "hyprland-session.target" ]; + type = lib.types.listOf lib.types.str; + }; package = lib.mkOption { description = "mako package to use"; - default = pkgs.mako; - example = pkgs.mako; - type = lib.types.package; + default = pkgs.mako; + example = pkgs.mako; + type = lib.types.package; }; - }; + }; config = lib.mkIf config.homeprogs.mako.enable ({ - home.packages = [ pkgs.mako ]; - xdg.configFile."mako/config" = { + home.packages = [ pkgs.mako ]; + xdg.configFile."mako/config" = { onChange = "${pkgs.mako}/bin/makoctl reload || true"; source = ./mako.ini; }; - systemd.user.services.mako = { + systemd.user.services.mako = { Install.WantedBy = config.homeprogs.mako.systemdWantedBy; Unit = { Description = "Lightweight Wayland notification daemon"; - Documentation="man:mako(1)"; - After= "graphical-session.target"; - } ; + Documentation = "man:mako(1)"; + After = "graphical-session.target"; + }; Service = { Type = "dbus"; BusName = "org.freedesktop.Notifications"; - ExecCondition="/bin/sh -c '[ -n \"$WAYLAND_DISPLAY\" ]'"; - ExecStart="${cfg.package}/bin/mako"; - ExecReload="${cfg.package}/bin/makoctl reload"; + ExecCondition = "/bin/sh -c '[ -n \"$WAYLAND_DISPLAY\" ]'"; + ExecStart = "${cfg.package}/bin/mako"; + ExecReload = "${cfg.package}/bin/makoctl reload"; }; }; }); diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix index 8149611..b2eddc4 100644 --- a/hosts/apocalypse/default.nix +++ b/hosts/apocalypse/default.nix @@ -14,7 +14,7 @@ addons = { desktop.hyprland.enable = true; desktop.xfce.enable = true; - desktop.cosmic.enable = true; + desktop.cosmic.enable = true; steam.enable = true; virtualisation.guest = false; diff --git a/hosts/apocalypse/firewall.nix b/hosts/apocalypse/firewall.nix index 05feacf..df99c8d 100644 --- a/hosts/apocalypse/firewall.nix +++ b/hosts/apocalypse/firewall.nix @@ -44,7 +44,7 @@ in { networking.nftables.enable = true; networking.firewall = { - enable = true; + enable = false; checkReversePath = false; allowedTCPPorts = baseTCP; allowedUDPPorts = baseUDP; diff --git a/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix index a644cd9..d007508 100644 --- a/hosts/apocalypse/hardware-configuration.nix +++ b/hosts/apocalypse/hardware-configuration.nix @@ -144,7 +144,7 @@ # Copied from nix wiki to save on battery life. services.tlp = { - enable = false; + enable = false; }; # settings = { # CPU_SCALING_GOVERNOR_ON_AC = "performance"; diff --git a/modules/default.nix b/modules/default.nix index 774b40d..9ded08a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -60,9 +60,9 @@ # options = "--delete-older-than 30d"; # }; zramSwap = { - enable = true; + enable = true; algorithm = "lz4"; - memoryPercent = 50; + memoryPercent = 50; }; systemd.services.nix-daemon.serviceConfig = { MemoryAccounting = true; diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix index 93006b2..d97f859 100644 --- a/modules/desktop/akonadi.nix +++ b/modules/desktop/akonadi.nix @@ -1,8 +1,9 @@ -{pkgs, config, ...}: { +{ ... }: +{ programs.kde-pim = { - enable = true; - kmail = false; - merkuro = false; - kontact = false; - }; + enable = true; + kmail = false; + merkuro = false; + kontact = false; + }; } diff --git a/modules/desktop/wayland.nix b/modules/desktop/wayland.nix index 457a7f0..0a6a0e5 100644 --- a/modules/desktop/wayland.nix +++ b/modules/desktop/wayland.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/desktop/wms/cosmic.nix b/modules/desktop/wms/cosmic.nix index 6f7c29e..d2929f1 100644 --- a/modules/desktop/wms/cosmic.nix +++ b/modules/desktop/wms/cosmic.nix @@ -1,18 +1,20 @@ -{pkgs, config, lib, ... }: let - cfg = config.addons.desktop.cosmic; -in { +{ config, lib, ... }: +let + cfg = config.addons.desktop.cosmic; +in +{ options.addons.desktop.cosmic = { - enable = lib.mkEnableOption "Enable Cosmic WM"; + enable = lib.mkEnableOption "Enable Cosmic WM"; enableScheduler = lib.mkEnableOption "Enable the special scheduler from system76"; - }; + }; config = lib.mkIf cfg.enable ( lib.mkMerge [ (import ../../../utils/makeWm.nix "Cosmic WM" "wayland") { - services.desktopManager.cosmic.enable = true; - services.system76-scheduler.enable = cfg.enableScheduler; + services.desktopManager.cosmic.enable = true; + services.system76-scheduler.enable = cfg.enableScheduler; } ] - ); + ); } diff --git a/overlays/stable_overrides.nix b/overlays/stable_overrides.nix index f32cae2..ed1f6fe 100644 --- a/overlays/stable_overrides.nix +++ b/overlays/stable_overrides.nix @@ -1,4 +1,4 @@ -{ nixpkgs-stable, ... }: -(_final: prev: { +{ ... }: +(_final: _prev: { }) diff --git a/users/user-common.nix b/users/user-common.nix index b9f246f..b021a12 100644 --- a/users/user-common.nix +++ b/users/user-common.nix @@ -7,7 +7,7 @@ # Pass host config to HM (Common config) # TODO: Move this somewhere else. home-manager = { - useUserPackages = true; + #useUserPackages = true; useGlobalPkgs = true; backupFileExtension = "bak"; -- cgit v1.3.1 From e0cebbe2129e66047ca9ba233d3b7c59af473c24 Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Fri, 30 Jan 2026 12:43:18 +0100 Subject: Make hosts editable on apoc and fix hyprpaper --- home-modules/desktop/hyprland.nix | 18 ++++++++++++++++-- hosts/apocalypse/firewall.nix | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index 3a5864a..f1ff86d 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -256,6 +256,14 @@ with lib; systemd.user.services.hyprpaper = { Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; }; + + # TODO: Put the default wallpaper somewhere else. + home.file.defaultWallpaper = { + source = ./wallpaper.png; + target = "Pictures/Wallpapers/wallpaper.png"; + enable = true; + }; + services.hyprpaper = { enable = true; settings = { @@ -263,8 +271,14 @@ with lib; splash = false; splash_offset = 2; - preload = [ "${./wallpaper.png}" ]; - wallpaper = [ ",${./wallpaper.png}," ]; + # preload = [ "${./wallpaper.png}" ]; + wallpaper = [ + { + monitor = ""; + path = "${config.home.homeDirectory}/${config.home.file.defaultWallpaper.target}"; + fit_mode = "cover"; + } + ]; }; }; diff --git a/hosts/apocalypse/firewall.nix b/hosts/apocalypse/firewall.nix index df99c8d..f6220c5 100644 --- a/hosts/apocalypse/firewall.nix +++ b/hosts/apocalypse/firewall.nix @@ -42,6 +42,7 @@ let ]; in { + environment.etc.hosts.mode = "0700"; networking.nftables.enable = true; networking.firewall = { enable = false; -- cgit v1.3.1 From 41df7d18185c689811e9758ddab4673a30dee405 Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Wed, 11 Feb 2026 14:58:56 +0100 Subject: Migrate to stalwart for vdirsyncer and add motd. This adds rust-motd config and adds an executable that displays the motd. Additionally, it updates credentials for vdirsyncer. --- home-modules/services/vdirsyncer.nix | 6 +-- home-modules/theming.nix | 8 +++- modules/default.nix | 1 + modules/desktop/akonadi.nix | 6 +-- modules/motd.nix | 89 ++++++++++++++++++++++++++++++++++++ secrets/secrets.yaml | 8 ++-- 6 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 modules/motd.nix diff --git a/home-modules/services/vdirsyncer.nix b/home-modules/services/vdirsyncer.nix index df76bc8..8afe2c8 100644 --- a/home-modules/services/vdirsyncer.nix +++ b/home-modules/services/vdirsyncer.nix @@ -10,7 +10,7 @@ in options.homesv.vdirsyncer = { enable = lib.mkEnableOption "Enable syncing via vdirsyncer"; user = lib.mkOption { default = config.home.username; }; - server = lib.mkOption { default = "https://webdav.wilkuu.xyz/dav.php"; }; + server = lib.mkOption { default = "https://mail.wilkuu.xyz/dav/"; }; }; config = lib.mkIf cfg.enable { sops.secrets.webdav_uname = { @@ -45,7 +45,7 @@ in [storage contacts_remote] type = "carddav" - auth = "digest" + auth = "basic" url = "${cfg.server}" username = "${config.sops.placeholder.webdav_uname}" password = "${config.sops.placeholder.webdav_pass}" @@ -64,7 +64,7 @@ in [storage calendar_remote] type = "caldav" - auth = "digest" + auth = "basic" url = "${cfg.server}" username = "${config.sops.placeholder.webdav_uname}" password = "${config.sops.placeholder.webdav_pass}" diff --git a/home-modules/theming.nix b/home-modules/theming.nix index ee6b13b..94af4ac 100644 --- a/home-modules/theming.nix +++ b/home-modules/theming.nix @@ -36,8 +36,12 @@ in qt = { enable = true; - platformTheme.name = "qtct"; - style.name = "kvantum"; + kde.settings = { + + }; + style.package = pkgs.catppuccin-qt5ct; + + # style.name = "kvantum"; }; xdg.configFile."Kvantum/kvantum.kvconfig".source = diff --git a/modules/default.nix b/modules/default.nix index 9ded08a..f18f380 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -12,6 +12,7 @@ ./vpn.nix ./remote-builder.nix ./nh.nix + ./motd.nix ]; nixpkgs.overlays = [ diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix index d97f859..fb93913 100644 --- a/modules/desktop/akonadi.nix +++ b/modules/desktop/akonadi.nix @@ -2,8 +2,8 @@ { programs.kde-pim = { enable = true; - kmail = false; - merkuro = false; - kontact = false; + kmail = true; + merkuro = true; + kontact = true; }; } diff --git a/modules/motd.nix b/modules/motd.nix new file mode 100644 index 0000000..7f7e229 --- /dev/null +++ b/modules/motd.nix @@ -0,0 +1,89 @@ +{pkgs, config, lib, ...}: + let + banner_script = pkgs.writeShellScript "motd_banner.sh" '' + echo "This is a nice banner, property of wilkuu (wilkuu.xyz)" + echo -e "\n\tTODO: Put a banner here\t\n" + echo "Current hostname: ${config.networking.hostName}" + ''; + + # Code stolen from the nix store so I can finish motd_shell + motdConf = + pkgs.runCommand "motd.toml" + { + __structuredAttrs = true; + inherit (config.programs.rust-motd) order settings; + nativeBuildInputs = [ + pkgs.remarshal + pkgs.jq + ]; + } + '' + cat "$NIX_ATTRS_JSON_FILE" \ + | jq '.settings as $settings + | .order + | map({ key: ., value: $settings."\(.)" }) + | from_entries' -r \ + | json2toml /dev/stdin "$out" + ''; + + motd_shell = pkgs.writeShellScriptBin "motd_shell" '' + if [[ -n "$SHOW_MOTD" && -x /run/current-system/sw/bin/rust-motd ]]; then + unset SHOW_MOTD + ${pkgs.rust-motd}/bin/rust-motd ${motdConf} + fi + $1 + ''; + in { + environment.systemPackages = with pkgs; [ + rust-motd motd_shell + ]; + programs.rust-motd = { + enable = true; + order = [ + "banner" + "uptime" + "load_avg" + "filesystems" + "memory" + "last_run" + "global" + ]; + settings = { + banner = { + color = "light_magenta"; + # TODO: Make this nice + command = "bash ${banner_script}"; + }; + uptime = { + prefix = "Uptime: "; + }; + load_avg = { + format = '' + Load: [1m] [5m] [15m] + {one:.02} , {five:.02} , {fifteen:.02} +''; + }; + filesystems = { + root = "/"; + store = "/store2"; + ntfs = "/win_games"; + }; + memory = { + swap_pos = "beside"; + }; + last_run = {}; + }; + }; + security.pam.services.kitty = { + showMotd = true; + }; + security.pam.services.kitty-wrapper = { + showMotd = true; + }; + security.pam.services.login = { + showMotd = true; + }; + + + +} diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 18e36d7..fea77a5 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,7 +1,7 @@ wilkuu: webdav: - username: ENC[AES256_GCM,data:NVdz+9U/EvOiHTLL8J9N4A==,iv:jEZCiHUgCPxuwhgBCDwns+QoCKOXX3fjHlQpCDm2Js0=,tag:hPOrHNMQsQ6YKicmucGlag==,type:str] - password: ENC[AES256_GCM,data:jtf7GGioSTHEaOndQK3SG5tPCpuI4QbhquegcWdQSMIl2lpt6z+lMZnFzA8x0jh3TridOn/J,iv:ZvFDEMY6V4W/ict0V7sLLt/c2oxM5UDCPpgpmkQIT7Q=,tag:AhmZxKGUiCufYVDXp+Mcxw==,type:str] + username: ENC[AES256_GCM,data:ejn6BeA=,iv:9tnfRsz+4hyQ3HnlqSjuTz3kXVqhxfLbxtfPTKR3s88=,tag:5s+QcyA+AumpqQxL4pdCOA==,type:str] + password: ENC[AES256_GCM,data:1LYRXqp0i86+ycCwNYUOSmb9uh84epVkv6tkUkwBnijvQv4ydsU=,iv:9fRm/s/UlrI6RpPfR9vwIsqJ2U+nF8qyWx4RgyrK6po=,tag:8FdWgIU4PztJTWXqjaMnnA==,type:str] remote: ssh: pub: ENC[AES256_GCM,data:U085pFFBMqd38eRXZKAYo8pjSiK9KUB1a/oXFEn5TKldH5vx3IBT+/c7VxG8O/W08sZlnHZxnjOKco3Klnmzpi+R+pAzTC7qe8hjk69JGbBKRKV0jp8gmNKM2o3cme8dsGuq,iv:gq271TCYh8akbMJTACOrwLuBVb6vUWkMQwQP088XBDI=,tag:9Vya17dym0VJxKRLRuBGAw==,type:str] @@ -26,7 +26,7 @@ sops: c1NBbDBUZVRQQ2p2aWp5dXB1eHAxcTQKcON/bYv2tyHr1q7jzgcWHlc8Ikp2/734 IttERY1sS+iwKVWkodqPPQ9s+/0te0BQ5jEc3vJf0Rcn0lDtfzzwsQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-11-05T20:11:43Z" - mac: ENC[AES256_GCM,data:Csq9wzz8XcuwL7z/Pra0iOcDurxC5DyAILBpKyZFRQ6o6HJuRQc/7Xk1PPSwrjzCJJjyJOYNtM0IzjxWoXn+8QE9dzytX+xMTiKXL+gzajeZuNn05ibMZi4/LmRBbW0eQAHB3YI2RZk7zj35aCNeKjETbUERHzgct1zFyuGfV/k=,iv:HvBVBEK/EokkDMgdru20JowiAnM4UHd21qJVhTIYQOw=,tag:MWy8lHOmpUywTFMJmLWP0A==,type:str] + lastmodified: "2026-02-05T17:54:41Z" + mac: ENC[AES256_GCM,data:LZh6P8DJoow3QWGXJj2qSC8hsKH/LEQ/YDezKCfWSp4FF13TltacsQt7hz6HVBcILEIIkTIcufQsbyWC/s9tiaAUrXNTkScy1P8AZOnum4SRC8fcODM8/XmkFnFiHWda2NnqpfRoP6/zCrMmc//7YH7vxQki3xe3nJj/TIG6kGs=,iv:T3j3ovFb7fhBLmORNh+R3QZvZZeUfFvd7oPplpDSxrY=,tag:LfGXx9rsMHF5eXqFFAh+vw==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 -- cgit v1.3.1 From 52e8a6819240c59c8a84b141f9a10a6c7dc7304d Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Wed, 11 Feb 2026 15:03:20 +0100 Subject: nix fmt --- home-modules/desktop/hyprland.nix | 16 ++++----- home-modules/theming.nix | 2 +- modules/desktop/akonadi.nix | 2 +- modules/motd.nix | 70 +++++++++++++++++++-------------------- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix index f1ff86d..164282e 100644 --- a/home-modules/desktop/hyprland.nix +++ b/home-modules/desktop/hyprland.nix @@ -257,12 +257,12 @@ with lib; Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; }; - # TODO: Put the default wallpaper somewhere else. + # TODO: Put the default wallpaper somewhere else. home.file.defaultWallpaper = { source = ./wallpaper.png; - target = "Pictures/Wallpapers/wallpaper.png"; - enable = true; - }; + target = "Pictures/Wallpapers/wallpaper.png"; + enable = true; + }; services.hyprpaper = { enable = true; @@ -272,12 +272,12 @@ with lib; splash_offset = 2; # preload = [ "${./wallpaper.png}" ]; - wallpaper = [ - { + wallpaper = [ + { monitor = ""; - path = "${config.home.homeDirectory}/${config.home.file.defaultWallpaper.target}"; + path = "${config.home.homeDirectory}/${config.home.file.defaultWallpaper.target}"; fit_mode = "cover"; - } + } ]; }; }; diff --git a/home-modules/theming.nix b/home-modules/theming.nix index 94af4ac..15b596b 100644 --- a/home-modules/theming.nix +++ b/home-modules/theming.nix @@ -38,7 +38,7 @@ in enable = true; kde.settings = { - }; + }; style.package = pkgs.catppuccin-qt5ct; # style.name = "kvantum"; diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix index fb93913..abdb5a2 100644 --- a/modules/desktop/akonadi.nix +++ b/modules/desktop/akonadi.nix @@ -2,7 +2,7 @@ { programs.kde-pim = { enable = true; - kmail = true; + kmail = true; merkuro = true; kontact = true; }; diff --git a/modules/motd.nix b/modules/motd.nix index 7f7e229..f9f572c 100644 --- a/modules/motd.nix +++ b/modules/motd.nix @@ -1,13 +1,13 @@ -{pkgs, config, lib, ...}: - let - banner_script = pkgs.writeShellScript "motd_banner.sh" '' - echo "This is a nice banner, property of wilkuu (wilkuu.xyz)" - echo -e "\n\tTODO: Put a banner here\t\n" - echo "Current hostname: ${config.networking.hostName}" - ''; - - # Code stolen from the nix store so I can finish motd_shell - motdConf = +{ pkgs, config, ... }: +let + banner_script = pkgs.writeShellScript "motd_banner.sh" '' + echo "This is a nice banner, property of wilkuu (wilkuu.xyz)" + echo -e "\n\tTODO: Put a banner here\t\n" + echo "Current hostname: ${config.networking.hostName}" + ''; + + # Code stolen from the nix store so I can finish motd_shell + motdConf = pkgs.runCommand "motd.toml" { __structuredAttrs = true; @@ -25,20 +25,22 @@ | from_entries' -r \ | json2toml /dev/stdin "$out" ''; - - motd_shell = pkgs.writeShellScriptBin "motd_shell" '' - if [[ -n "$SHOW_MOTD" && -x /run/current-system/sw/bin/rust-motd ]]; then - unset SHOW_MOTD - ${pkgs.rust-motd}/bin/rust-motd ${motdConf} - fi - $1 - ''; - in { + + motd_shell = pkgs.writeShellScriptBin "motd_shell" '' + if [[ -n "$SHOW_MOTD" && -x /run/current-system/sw/bin/rust-motd ]]; then + unset SHOW_MOTD + ${pkgs.rust-motd}/bin/rust-motd ${motdConf} + fi + $1 + ''; +in +{ environment.systemPackages = with pkgs; [ - rust-motd motd_shell + rust-motd + motd_shell ]; programs.rust-motd = { - enable = true; + enable = true; order = [ "banner" "uptime" @@ -47,31 +49,31 @@ "memory" "last_run" "global" - ]; + ]; settings = { banner = { - color = "light_magenta"; + color = "light_magenta"; # TODO: Make this nice command = "bash ${banner_script}"; }; uptime = { prefix = "Uptime: "; - }; + }; load_avg = { format = '' - Load: [1m] [5m] [15m] - {one:.02} , {five:.02} , {fifteen:.02} -''; + Load: [1m] [5m] [15m] + {one:.02} , {five:.02} , {fifteen:.02} + ''; }; filesystems = { - root = "/"; + root = "/"; store = "/store2"; - ntfs = "/win_games"; - }; + ntfs = "/win_games"; + }; memory = { - swap_pos = "beside"; - }; - last_run = {}; + swap_pos = "beside"; + }; + last_run = { }; }; }; security.pam.services.kitty = { @@ -84,6 +86,4 @@ showMotd = true; }; - - } -- cgit v1.3.1 From 2f65e7f40e97f6ccb3d164169698033ce1692a76 Mon Sep 17 00:00:00 2001 From: Jakub Stachurski Date: Wed, 11 Feb 2026 15:22:53 +0100 Subject: Spring cleaning --- flake.nix | 35 +------------------------------- home-modules/apps/default.nix | 2 +- home-modules/apps/nvim/default.nix | 2 +- home-modules/desktop/wayland/default.nix | 10 +++++++-- hosts/apocalypse/default.nix | 12 ++++++----- 5 files changed, 18 insertions(+), 43 deletions(-) diff --git a/flake.nix b/flake.nix index f4e1cd8..8a90cec 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ # for `nix flake check` checks = ( forAllSystems (pkgs: { - formatting = treefmtEval.${pkgs.system}.config.build.check self; + formatting = treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.check self; }) ); @@ -89,39 +89,6 @@ inputs.sops-nix.nixosModules.sops ]; }; - vm-desktop = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs; - }; - system = "x86_64-linux"; - modules = [ - ./modules - ./hosts/test_vm - ./users/live-user.nix - inputs.home-manager.nixosModules.default - inputs.sops-nix.nixosModules.sops - ]; - }; - vm-shell = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs; - }; - system = "x86_64-linux"; - modules = [ - ./modules - ./hosts/test_vm - ./users/live-user.nix - ( - { lib, ... }: - { - addons.desktop.hyprland.enable = lib.mkForce false; - addons.desktop.xfce.enable = lib.mkForce false; - } - ) - inputs.home-manager.nixosModules.default - inputs.sops-nix.nixosModules.sops - ]; - }; }; }; } diff --git a/home-modules/apps/default.nix b/home-modules/apps/default.nix index ece0543..31766ab 100644 --- a/home-modules/apps/default.nix +++ b/home-modules/apps/default.nix @@ -103,7 +103,7 @@ in }) (lib.mkIf cfg.work.enable { home.packages = with pkgs; [ - inputs.tatuin.packages.${pkgs.system}.default + inputs.tatuin.packages.${pkgs.stdenv.hostPlatform.system}.default todoman ]; }) diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix index c99a343..fc73d2d 100644 --- a/home-modules/apps/nvim/default.nix +++ b/home-modules/apps/nvim/default.nix @@ -52,7 +52,7 @@ in rustup nil statix - nixfmt-rfc-style + nixfmt # phpactor pyright nodePackages.intelephense diff --git a/home-modules/desktop/wayland/default.nix b/home-modules/desktop/wayland/default.nix index 87ab13b..97f5fef 100644 --- a/home-modules/desktop/wayland/default.nix +++ b/home-modules/desktop/wayland/default.nix @@ -1,11 +1,17 @@ -{ pkgs, ... }: +{ + pkgs, + lib, + hostconfig, + ... +}: { imports = [ ./waybar.nix ./mako.nix ]; - xdg.portal = { + xdg.portal = lib.mkIf hostconfig.addons.desktop.wayland.enable { enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix index b2eddc4..d22f2df 100644 --- a/hosts/apocalypse/default.nix +++ b/hosts/apocalypse/default.nix @@ -25,7 +25,7 @@ gpg.enable = true; remote_builder = { - enable = true; + enable = false; allowedKeyFiles = [ ../../secrets/eli.pub ]; openFirewall = true; }; @@ -76,10 +76,12 @@ services.resolved = { enable = true; - dnssec = "false"; - domains = [ "~." ]; - fallbackDns = [ ]; - dnsovertls = "opportunistic"; + settings.Resolve = { + DNSSEC = "false"; + Domains = [ "~." ]; + FallbackDns = [ "8.8.8.8" ]; + DNSOverTLS = "opportunistic"; + }; }; networking.useDHCP = lib.mkDefault true; -- cgit v1.3.1