commit f3c419f0a290a45fc083f9559f918da691fc0309 · soopy.moe/gensokyo

+46 -25

flake.lock

···

       33
       33
        
               "nuscht-search": "nuscht-search"

     

       34
       34
        
             },

     

       35
       35
        
             "locked": {

     

       36
       36
       -
               "lastModified": 1736033375,

     

       37
       37
       -
               "narHash": "sha256-CeTokGIJpTd8kfaqLy3ururMe4N+LZpF62ofXAh0KtU=",

     

       36
       36
       +
               "lastModified": 1736069220,

     

       37
       37
       +
               "narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=",

     

       38
       38
        
               "owner": "catppuccin",

     

       39
       39
        
               "repo": "nix",

     

       40
       40
       -
               "rev": "89bbaf1987e8e0e2c891463ebb5be3a6cbd781a1",

     

       40
       40
       +
               "rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e",

     

       41
       41
        
               "type": "github"

     

       42
       42
        
             },

     

       43
       43
        
             "original": {

     
···

       271
       271
        
               "zig": "zig"

     

       272
       272
        
             },

     

       273
       273
        
             "locked": {

     

       274
       274
       -
               "lastModified": 1736031329,

     

       275
       275
       -
               "narHash": "sha256-jKWHpdlWyN8fa/1MvSRX2qVf+ZBJLu8NsH7T9xK4WRo=",

     

       274
       274
       +
               "lastModified": 1736566108,

     

       275
       275
       +
               "narHash": "sha256-r+FXWU/hfgO3lAHYs9Q03iCShnC42mZd1pnmIIp8Z9k=",

     

       276
       276
        
               "owner": "ghostty-org",

     

       277
       277
        
               "repo": "ghostty",

     

       278
       278
       -
               "rev": "0306c592a7dbaa394da481ab2219b3bcd2b8b48f",

     

       278
       278
       +
               "rev": "918ccdba5cc65ccd1fb48a54c71306d869299441",

     

       279
       279
        
               "type": "github"

     

       280
       280
        
             },

     

       281
       281
        
             "original": {

     
···

       372
       372
        
               ]

     

       373
       373
        
             },

     

       374
       374
        
             "locked": {

     

       375
       375
       -
               "lastModified": 1736013363,

     

       376
       376
       -
               "narHash": "sha256-P4lsS2Y5GzBfC8OfXtD/xWEucX6oHGTjOzjEjEJbXfc=",

     

       375
       375
       +
               "lastModified": 1736508663,

     

       376
       376
       +
               "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",

     

       377
       377
        
               "owner": "nix-community",

     

       378
       378
        
               "repo": "home-manager",

     

       379
       379
       -
               "rev": "0d7908bd09165db6699908b7e3970f137327cbf0",

     

       379
       379
       +
               "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",

     

       380
       380
        
               "type": "github"

     

       381
       381
        
             },

     

       382
       382
        
             "original": {

     
···

       484
       484
        
               "nixpkgs": "nixpkgs_3"

     

       485
       485
        
             },

     

       486
       486
        
             "locked": {

     

       487
       487
       -
               "lastModified": 1735545722,

     

       488
       488
       -
               "narHash": "sha256-YCV7J8mo7OXgUSMhNJwvq7u2Ka8LRo7sLaQQi5RHV30=",

     

       487
       487
       +
               "lastModified": 1736496128,

     

       488
       488
       +
               "narHash": "sha256-Cfm3/eukeXSE5IZ6ap0S7oFzcxJPBdkXxsoDmsalEhE=",

     

       489
       489
        
               "owner": "soopyc",

     

       490
       490
        
               "repo": "mystia",

     

       491
       491
       -
               "rev": "87fcf4041dcb362f3074f7675b5b5f9f2bcdc1fd",

     

       491
       491
       +
               "rev": "985a304a40a276eb8576cf8675688a66915a8601",

     

       492
       492
        
               "type": "github"

     

       493
       493
        
             },

     

       494
       494
        
             "original": {

     
···

       545
       545
        
               ]

     

       546
       546
        
             },

     

       547
       547
        
             "locked": {

     

       548
       548
       -
               "lastModified": 1735443188,

     

       549
       549
       -
               "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=",

     

       548
       548
       +
               "lastModified": 1736440205,

     

       549
       549
       +
               "narHash": "sha256-QJgTI//KEGuEJC6FDxuI9Dq8PewIpnxD2NVx2/OHbfc=",

     

       550
       550
        
               "owner": "nix-community",

     

       551
       551
        
               "repo": "nix-index-database",

     

       552
       552
       -
               "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544",

     

       552
       552
       +
               "rev": "a2200b499efa01ca8646173e94cdfcc93188f2b8",

     

       553
       553
        
               "type": "github"

     

       554
       554
        
             },

     

       555
       555
        
             "original": {

     
···

       678
       678
        
           },

     

       679
       679
        
           "nixpkgs_3": {

     

       680
       680
        
             "locked": {

     

       681
       681
       -
               "lastModified": 1735471104,

     

       682
       682
       -
               "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",

     

       681
       681
       +
               "lastModified": 1736344531,

     

       682
       682
       +
               "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",

     

       683
       683
        
               "owner": "NixOS",

     

       684
       684
        
               "repo": "nixpkgs",

     

       685
       685
       -
               "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",

     

       685
       685
       +
               "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",

     

       686
       686
        
               "type": "github"

     

       687
       687
        
             },

     

       688
       688
        
             "original": {

     
···

       693
       693
        
           },

     

       694
       694
        
           "nixpkgs_4": {

     

       695
       695
        
             "locked": {

     

       696
       696
       -
               "lastModified": 1736019633,

     

       697
       697
       -
               "narHash": "sha256-Mi8oC22DXsgX/Tdwb8mbXrxaG7wdZXP9d3TqCtWvmGI=",

     

       696
       696
       +
               "lastModified": 1736560554,

     

       697
       697
       +
               "narHash": "sha256-+JU6o3GAOWtFfmbf1yfHI7Tu8E+sn8Uo6/0argLzsB4=",

     

       698
       698
        
               "owner": "NixOS",

     

       699
       699
        
               "repo": "nixpkgs",

     

       700
       700
       -
               "rev": "14c58c5918427906794936529c88a00b0d0e483f",

     

       700
       700
       +
               "rev": "cef47c71b16e96b15ef2ee88be39d030f1961437",

     

       701
       701
        
               "type": "github"

     

       702
       702
        
             },

     

       703
       703
        
             "original": {

     
···

       769
       769
        
               "nix-index-database": "nix-index-database",

     

       770
       770
        
               "nixos-hardware": "nixos-hardware",

     

       771
       771
        
               "nixpkgs": "nixpkgs_4",

     

       772
       772
       -
               "sops-nix": "sops-nix"

     

       772
       772
       +
               "sops-nix": "sops-nix",

     

       773
       773
       +
               "treefmt-nix": "treefmt-nix_2"

     

       773
       774
        
             }

     

       774
       775
        
           },

     

       775
       776
        
           "rust-overlay": {

     
···

       804
       805
        
               ]

     

       805
       806
        
             },

     

       806
       807
        
             "locked": {

     

       807
       807
       -
               "lastModified": 1735844895,

     

       808
       808
       -
               "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=",

     

       808
       808
       +
               "lastModified": 1736515725,

     

       809
       809
       +
               "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",

     

       809
       810
        
               "owner": "Mic92",

     

       810
       811
        
               "repo": "sops-nix",

     

       811
       811
       -
               "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32",

     

       812
       812
       +
               "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",

     

       812
       813
        
               "type": "github"

     

       813
       814
        
             },

     

       814
       815
        
             "original": {

     
···

       876
       877
        
               "owner": "numtide",

     

       877
       878
        
               "repo": "treefmt-nix",

     

       878
       879
        
               "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1",

     

       880
       880
       +
               "type": "github"

     

       881
       881
       +
             },

     

       882
       882
       +
             "original": {

     

       883
       883
       +
               "owner": "numtide",

     

       884
       884
       +
               "repo": "treefmt-nix",

     

       885
       885
       +
               "type": "github"

     

       886
       886
       +
             }

     

       887
       887
       +
           },

     

       888
       888
       +
           "treefmt-nix_2": {

     

       889
       889
       +
             "inputs": {

     

       890
       890
       +
               "nixpkgs": [

     

       891
       891
       +
                 "nixpkgs"

     

       892
       892
       +
               ]

     

       893
       893
       +
             },

     

       894
       894
       +
             "locked": {

     

       895
       895
       +
               "lastModified": 1736154270,

     

       896
       896
       +
               "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",

     

       897
       897
       +
               "owner": "numtide",

     

       898
       898
       +
               "repo": "treefmt-nix",

     

       899
       899
       +
               "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",

     

       879
       900
        
               "type": "github"

     

       880
       901
        
             },

     

       881
       902
        
             "original": {

+21 -32

flake.nix

···

       9
       9
        
           extra-trusted-public-keys = [

     

       10
       10
        
             "cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="

     

       11
       11
        
           ];

     

       12
       12
       -
           allow-import-from-derivation = true;

     

       13
       12
        
           fallback = true;

     

       14
       13
        
         };

     

       15
       14
        
       

     
···

       21
       20
        
           catppuccin.url = "github:catppuccin/nix";

     

       22
       21
        
           hydra.url = "github:NixOS/hydra";

     

       23
       22
        
       

     

       24
       24
       -
           ghostty ={ 

     

       23
       23
       +
           ghostty = {

     

       25
       24
        
             url = "github:ghostty-org/ghostty";

     

       26
       25
        
             inputs.nixpkgs-unstable.follows = "nixpkgs";

     

       27
       26
        
           };

     
···

       50
       49
        
             url = "github:hercules-ci/arion";

     

       51
       50
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       52
       51
        
           };

     

       52
       52
       +
       

     

       53
       53
       +
           treefmt-nix = {

     

       54
       54
       +
             url = "github:numtide/treefmt-nix";

     

       55
       55
       +
             inputs.nixpkgs.follows = "nixpkgs";

     

       56
       56
       +
           };

     

       53
       57
        
         };

     

       54
       58
        
       

     

       55
       55
       -
         outputs = {nixpkgs, ...} @ inputs: let

     

       59
       59
       +
         outputs = {

     

       60
       60
       +
           self,

     

       61
       61
       +
           nixpkgs,

     

       62
       62
       +
           treefmt-nix,

     

       63
       63
       +
           ...

     

       64
       64
       +
         } @ inputs: let

     

       56
       65
        
           lib = nixpkgs.lib;

     

       57
       66
        
       

     

       58
       67
        
           systems = [

     
···

       61
       70
        
             "x86_64-darwin"

     

       62
       71
        
             "aarch64-darwin"

     

       63
       72
        
           ];

     

       64
       64
       -
           forAllSystems = fn: lib.genAttrs systems (s: fn nixpkgs.legacyPackages.${s});

     

       73
       73
       +
           forAllSystems = fn: lib.genAttrs systems (system: fn nixpkgs.legacyPackages.${system});

     

       74
       74
       +
           treefmt = forAllSystems (pkgs: treefmt-nix.lib.evalModule pkgs ./nix/treefmt.nix);

     

       65
       75
        
         in {

     

       66
       76
        
           lib.x86_64-linux = import ./global/utils.nix {

     

       67
       77
        
             inherit inputs;

     
···

       82
       92
        
       

     

       83
       93
        
           nixosConfigurations = import systems/default.nix {inherit inputs lib;};

     

       84
       94
        
       

     

       85
       85
       -
           devShells = forAllSystems (pkgs: {

     

       86
       86
       -
             default = pkgs.mkShellNoCC {

     

       87
       87
       -
               packages = [

     

       88
       88
       -
                 (pkgs.python311.withPackages (p: [p.requests]))

     

       89
       89
       -
                 pkgs.nixos-rebuild

     

       90
       90
       -
                 pkgs.nvd

     

       91
       91
       -
               ];

     

       92
       92
       -
             };

     

       93
       93
       -
           });

     

       95
       95
       +
           devShells = forAllSystems (pkgs: import ./nix/devshell.nix {inherit pkgs inputs;});

     

       94
       96
        
       

     

       95
       95
       -
           checks = forAllSystems (pkgs: {

     

       96
       96
       -
             format-deadcode-check = pkgs.stdenvNoCC.mkDerivation {

     

       97
       97
       -
               name = "deadcode_check";

     

       98
       98
       -
               src = ./.;

     

       99
       99
       -
               dontPatch = true;

     

       100
       100
       -
               dontConfigure = true;

     

       101
       101
       -
       

     

       102
       102
       -
               buildInputs = with pkgs; [alejandra deadnix];

     

       103
       103
       -
               buildPhase = ''

     

       104
       104
       -
                 set -euo pipefail

     

       105
       105
       -
       

     

       106
       106
       -
                 deadnix -f .

     

       107
       107
       -
                 echo "All done!"

     

       108
       108
       -
               '';

     

       97
       97
       +
           checks = forAllSystems (pkgs:

     

       98
       98
       +
             (import ./nix/checks.nix {inherit pkgs inputs;})

     

       99
       99
       +
             // {

     

       100
       100
       +
               formatting = treefmt.${pkgs.system}.config.build.check self;

     

       101
       101
       +
             });

     

       109
       102
        
       

     

       110
       110
       -
               installPhase = "touch $out";

     

       111
       111
       -
             };

     

       112
       112
       -
           });

     

       113
       113
       -
       

     

       114
       114
       -
           formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;

     

       103
       103
       +
           formatter = forAllSystems (pkgs: treefmt.${pkgs.system}.config.build.wrapper);

     

       115
       104
        
         };

     

       116
       105
        
       }

