diff --git a/flake.lock b/flake.lock index b20bfb9..0e04530 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1739298463, - "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", + "lastModified": 1741282631, + "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", + "rev": "81498562d0f53e613d30368bb5b076784fa86f80", "type": "github" }, "original": { @@ -108,11 +108,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1739959476, - "narHash": "sha256-wMGZp7fS7LekFLFB0WVjmin2o8TuRKuAYdDCPKSpNeg=", + "lastModified": 1741365449, + "narHash": "sha256-4bmMbrmc6p6QxmF0Frc6SoZUfaodWcxjqEgw5mGmTAQ=", "owner": "numtide", "repo": "blueprint", - "rev": "ee2f933b458137c9cf3e415daab4856521caefa0", + "rev": "09a2c2c7bb08e5baeb88319e042ccfe6acaa9664", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1740408177, - "narHash": "sha256-baFhGvCncDj3zJlDODJESVE83lV5+tGOrvgwQczzp84=", + "lastModified": 1741386040, + "narHash": "sha256-Ru0yl1HwurhHtEiD1fqqrNgDXcy26t0uF5fqLV7CH+k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "62e2d6c89e4310c7cb56ee5f6bbdc280072dd082", + "rev": "6150aecfc2fabaee54086a3124997c7df970ea00", "type": "github" }, "original": { @@ -146,6 +146,27 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736864502, + "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=", + "owner": "nix-community", + "repo": "disko", + "rev": "0141aabed359f063de7413f80d906e1d98c0c123", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "latest", + "repo": "disko", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -155,11 +176,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740292204, - "narHash": "sha256-ZbptkmqaenRhUKsodSEcVzBw+kXZ8DcZpTGutU1HEiI=", + "lastModified": 1741156584, + "narHash": "sha256-Xju6PhR09gR8cSS1s4FOHw4AhUUmrFDUs9Wj/9KFoGY=", "owner": "nix-community", "repo": "fenix", - "rev": "93d59130e3fc121f927c03e406142df8d544b901", + "rev": "1271797d7c0537b4e5bdd4061a2954b846f2c29c", "type": "github" }, "original": { @@ -290,7 +311,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -308,7 +329,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -326,7 +347,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -489,11 +510,11 @@ ] }, "locked": { - "lastModified": 1740318342, - "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", + "lastModified": 1741217763, + "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", + "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", "type": "github" }, "original": { @@ -509,11 +530,11 @@ ] }, "locked": { - "lastModified": 1740579671, - "narHash": "sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw=", + "lastModified": 1741416850, + "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "53c587d263f94aaf6a281745923c76bbec62bcf3", + "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c", "type": "github" }, "original": { @@ -619,11 +640,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741218628, - "narHash": "sha256-Z+jPT8nijCV1EzCZ5XkLr8x82WPCX/GKk8OKg8Kr+s4=", + "lastModified": 1741396322, + "narHash": "sha256-nD6EvpTNQ97C0Uk60JcyNUM4u4OFxIiwHPSExay+Y3E=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "243376078655f304b01e5097c59108745bbb9da9", + "rev": "b80b64cd6c913f8c8ac820a1e4ca615a62ff958f", "type": "github" }, "original": { @@ -741,11 +762,11 @@ ] }, "locked": { - "lastModified": 1739048914, - "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a7334904d591f38757c46fbe2ab68651877d9099", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -754,6 +775,36 @@ "type": "github" } }, + "hyprsunset": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1739712272, + "narHash": "sha256-hWsYFTWgpZvKipKt1LCsG1DA+QpX3A0ccaYuHqwIzmg=", + "owner": "hyprwm", + "repo": "hyprsunset", + "rev": "d1811e4b6b91e0de8aa29b8bde78ec1c44f3debb", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprsunset", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -766,11 +817,11 @@ ] }, "locked": { - "lastModified": 1739891528, - "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", + "lastModified": 1741123584, + "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", + "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", "type": "github" }, "original": { @@ -791,11 +842,36 @@ ] }, "locked": { - "lastModified": 1739049028, - "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "04146df74a8d5ec0b579657307be01f1e241125f", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprsunset", + "nixpkgs" + ], + "systems": [ + "hyprsunset", + "systems" + ] + }, + "locked": { + "lastModified": 1735493474, + "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "type": "github" }, "original": { @@ -841,11 +917,11 @@ ] }, "locked": { - "lastModified": 1740269380, - "narHash": "sha256-l+zB5a39MJp4Olc4YxP7GChFXmNZIhoXaiSS6QRXa9o=", + "lastModified": 1741338475, + "narHash": "sha256-+vAXiFRQ6ykBX7iFI20rV+xMyOVNtULbFWy6BHKPP+0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "11ba89d13831cb399194310304fffb025081c674", + "rev": "1821e6ae980ff6175d28065ad6d0c87560d2b8ea", "type": "github" }, "original": { @@ -974,11 +1050,11 @@ ] }, "locked": { - "lastModified": 1740281615, - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", + "lastModified": 1740886574, + "narHash": "sha256-jN6kJ41B6jUVDTebIWeebTvrKP6YiLd1/wMej4uq4Sk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", + "rev": "26a0f969549cf4d56f6e9046b9e0418b3f3b94a5", "type": "github" }, "original": { @@ -994,11 +1070,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1741007352, - "narHash": "sha256-WCTnr6woW0tWym72HKJxwAPNDig1krmNTNjPmvr1Hmo=", + "lastModified": 1741432127, + "narHash": "sha256-JrN9MWJLVVEjVYINDX0NHI2U91/7qSywm6m6mGKwB0E=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "dba95629ddebe2e598a6112a34c3fb7f77d61f2b", + "rev": "bf3d41b9fc89883823ce9fadbec1b44f2cdd1fac", "type": "github" }, "original": { @@ -1009,11 +1085,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -1025,11 +1101,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740865531, - "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ef6c425980847c78a80d759abc476e941a9bf42", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { @@ -1041,11 +1117,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -1094,11 +1170,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740520037, - "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "type": "github" }, "original": { @@ -1163,11 +1239,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -1180,8 +1256,10 @@ "inputs": { "blueprint": "blueprint", "chaotic": "chaotic", + "disko": "disko", "home-manager": "home-manager_2", "hyprland": "hyprland", + "hyprsunset": "hyprsunset", "lix": "lix", "mysecrets": "mysecrets", "neve": "neve", @@ -1198,11 +1276,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740259966, - "narHash": "sha256-FJU9qiELvmJzNRr7wLFtJUy4bSk1PNqsRB7wOQz6zUE=", + "lastModified": 1741011961, + "narHash": "sha256-bssSxw3Z9CUNB9+f3EHAX/2urT15e12Jy6YU8tHyWkk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9df88ff0f65f8de9f73684d2bb96e1b62669d083", + "rev": "02862f5d52c30b476a5dca909a17aa4386d1fdc5", "type": "github" }, "original": { @@ -1219,11 +1297,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -1246,7 +1324,7 @@ "home-manager": "home-manager_3", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1254,11 +1332,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740520441, - "narHash": "sha256-CWK3L7i7YqubbcrdS/5D/+Vo+IuClrNR+5B+ByhBlEo=", + "lastModified": 1741392477, + "narHash": "sha256-6ySHuduGhlZBv1uxEOlOeHWDEkKuLQ/O63DI+ZRfAmg=", "owner": "danth", "repo": "stylix", - "rev": "a98c363a58accad047a2580382d90433619a08e0", + "rev": "6eea250b10386be0fc23496d1039d76b3147680e", "type": "github" }, "original": { @@ -1299,16 +1377,16 @@ }, "systems_3": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1358,6 +1436,21 @@ } }, "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1481,14 +1574,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7" + "systems": "systems_8" }, "locked": { - "lastModified": 1740555016, - "narHash": "sha256-GtgPchR4uzYenq6W+uZWxnpP+fLQk1p0q6UTr1ql3yk=", + "lastModified": 1740745001, + "narHash": "sha256-XZEIwnwOYgb1wECvT83HB314bd/JBYwSaTaj2EeqWrc=", "owner": "abenz1267", "repo": "walker", - "rev": "971a8de7f139552d0bf1e40c0d9852ea5dd211ee", + "rev": "350d5e078b997b5ca07eda39e207048ee26bbb9d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8abdf62..bdb4719 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ stylix.url = "github:danth/stylix"; nixvim.url = "github:nix-community/nixvim"; nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; + disko = { + url = "github:nix-community/disko/latest"; + inputs.nixpkgs.follows = "nixpkgs"; + }; lix = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; @@ -23,8 +27,16 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; + hyprland = { + url = "github:hyprwm/Hyprland"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprsunset = { + url = "github:hyprwm/hyprsunset"; # vaxry make a damn release + inputs.nixpkgs.follows = "nixpkgs"; + inputs.hyprutils.follows = "hyprland/hyprutils"; + inputs.hyprland-protocols.follows = "hyprland/hyprland-protocols"; + }; neve = { url = "git+https://gitea.linerds.us/unexplrd/Neve"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/dunamis/builder.nix b/hosts/dunamis/builder.nix deleted file mode 100644 index f7f2742..0000000 --- a/hosts/dunamis/builder.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - nix.settings = { - secret-key-files = /var/nix/cache-priv-key.pem; - }; -} diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index bc36492..3c4cd42 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -8,9 +8,10 @@ lix.nixosModules.default self.nixosModules.desktop self.nixosModules.system - ./hardware-conf.nix + ./hardware.nix ./programs.nix ./stylix.nix + ./disko.nix ./users.nix ./sops.nix ]; @@ -21,8 +22,9 @@ }; nix = { - # package = pkgs.lix; + channel.enable = false; settings.experimental-features = ["nix-command" "flakes"]; + daemonCPUSchedPolicy = "idle"; }; system.stateVersion = "25.05"; @@ -65,6 +67,15 @@ fstrim.enable = true; fwupd.enable = true; openssh.enable = true; + opensnitch = { + enable = false; + settings = { + DefaultAaction = "deny"; + Firewall = "iptables"; + InterceptUnknown = true; + ProcMonitorMethod = "ebpf"; + }; + }; }; services.scx = { enable = true; diff --git a/hosts/dunamis/disko.nix b/hosts/dunamis/disko.nix new file mode 100644 index 0000000..a040a92 --- /dev/null +++ b/hosts/dunamis/disko.nix @@ -0,0 +1,73 @@ +{inputs, ...}: { + imports = with inputs; [ + disko.nixosModules.disko + ]; + disko.devices.disk.main = { + type = "disk"; + device = "/dev/nvme0n1"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "2G"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "umask=0077" + "fmask=0022" + "dmask=0022" + "noexec" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "luks-fe586da4-b164-4362-bcdf-9c5dd6c69a2b"; + initrdUnlock = true; + settings.allowDiscards = true; + content = { + type = "btrfs"; + extraArgs = ["-f"]; + subvolumes = { + "@nixos-root" = { + mountpoint = "/"; + mountOptions = [ + "compress=zstd" + "noatime" + "noexec" + ]; + }; + "@home" = { + mountpoint = "/home"; + mountOptions = [ + "compress=zstd" + "noatime" + ]; + }; + "@storage" = { + mountpoint = "/storage"; + mountOptions = [ + "compress=zstd" + "noatime" + ]; + }; + "@nix" = { + mountpoint = "/nix"; + mountOptions = [ + "compress=zstd" + "noatime" + ]; + }; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/hosts/dunamis/hardware-conf.nix b/hosts/dunamis/hardware-conf.nix deleted file mode 100644 index 85e0953..0000000 --- a/hosts/dunamis/hardware-conf.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - wireless.bluetooth.enable = true; - - services.logind = { - lidSwitch = "ignore"; - powerKey = "suspend"; - }; - - boot = { - kernelModules = ["kvm-amd"]; - extraModulePackages = []; - initrd = { - luks.devices."luks-fe586da4-b164-4362-bcdf-9c5dd6c69a2b".device = "/dev/disk/by-uuid/fe586da4-b164-4362-bcdf-9c5dd6c69a2b"; - availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - kernelModules = [ - "i915" - ]; - systemd.enable = true; - }; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/79ce18b8-3a9e-4cd0-be62-60972686f44a"; - fsType = "btrfs"; - options = [ - "noatime" - "compress=zstd" - "subvol=@nixos-root" - ]; - }; - "/home" = { - device = "/dev/disk/by-uuid/79ce18b8-3a9e-4cd0-be62-60972686f44a"; - fsType = "btrfs"; - options = [ - "noatime" - "compress=zstd" - "subvol=@home" - ]; - }; - "/storage" = { - device = "/dev/disk/by-uuid/79ce18b8-3a9e-4cd0-be62-60972686f44a"; - fsType = "btrfs"; - options = [ - "noatime" - "compress=zstd" - "subvol=@storage" - ]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/976C-7EE6"; - fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; - }; - }; - - swapDevices = []; - - hardware.graphics = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vpl-gpu-rt - ]; - }; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/dunamis/hardware.nix b/hosts/dunamis/hardware.nix new file mode 100644 index 0000000..d58980d --- /dev/null +++ b/hosts/dunamis/hardware.nix @@ -0,0 +1,42 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + wireless.bluetooth.enable = true; + + services.logind = { + lidSwitch = "ignore"; + powerKey = "suspend"; + }; + + boot = { + kernelModules = ["kvm-amd"]; + extraModulePackages = []; + initrd = { + systemd.enable = true; # needed for auto-unlocking with TPM + availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; + kernelModules = [ + "i915" + ]; + }; + }; + + hardware.graphics = { + enable = true; + extraPackages = with pkgs; [ + intel-media-driver + vaapiIntel + vpl-gpu-rt + ]; + }; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/dunamis/stylix.nix b/hosts/dunamis/stylix.nix index 3e113c5..428b27c 100644 --- a/hosts/dunamis/stylix.nix +++ b/hosts/dunamis/stylix.nix @@ -7,22 +7,21 @@ inputs.stylix.nixosModules.stylix ]; environment.systemPackages = with pkgs; [ - #papirus-icon-theme nerd-fonts.iosevka ]; stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/tomorrow.yaml"; - polarity = "light"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/tomorrow-night.yaml"; + polarity = "dark"; cursor = { package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; + name = "Bibata-Modern-Classic"; size = 24; }; image = builtins.fetchurl { - url = "https://w.wallhaven.cc/full/d6/wallhaven-d6163o.jpg"; - name = "wallhaven-d6163o"; - sha256 = "c6d298be1520546c0440d64d1073e33a356043e2481a8a67e940d5262c0c2e28"; + url = "https://w.wallhaven.cc/full/2y/wallhaven-2y7xv6.jpg"; + name = "wallhaven-2y7xv6"; + sha256 = "8c2118165298ff8f25138a2fed78e5f95e2494cfbf516b20ab1ff52dbad51afe"; }; opacity.terminal = 0.9; fonts = { @@ -44,7 +43,6 @@ package = pkgs.nerd-fonts.iosevka; name = "Iosevka Nerd Font Mono"; }; - emoji = { package = pkgs.noto-fonts-emoji; name = "Noto Color Emoji"; diff --git a/hosts/dunamis/users.nix b/hosts/dunamis/users.nix index 7c69c53..ad87733 100644 --- a/hosts/dunamis/users.nix +++ b/hosts/dunamis/users.nix @@ -30,6 +30,7 @@ in { group = "remotebuild"; openssh.authorizedKeys.keyFiles = [ "${secrets}/ssh/id_ed25519_eldrid_rmbuild.pub" + # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHPR1H7nWA2ay5PORdMJFnJcvVwpk3pTxMPJHQWSF3Z root@vylxae" ]; }; }; diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index d386c6b..0b70a39 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -516,7 +516,7 @@ in { gtk = { enable = true; iconTheme = { - name = "Papirus-Light"; + name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; }; }; @@ -547,24 +547,19 @@ in { # margin-bottom = 8; reload_style_on_change = true; modules-left = [ - #"custom/notification" "hyprland/language" - "custom/separator" "hyprland/workspaces" - "custom/separator" "wlr/taskbar" ]; # modules-center = []; modules-right = [ "wireplumber" (lib.mkIf (hostname != "dunamis") "group/laptop") - "custom/separator" "tray" "privacy" "power-profiles-daemon" "idle_inhibitor" "custom/notification" - "custom/separator" "clock" ]; "hyprland/workspaces" = { @@ -597,7 +592,7 @@ in { format-uk = "πŸ‡ΊπŸ‡¦"; }; "custom/separator" = { - format = "󰇙"; + format = "󰝠"; interval = "once"; tooltip = false; }; @@ -728,16 +723,13 @@ in { font-family: ${config.stylix.fonts.sansSerif.name}, FontAwesome; font-weight: 500; font-size: 100%; - /* margin: 0px 2px 2px 2px; */ } - window#waybar { background-color: transparent; color: @base05; transition-property: background-color; transition-duration: 0.5s; } - .modules-left, .modules-right { border-top-left-radius: 12px; @@ -759,84 +751,36 @@ in { box-shadow: inset 0 -3px transparent; border-radius: 16px; } - button:hover { background: inherit; box-shadow: inset 0 -3px transparent; } - #mode { background-color: rgba(0, 0, 0, 0.2); box-shadow: inset 0 -3px @base05; } - - #clock, #battery, #backlight, #workspaces, - #network, - #wireplumber, - #laptop, - #tray, - #mode, - #privacy - #privacy-item, - #idle_inhibitor, - #backlight-slider, - #custom-notification, - #scratchpad, #power-profiles-daemon, #taskbar, #language, - #upower, - #mpris, - #mpd { - padding: 0; - color: @base05; - background-color: transparent; - } - - /* #upower, - #battery, - #backlight, - #custom-kbd-backlight, - #backlight-slider, - #cpu, - #memory, - #disk, - #network, - #wireplumber, - #power-profiles-daemon { - padding-right: 0.1em; - } */ - + #clock, #battery, #backlight, #wireplumber, #custom-separator { padding: 0 0.3em; } - - #workspaces { - font-weight: bold; - } - - #tray, - #tray button, #privacy, - #idle_inhibitor { - padding: 0 0.2em; - } - + #tray button, + #idle_inhibitor, #workspaces button { - padding: 0 0.2em; + padding: 0 0.2em; } #taskbar button { padding: 0 0.1em; } - #taskbar { - padding: 0; - } #workspaces button.active { color: @base0D; } @@ -847,7 +791,6 @@ in { window#empty { background-color: transparent; } - #battery.critical:not(.charging) { background-color: @base09; color: @base00; @@ -857,50 +800,36 @@ in { animation-iteration-count: infinite; animation-direction: alternate; } - #power-profiles-daemon.performance { background-color: @base00; color: @base0D; } - #power-profiles-daemon.balanced { background-color: @base00; color: @base0B; } - #power-profiles-daemon.power-saver { background-color: @base00; color: @base0A; } - label:focus { background-color: #000000; } - #tray > .passive { -gtk-icon-effect: dim; } - #tray > .needs-attention { -gtk-icon-effect: highlight; background-color: @base08; } - - #laptop, - #privacy { - padding: 0em; - } - #privacy-item.screenshare { background-color: @base00; color: @base0C; } - #privacy-item.audio-in { background-color: @base00; color: @base0E; } - #privacy-item.audio-out { background-color: @base; } @@ -1216,6 +1145,17 @@ in { ]; }; }; + services.gammastep = { + enable = true; + provider = "manual"; + latitude = 49.6; + longitude = 36.1; + tray = true; + temperature = { + day = 6500; + night = 3000; + }; + }; services.wlsunset = { enable = false; latitude = "49.6"; @@ -1234,7 +1174,6 @@ in { }; home.packages = with pkgs; [ brightnessctl - hyprsunset nautilus helvum loupe @@ -1329,11 +1268,17 @@ in { }; }; hyprsunset = mkGraphicalService { + Unit = + graphicalService.Unit + // { + ConditionEnvironment = "WAYLAND_DISPLAY"; + }; Service = graphicalService.Service // { Type = "simple"; - ExecStart = "${lib.getExe pkgs.hyprsunset} -t 6500"; + Slice = "session.slice"; + ExecStart = "${lib.getExe perSystem.hyprsunset.hyprsunset} -t 6500"; }; }; };