diff options
| -rw-r--r-- | configurations/eonwe/default.nix | 11 | ||||
| -rw-r--r-- | flake.lock | 66 | ||||
| -rw-r--r-- | modules/common/locale.nix | 4 | ||||
| -rw-r--r-- | modules/git/default.nix | 12 | ||||
| -rw-r--r-- | modules/kde.nix | 19 | ||||
| -rw-r--r-- | modules/nmap.nix | 2 | ||||
| -rw-r--r-- | modules/profiles/default.nix | 1 | ||||
| -rw-r--r-- | modules/profiles/headful.nix | 6 |
8 files changed, 65 insertions, 56 deletions
diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix index c02a3c3..05e4145 100644 --- a/configurations/eonwe/default.nix +++ b/configurations/eonwe/default.nix @@ -29,6 +29,7 @@ with lib; hm = { home.packages = with pkgs; [ anki + calibre gimp iaito kdenlive @@ -37,7 +38,6 @@ with lib; qbittorrent qolibri radeontop - vesktop vial wacomtablet ]; @@ -48,7 +48,7 @@ with lib; mpv = { profiles = let - mapShaders = shaders: map (args: toString (pkgs.fetchurl args)) shaders; + mapShaders = map (args: toString (pkgs.fetchurl args)); cfl-prediction = mapShaders [ { url = "https://raw.githubusercontent.com/Artoriuz/glsl-chroma-from-luma-prediction/471c65dd3915d39e7ef69957ab63e006125fbb88/CfL_Prediction.glsl"; @@ -69,7 +69,7 @@ with lib; ]; in { - # TODO Profile conditionals on width are not working. + # TODO Fix profile conditionals. "qhd-downscale" = { dscale = "lanczos"; linear-downscaling = false; @@ -288,10 +288,7 @@ with lib; # [1]: https://github.com/ryantm/agenix/issues/45#issuecomment-847852593 # [1]: https://github.com/nix-community/impermanence/issues/22 # [1]: https://github.com/NixOS/nixpkgs/pull/86967#pullrequestreview-667929259 - "/home/${my.username}" = { - depends = [ config.ark.path ]; - neededForBoot = true; - }; + "/home/${my.username}".neededForBoot = true; }; zramSwap = { diff --git a/flake.lock b/flake.lock index 8c1b4ee..7f22c87 100644 --- a/flake.lock +++ b/flake.lock @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1717052710, + "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "homelab-svg-assets": { "flake": false, "locked": { - "lastModified": 1715873439, - "narHash": "sha256-hiW4kxpwuiln9ULYfydZbARZE4j2qzT/qAOPRBReyIY=", + "lastModified": 1717000166, + "narHash": "sha256-BuEuQp+L615DwtVi2KIdTT+fD325iGV414n9c3LpsPc=", "owner": "loganmarchione", "repo": "homelab-svg-assets", - "rev": "80b6b632a4cce01b3d91ad943e3e6391d2d60745", + "rev": "6c3d6c8b4742ded0d0643aef2c6f7008fdbeb5a7", "type": "github" }, "original": { @@ -515,11 +515,11 @@ ] }, "locked": { - "lastModified": 1716600043, - "narHash": "sha256-6qCzoi1hLw24Wbx4K9Qgw/rVV4YOQBFJpkiYM3deKv4=", + "lastModified": 1717032201, + "narHash": "sha256-OeqJ0OiZHm3QzyBVwwDTdbL5ZqDjK2EPGdWOVEtMgdM=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "d20a387ad4a5376dfce8f220707fb1d5fbd97ab2", + "rev": "bc231cadb29e2bc70bc7e4ffec770c13b04e6937", "type": "github" }, "original": { @@ -535,11 +535,11 @@ ] }, "locked": { - "lastModified": 1716170277, - "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", + "lastModified": 1716772633, + "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", + "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716987116, + "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716619601, - "narHash": "sha256-9dUxZf8MOqJH3vjbhrz7LH4qTcnRsPSBU1Q50T7q/X8=", + "lastModified": 1716941088, + "narHash": "sha256-GKSAGfLNocNTux33YT9GbEXwEewxepwFL+ViX1CrMCQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47e03a624662ce399e55c45a5f6da698fc72c797", + "rev": "6c25325ec30a566f5c0446ceee61ada081903872", "type": "github" }, "original": { @@ -608,11 +608,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1716660083, - "narHash": "sha256-QO7cdjtDhx72KEw6m0NOtuE5FS4asaRExZ65uFR/q8g=", + "lastModified": 1717054650, + "narHash": "sha256-S1HlBBZN2Uzzo63LXzNWz8gIEtKcybsKvijRCorLoD0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6de51d98ec2ae46730f11845e221aab9d2470a8a", + "rev": "0ef99565a9d9184730a6c2e34be12db638a1c335", "type": "github" }, "original": { @@ -624,11 +624,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716656097, - "narHash": "sha256-iobi+LJSawPbbwLEEOe2ENSCgVPHdR9sW32bTeU+Avk=", + "lastModified": 1717049688, + "narHash": "sha256-1DeGlBpDyHYtpJCSd+K76qeW0PeRls0yeJvrmWQd2RE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8219ecf351180fc02b0e72383beb37b5d731f9a9", + "rev": "19f0660e75e186b6d92c22aa9589ebc04f595f80", "type": "github" }, "original": { @@ -706,11 +706,11 @@ ] }, "locked": { - "lastModified": 1716425501, - "narHash": "sha256-BSLhmGYY1khyyBAjraR+N0Pa9Nha/et5yQQlEZxcfkU=", + "lastModified": 1717030164, + "narHash": "sha256-2ZElIGiXCXVvF62UpzummNxfAsjN+N2SCzocq3EvEDY=", "owner": "nix-community", "repo": "srvos", - "rev": "1122cd50a23647e09c3e7a679d37ec02113bc412", + "rev": "5c09f932ebb1c652ac88aff551b1c97ae8a6a4ff", "type": "github" }, "original": { @@ -740,11 +740,11 @@ ] }, "locked": { - "lastModified": 1716456264, - "narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=", + "lastModified": 1716895458, + "narHash": "sha256-W9Y/+K4L7JcF5xcXO4MVGQk/0DgzHrp/IjlHyLeYExY=", "owner": "danth", "repo": "stylix", - "rev": "290c8aef476ce98fff9cefc059284429d561a085", + "rev": "5234b3d467aa803ad8d3fe898ef5673246045984", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1716600075, - "narHash": "sha256-WeUfE0jslseCeGUcQPHQLL2aFArGst1RdA0WKfoOHJ4=", + "lastModified": 1717032429, + "narHash": "sha256-1+87CE8xOUsJChiq9aNQqWPKoWMuyurW+aXrGbMWH7I=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b2de3e372569c4af5bacc49e5920392e1808f98a", + "rev": "0309d806a5431a46fb7fd81e20d7133ac8b1de55", "type": "github" }, "original": { diff --git a/modules/common/locale.nix b/modules/common/locale.nix index 7e8eefb..870ce1b 100644 --- a/modules/common/locale.nix +++ b/modules/common/locale.nix @@ -9,6 +9,10 @@ with lib; hm.home.language = { collate = "C"; messages = "C"; + monetary = "ru_RU.UTF-8"; + numeric = "ru_RU.UTF-8"; + paper = "ru_RU.UTF-8"; + telephone = "ru_RU.UTF-8"; }; i18n = { diff --git a/modules/git/default.nix b/modules/git/default.nix index a65c31e..ad322ca 100644 --- a/modules/git/default.nix +++ b/modules/git/default.nix @@ -40,11 +40,13 @@ in path = "${config.dirs.config}/glab-cli/config.yml"; owner = my.username; }; - gh-hosts = { - file = "${inputs.self}/secrets/gh-hosts"; - path = "${config.dirs.config}/gh/hosts.yml"; - owner = my.username; - }; + # NOTE SSO requires relogin every day, so keeping persistent auth tokens + # doesn't work. + # gh-hosts = { + # file = "${inputs.self}/secrets/gh-hosts"; + # path = "${config.dirs.config}/gh/hosts.yml"; + # owner = my.username; + # }; hut = { file = "${inputs.self}/secrets/hut"; path = "${config.dirs.config}/hut/config"; diff --git a/modules/kde.nix b/modules/kde.nix index 4f44a5e..e017e11 100644 --- a/modules/kde.nix +++ b/modules/kde.nix @@ -52,16 +52,19 @@ in desktopManager.plasma6.enable = true; displayManager.sddm = { enable = true; - wayland.enable = true; # Kinda broken. + wayland.enable = true; }; }; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ - elisa - gwenview - kate - khelpcenter - print-manager - ]; + environment = { + plasma6.excludePackages = with pkgs.kdePackages; [ + elisa + gwenview + kate + khelpcenter + print-manager + ]; + systemPackages = with pkgs.kdePackages; [ plasma-disks ]; + }; }; } diff --git a/modules/nmap.nix b/modules/nmap.nix index 71b3d0b..c358e71 100644 --- a/modules/nmap.nix +++ b/modules/nmap.nix @@ -65,8 +65,6 @@ in }; timers.update-nmap-vulscan-lists = { - # TODO Figure out how to check for network-online.target for user - # timers. Timer = { OnCalendar = "daily"; Persistent = true; diff --git a/modules/profiles/default.nix b/modules/profiles/default.nix index 6967cb7..9e99938 100644 --- a/modules/profiles/default.nix +++ b/modules/profiles/default.nix @@ -56,6 +56,7 @@ in lsof pciutils psmisc + smartmontools sysstat tree util-linux diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix index 83b3e4a..e2925c8 100644 --- a/modules/profiles/headful.nix +++ b/modules/profiles/headful.nix @@ -51,7 +51,10 @@ in ''; packages = with pkgs; [ - calibre + (vesktop.override { + withSystemVencord = true; + withTTS = false; + }) element-desktop fd imv @@ -109,6 +112,7 @@ in }; services = { + fwupd.enable = true; libinput.enable = true; psd.enable = true; upower.enable = true; |