-20

global/core.nix

···

       1
       1
        
       {

     

       2
       2
        
         pkgs,

     

       3
       3
        
         inputs,

     

       4
       4
       -
         lib,

     

       5
       4
        
         ...

     

       6
       5
        
       }: {

     

       7
       6
        
         imports = [

     
···

       23
       22
        
         hardware.enableRedistributableFirmware = true;

     

       24
       23
        
         services.fwupd.enable = true;

     

       25
       24
        
       

     

       26
       26
       -
         # FIXME: doesn't seem to actually update anything

     

       27
       27
       -
         system.autoUpgrade = lib.mkDefault {

     

       28
       28
       -
           enable = false;

     

       29
       29
       -
           flake = "https://patchy.soopy.moe/cassie/gensokyo/archive/main.tar.gz";

     

       30
       30
       -
           dates = "*-*-* *:00/15:00";

     

       31
       31
       -
           flags = [

     

       32
       32
       -
             "--options"

     

       33
       33
       -
             "tarball-ttl"

     

       34
       34
       -
             "0"

     

       35
       35
       -
           ];

     

       36
       36
       -
           allowReboot = false; # this breaks our current setup with encrypted secureboot

     

       37
       37
       -
         };

     

       38
       38
       -
       

     

       39
       25
        
         boot.tmp = {

     

       40
       26
        
           useTmpfs = false; # this causes oom on kernel builds

     

       41
       27
        
           cleanOnBoot = true;

     

       42
       28
        
         };

     

       43
       43
       -
       

     

       44
       44
       -
         # # Enable crash dumps globally

     

       45
       45
       -
         # boot.crashDump = {

     

       46
       46
       -
         #   enable = true;

     

       47
       47
       -
         #   reservedMemory = "128M";

     

       48
       48
       -
         # };

     

       49
       29
        
       

     

       50
       30
        
         time.timeZone = "Asia/Hong_Kong";

     

       51
       31

+21

nix/checks.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         inputs,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
       }: {

     

       5
       5
       +
         deadcode = pkgs.stdenvNoCC.mkDerivation {

     

       6
       6
       +
           name = "deadcode_check";

     

       7
       7
       +
           src = inputs.self;

     

       8
       8
       +
           dontPatch = true;

     

       9
       9
       +
           dontConfigure = true;

     

       10
       10
       +
       

     

       11
       11
       +
           buildInputs = with pkgs; [deadnix];

     

       12
       12
       +
           buildPhase = ''

     

       13
       13
       +
             set -euo pipefail

     

       14
       14
       +
       

     

       15
       15
       +
             deadnix -f .

     

       16
       16
       +
             echo "All done!"

     

       17
       17
       +
           '';

     

       18
       18
       +
       

     

       19
       19
       +
           installPhase = "touch $out";

     

       20
       20
       +
         };

     

       21
       21
       +
       }

nix/devshell.nix

···

       1
       1
       +
       {pkgs, ...}: {

     

       2
       2
       +
         default = pkgs.mkShellNoCC {

     

       3
       3
       +
           packages = [

     

       4
       4
       +
             pkgs.nixos-rebuild

     

       5
       5
       +
             pkgs.nvd

     

       6
       6
       +
           ];

     

       7
       7
       +
         };

     

       8
       8
       +
       }

nix/treefmt.nix

···

       1
       1
       +
       {...}: {

     

       2
       2
       +
         projectRootFile = "flake.nix";

     

       3
       3
       +
         programs.alejandra.enable = true;

     

       4
       4
       +
       }