From 6dc7762d90ca0489e184e874ed4f5e62542e4a11 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Tue, 25 Mar 2025 22:51:08 +0200 Subject: [PATCH] another one Signed-off-by: unexplrd --- flake.lock | 79 ++------------------------- flake.nix | 2 +- hosts/dunamis/configuration.nix | 9 +-- hosts/dunamis/disko.nix | 2 +- hosts/sarien/configuration.nix | 3 + modules/home/desktop/niri/default.nix | 1 + modules/nixos/desktop/default.nix | 2 +- 7 files changed, 14 insertions(+), 84 deletions(-) diff --git a/flake.lock b/flake.lock index 6ee33cf..9c88cee 100644 --- a/flake.lock +++ b/flake.lock @@ -240,22 +240,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -990,26 +974,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1742395601, - "narHash": "sha256-WSoI4R/pY/8AY5ulSn03nry9KFGBGFRFcXjhBYYRYtI=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "7f8e9de5c8494d209bd618dad4ad81e98b19fabc", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1741851582, @@ -1026,22 +990,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1742288794, @@ -1059,22 +1007,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -1090,7 +1022,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1736320768, "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", @@ -1165,8 +1097,7 @@ "mysecrets": "mysecrets", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", - "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix", "stylix": "stylix", "way-edges": "way-edges" @@ -1191,7 +1122,7 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1741573199, @@ -1234,12 +1165,12 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", "systems": "systems_5", "tinted-foot": "tinted-foot", diff --git a/flake.nix b/flake.nix index 6b5aac2..82d390e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ # neve.url = "git+https://gitea.linerds.us/unexplrd/Neve"; nix-flatpak.url = "github:gmodena/nix-flatpak"; nix-index-database.url = "github:nix-community/nix-index-database"; - nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; + # nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable"; # nixvim.url = "github:nix-community/nixvim"; sops-nix.url = "github:mic92/sops-nix"; diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index 1dd865e..b1908f0 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -27,12 +27,7 @@ settings.experimental-features = ["nix-command" "flakes"]; daemonCPUSchedPolicy = "idle"; sshServe.enable = true; - sshServe.keys = let - s = inputs.mysecrets; - in [ - (builtins.readFile - "${s}/ssh/id_ed25519_sarien_user.pub") - ]; + sshServe.keys = map (f: builtins.readFile f) config.users.users.user.openssh.authorizedKeys.keyFiles; }; system.stateVersion = "25.05"; @@ -101,7 +96,7 @@ podman.enable = false; }; - wireless.bluetooth.enableBlueman = false; + wireless.bluetooth.enableBlueman = true; opentabletdriver.enable = false; qmk-vial.enable = true; diff --git a/hosts/dunamis/disko.nix b/hosts/dunamis/disko.nix index 5174bc3..b058942 100644 --- a/hosts/dunamis/disko.nix +++ b/hosts/dunamis/disko.nix @@ -65,7 +65,7 @@ "@nix" = { mountpoint = "/nix"; mountOptions = [ - "compress=zstd" + "compress-force=zstd" "noatime" ]; }; diff --git a/hosts/sarien/configuration.nix b/hosts/sarien/configuration.nix index aec4116..ed39838 100644 --- a/hosts/sarien/configuration.nix +++ b/hosts/sarien/configuration.nix @@ -50,6 +50,9 @@ networking = { networkmanager.enable = true; hostName = "vylxae"; + hosts = { + "192.168.1.42" = ["dunamis"]; + }; }; boot = { diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix index b2d6285..40cf1e3 100644 --- a/modules/home/desktop/niri/default.nix +++ b/modules/home/desktop/niri/default.nix @@ -528,6 +528,7 @@ in { screenshot-path "${xdgPics}/screenshots/screenshot-%Y-%m-%d-%H-%M-%S.png" animations { + off slowdown 0.7 } diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 4d669e7..fa014d2 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,7 +1,7 @@ { imports = [ ./niri.nix - ./cosmic.nix + # ./cosmic.nix ./gnome.nix ./plasma.nix ./hyprland.nix