diff --git a/flake.lock b/flake.lock index 60f7829b..712f1f5b 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -80,8 +80,8 @@ "wrapper-manager": "wrapper-manager" }, "locked": { - "lastModified": 1718096823, - "narHash": "sha256-HvZJFDlXLtKlHolfMwidWhkl2Rk/kkvOoFPxvWpKZzo=", + "lastModified": 1718374045, + "narHash": "sha256-4soKvxlVwhhaSHCva8+ybjcR3IPGSyzv6LM3xwaM6MI=", "path": "/home/sioodmy/dev/andromeda", "type": "path" }, @@ -443,26 +443,6 @@ "type": "github" } }, - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718008439, - "narHash": "sha256-nlh/2uD5p2SAdkn6Zuey20yaR5FFWvhL3poapDGNE4Y=", - "owner": "nix-community", - "repo": "disko", - "rev": "c1cfbfad7cb45f0c177b35b59ba67d1b5fc7ca82", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -937,11 +917,11 @@ ] }, "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "lastModified": 1718018037, + "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", "type": "github" }, "original": { @@ -957,11 +937,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -1135,11 +1115,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1718108998, - "narHash": "sha256-oj/O1Cv+SNUcFldZdx/38+UXX3mGnGqnDPsbMwLWHzk=", + "lastModified": 1718328312, + "narHash": "sha256-pkVnfY76TNm2iDxPa770PI1ez2DF8TxkroxOADaW4xM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "519a36b261ef9e002fdae97656ecc26d66406e7c", + "rev": "745bfd9db78c9a916933fd9389c3bc78f418cc8d", "type": "github" }, "original": { @@ -1202,11 +1182,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717995329, - "narHash": "sha256-lQJXEFHHVsFdFLx0bvoRbZH3IXUBsle6EWj9JroTJ/s=", + "lastModified": 1718349360, + "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "58b52b0dd191af70f538c707c66c682331cfdffc", + "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", "type": "github" }, "original": { @@ -1224,11 +1204,11 @@ ] }, "locked": { - "lastModified": 1717865884, - "narHash": "sha256-imcv6tx4lSfffv6o8T0cIxJmgheItGSSGzxyO4cWnKg=", + "lastModified": 1718245237, + "narHash": "sha256-W3xi3ctaXA4cJFQI/+WCJrgReh/W1X0/B8Z4kZlazAA=", "owner": "nixpak", "repo": "nixpak", - "rev": "f938c3c01026c00a305b5fba8edeb8f7efcfb85a", + "rev": "b6509bcf3b4383bc9b7faee416dc986f790831d3", "type": "github" }, "original": { @@ -1312,11 +1292,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1718083092, - "narHash": "sha256-EQsPXycAbmby4meQUNLYfFaGOiqz2J9AlwFRV4UiHnY=", + "lastModified": 1718333206, + "narHash": "sha256-eilG1IDuHUiTCiE7gx+UbtbRPjSiEi600zg/eZeDIuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa1ebdaf49a606e21c06e0f6ed7aece9a41831c3", + "rev": "1740b0f87b1c4ff0ed5a499c0109fb71e7b6fd78", "type": "github" }, "original": { @@ -1436,11 +1416,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -1568,7 +1548,6 @@ "bitcoinstatus": "bitcoinstatus", "catppuccinifier": "catppuccinifier", "devshell": "devshell_2", - "disko": "disko", "flake-parts": "flake-parts_2", "home-manager": "home-manager", "impermanence": "impermanence", @@ -1917,11 +1896,11 @@ ] }, "locked": { - "lastModified": 1717850719, - "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "lastModified": 1718271476, + "narHash": "sha256-35hUMmFesmchb+u7heKHLG5B6c8fBOcSYo0jj0CHLes=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "rev": "e75ba0a6bb562d2ce275db28f6a36a2e4fd81391", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f2708639..e897a8ba 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,6 @@ env = extra.shellEnv; packages = with pkgs; [ inputs'.agenix.packages.default # provide agenix CLI within flake shell - inputs'.disko.packages.disko-install config.treefmt.build.wrapper # treewide formatter nil # nix ls alejandra # nix formatter @@ -110,11 +109,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - schizofox = { url = "github:schizofox/schizofox"; inputs = { diff --git a/home/packages.nix b/home/packages.nix index 358b4f9d..577be723 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,13 +1,17 @@ -{pkgs, inputs, ...}: { +{ + pkgs, + inputs, + ... +}: { nixpkgs.config.allowUnfree = false; home.packages = with pkgs; [ inputs.ags.packages.${pkgs.system}.default + cider #ags overskride dart-sass - libreoffice-fresh thunderbird nicotine-plus diff --git a/hosts/calypso/default.nix b/hosts/calypso/default.nix index a9ced2bd..20eb7b8e 100644 --- a/hosts/calypso/default.nix +++ b/hosts/calypso/default.nix @@ -15,7 +15,7 @@ ''; inherit (lib) mkDefault; in { - imports = [./hardware-configuration.nix ./disko.nix]; + imports = [./hardware-configuration.nix]; environment.systemPackages = with pkgs; [ acpi powertop diff --git a/hosts/calypso/disko.nix b/hosts/calypso/disko.nix deleted file mode 100644 index 95c779a0..00000000 --- a/hosts/calypso/disko.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - disko.devices = { - disk = { - nvme0n1 = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - # disable settings.keyFile if you want to use interactive password entry - #passwordFile = "/tmp/secret.key"; # Interactive - settings = { - allowDiscards = true; - }; - content = { - type = "btrfs"; - extraArgs = ["-f"]; - subvolumes = { - "/@persist" = { - mountpoint = "/persist"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/@nix" = { - mountpoint = "/nix"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/@swap" = { - mountpoint = "/.swapvol"; - swap.swapfile.size = "20M"; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/default.nix b/hosts/default.nix index 4d773b43..e5579b2b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,10 +11,9 @@ wayland = ../system/wayland; hw = inputs.nixos-hardware.nixosModules; agenix = inputs.agenix.nixosModules.age; - disko = inputs.disko.nixosModules.default; hmModule = inputs.home-manager.nixosModules.home-manager; - shared = [core agenix disko]; + shared = [core agenix]; home-manager = { useUserPackages = true; diff --git a/system/core/nix.nix b/system/core/nix.nix index fb6c21f6..fdf1f716 100644 --- a/system/core/nix.nix +++ b/system/core/nix.nix @@ -67,11 +67,8 @@ }; nix = { - gc = { - automatic = true; - dates = "daily"; - options = "--delete-older-than 3d"; - }; + # gc kills ssds + gc.automatic = lib.mkDefault false; package = pkgs.nixVersions.git; # Make builds run with low priority so my system stays responsive diff --git a/system/core/system.nix b/system/core/system.nix index d4628c82..51a853ae 100644 --- a/system/core/system.nix +++ b/system/core/system.nix @@ -32,8 +32,8 @@ }; environment.variables = { - EDITOR = "hx"; - BROWSER = "schizofox"; + EDITOR = "v"; + BROWSER = "brave"; }; environment.systemPackages = with pkgs; [ git