comparing 690f2a9627e30e0e70faab3f5b8df0f15ac46f63 and master on ryan.freumh.org/nixos

+43 -22

flake.lock

···

       102
       102
        
               "type": "github"

     

       103
       103
        
             }

     

       104
       104
        
           },

     

       105
       105
       +
           "disko": {

     

       106
       106
       +
             "inputs": {

     

       107
       107
       +
               "nixpkgs": [

     

       108
       108
       +
                 "nixpkgs"

     

       109
       109
       +
               ]

     

       110
       110
       +
             },

     

       111
       111
       +
             "locked": {

     

       112
       112
       +
               "lastModified": 1743598667,

     

       113
       113
       +
               "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=",

     

       114
       114
       +
               "owner": "nix-community",

     

       115
       115
       +
               "repo": "disko",

     

       116
       116
       +
               "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",

     

       117
       117
       +
               "type": "github"

     

       118
       118
       +
             },

     

       119
       119
       +
             "original": {

     

       120
       120
       +
               "owner": "nix-community",

     

       121
       121
       +
               "repo": "disko",

     

       122
       122
       +
               "type": "github"

     

       123
       123
       +
             }

     

       124
       124
       +
           },

     

       105
       125
        
           "eilean": {

     

       106
       126
        
             "inputs": {

     

       107
       127
        
               "eon": [

     
···

       136
       156
        
               "opam-nix": "opam-nix"

     

       137
       157
        
             },

     

       138
       158
        
             "locked": {

     

       139
       139
       -
               "lastModified": 1742472252,

     

       140
       140
       -
               "narHash": "sha256-mwX2p4JbFGIcrbacKh+khU4s2fzHy9oDjAYIJ887MMI=",

     

       159
       159
       +
               "lastModified": 1743149102,

     

       160
       160
       +
               "narHash": "sha256-pW24ij8CqAdU8m5OFD1amwNmovf25YRygl1bv+s390o=",

     

       141
       161
        
               "owner": "RyanGibb",

     

       142
       162
        
               "repo": "eon",

     

       143
       143
       -
               "rev": "c55e4f79f12b1b704e386ce01c8a282e98f26ae3",

     

       163
       163
       +
               "rev": "81bdd51d1e2651c46df2a1ce38b7df5661e7eef1",

     

       144
       164
        
               "type": "github"

     

       145
       165
        
             },

     

       146
       166
        
             "original": {

     
···

       437
       457
        
               ]

     

       438
       458
        
             },

     

       439
       459
        
             "locked": {

     

       440
       440
       -
               "lastModified": 1742655702,

     

       441
       441
       -
               "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=",

     

       460
       460
       +
               "lastModified": 1743387206,

     

       461
       461
       +
               "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",

     

       442
       462
        
               "owner": "nix-community",

     

       443
       463
        
               "repo": "home-manager",

     

       444
       444
       -
               "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff",

     

       464
       464
       +
               "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",

     

       445
       465
        
               "type": "github"

     

       446
       466
        
             },

     

       447
       467
        
             "original": {

     
···

       661
       681
        
           },

     

       662
       682
        
           "nixos-hardware": {

     

       663
       683
        
             "locked": {

     

       664
       664
       -
               "lastModified": 1742806253,

     

       665
       665
       -
               "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",

     

       684
       684
       +
               "lastModified": 1743420942,

     

       685
       685
       +
               "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",

     

       666
       686
        
               "owner": "nixos",

     

       667
       687
        
               "repo": "nixos-hardware",

     

       668
       668
       -
               "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",

     

       688
       688
       +
               "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",

     

       669
       689
        
               "type": "github"

     

       670
       690
        
             },

     

       671
       691
        
             "original": {

     
···

       829
       849
        
           },

     

       830
       850
        
           "nixpkgs-unstable": {

     

       831
       851
        
             "locked": {

     

       832
       832
       -
               "lastModified": 1742889210,

     

       833
       833
       -
               "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",

     

       852
       852
       +
               "lastModified": 1743448293,

     

       853
       853
       +
               "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",

     

       834
       854
        
               "owner": "nixos",

     

       835
       855
        
               "repo": "nixpkgs",

     

       836
       836
       -
               "rev": "698214a32beb4f4c8e3942372c694f40848b360d",

     

       856
       856
       +
               "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",

     

       837
       857
        
               "type": "github"

     

       838
       858
        
             },

     

       839
       859
        
             "original": {

     
···

       845
       865
        
           },

     

       846
       866
        
           "nixpkgs_2": {

     

       847
       867
        
             "locked": {

     

       848
       848
       -
               "lastModified": 1742751704,

     

       849
       849
       -
               "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",

     

       868
       868
       +
               "lastModified": 1743501102,

     

       869
       869
       +
               "narHash": "sha256-7PCBQ4aGVF8OrzMkzqtYSKyoQuU2jtpPi4lmABpe5X4=",

     

       850
       870
        
               "owner": "nixos",

     

       851
       871
        
               "repo": "nixpkgs",

     

       852
       852
       -
               "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",

     

       872
       872
       +
               "rev": "02f2af8c8a8c3b2c05028936a1e84daefa1171d4",

     

       853
       873
        
               "type": "github"

     

       854
       874
        
             },

     

       855
       875
        
             "original": {

     
···

       1109
       1129
        
               "agenix": "agenix",

     

       1110
       1130
        
               "alec-website": "alec-website",

     

       1111
       1131
        
               "deploy-rs": "deploy-rs",

     

       1132
       1132
       +
               "disko": "disko",

     

       1112
       1133
        
               "eilean": "eilean",

     

       1113
       1134
        
               "eon": "eon",

     

       1114
       1135
        
               "fn06-website": "fn06-website",

     
···

       1268
       1289
        
               ]

     

       1269
       1290
        
             },

     

       1270
       1291
        
             "locked": {

     

       1271
       1271
       -
               "lastModified": 1742921920,

     

       1272
       1272
       -
               "narHash": "sha256-NXAQbw7TFPJ7BPzfYrl2i7FKPXSNtQ+d93XIvRI9f6o=",

     

       1292
       1292
       +
               "lastModified": 1743620557,

     

       1293
       1293
       +
               "narHash": "sha256-w7a9Qn/IUdCe+gk5cMvSUS+YKItK2iTiu2Qcq49a+zU=",

     

       1273
       1294
        
               "ref": "refs/heads/master",

     

       1274
       1274
       -
               "rev": "527e848514f4d7c62468c36b7959d2e0983e33f4",

     

       1275
       1275
       -
               "revCount": 382,

     

       1295
       1295
       +
               "rev": "19ee94f42ab259c218762e6f0ed87952f80b5162",

     

       1296
       1296
       +
               "revCount": 420,

     

       1276
       1297
        
               "type": "git",

     

       1277
       1298
        
               "url": "https://tangled.sh/@tangled.sh/core"

     

       1278
       1299
        
             },

     
···

       1289
       1310
        
               "rust-overlay": "rust-overlay"

     

       1290
       1311
        
             },

     

       1291
       1312
        
             "locked": {

     

       1292
       1292
       -
               "lastModified": 1740819101,

     

       1293
       1293
       -
               "narHash": "sha256-E2YADfdQt3q4QWU5ieftfoJ+tQnFxIDvn/T8b4CNlFk=",

     

       1313
       1313
       +
               "lastModified": 1743524557,

     

       1314
       1314
       +
               "narHash": "sha256-0rNcLtKWbjI0VqlusrqPMcpPgdkkZGkOIt9s3CnsCao=",

     

       1294
       1315
        
               "owner": "bcyran",

     

       1295
       1316
        
               "repo": "timewall",

     

       1296
       1296
       -
               "rev": "9f2c12b3ee55b7fe7cc24e83ec283248906872b1",

     

       1317
       1317
       +
               "rev": "789befef40bf0d45e48285f17f512b41924cfeb7",

     

       1297
       1318
        
               "type": "github"

     

       1298
       1319
        
             },

     

       1299
       1320
        
             "original": {

+3 -1

flake.nix

···

       21
       21
        
           nur.url = "github:nix-community/NUR/e9e77b7985ef9bdeca12a38523c63d47555cc89b";

     

       22
       22
        
           timewall.url = "github:bcyran/timewall/";

     

       23
       23
        
           tangled.url = "git+https://tangled.sh/@tangled.sh/core";

     

       24
       24
       +
           disko.url = "github:nix-community/disko";

     

       24
       25
        
       

     

       25
       26
        
           # deduplicate flake inputs

     

       26
       27
        
           eilean.inputs.nixpkgs.follows = "nixpkgs";

     
···

       38
       39
        
           nur.inputs.nixpkgs.follows = "nixpkgs";

     

       39
       40
        
           timewall.inputs.nixpkgs.follows = "nixpkgs";

     

       40
       41
        
           tangled.inputs.nixpkgs.follows = "nixpkgs";

     

       42
       42
       +
           disko.inputs.nixpkgs.follows = "nixpkgs";

     

       41
       43
        
         };

     

       42
       44
        
       

     

       43
       45
        
         outputs =

     
···

       116
       118
        
                       (

     

       117
       119
        
                         { config, ... }:

     

       118
       120
        
                         {

     

       119
       119
       -
                           networking.hostName = "${host}";

     

       121
       121
       +
                           networking.hostName = host-nixpkgs.lib.mkDefault "${host}";

     

       120
       122
        
                           # pin nix command's nixpkgs flake to the system flake to avoid unnecessary downloads

     

       121
       123
        
                           nix.registry.nixpkgs.flake = host-nixpkgs;

     

       122
       124
        
                           system.stateVersion = "24.05";

-6

home/default.nix

···

       231
       231
        
                 unbind C-b

     

       232
       232
        
                 set-option -g prefix C-a

     

       233
       233
        
                 bind-key C-a send-prefix

     

       234
       234
       -
       

     

       235
       234
        
                 set-window-option -g mode-keys vi

     

       236
       235
        
                 set-option -g mouse on

     

       237
       236
        
                 set-option -g set-titles on

     
···

       245
       244
        
                 # https://stackoverflow.com/questions/62182401/neovim-screen-lagging-when-switching-mode-from-insert-to-normal

     

       246
       245
        
                 # locking

     

       247
       246
        
                 set -s escape-time 0

     

       248
       248
       -
                 set -g lock-command ${pkgs.vlock}/bin/vlock

     

       249
       249
       -
                 set -g lock-after-time 0 # Seconds; 0 = never

     

       250
       250
       -
                 bind L lock-session

     

       251
       247
        
                 # for .zprofile display environment starting https://github.com/tmux/tmux/issues/3483

     

       252
       248
        
                 set-option -g update-environment XDG_VTNR

     

       253
       249
        
                 # Allow clipboard with OSC-52 work

     
···

       261
       257
        
                 bind-key -r f run-shell "tmux neww tmux-sessionizer"

     

       262
       258
        
                 # reload

     

       263
       259
        
                 bind-key r source-file ~/.config/tmux/tmux.conf

     

       264
       264
       -
                 # kill unattached

     

       265
       265
       -
                 bind-key K run-shell 'tmux ls | grep -v attached | cut -d: -f1 | xargs -I {} tmux kill-window -t {}'

     

       266
       260
        
               '';

     

       267
       261
        
           };

     

       268
       262

-1

home/gui/sway.nix

···

       63
       63
        
               export MOZ_ENABLE_WAYLAND=1

     

       64
       64
        
               export MOZ_DBUS_REMOTE=1

     

       65
       65
        
               export QT_STYLE_OVERRIDE="Fusion"

     

       66
       66
       -
               export WLR_NO_HARDWARE_CURSORS=1

     

       67
       66
        
               export NIXOS_OZONE_WL=1

     

       68
       67
        
       

     

       69
       68
        
               # for intellij

home/zsh.cfg

···

       1
       1
       +
       

     

       2
       2
       +
       # https://www.emacswiki.org/emacs/TrampMode#h5o-9

     

       3
       3
       +
       [[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ ' && return

     

       1
       4
        
       

     

       2
       5
        
       setopt autocd nomatch notify interactive_comments inc_append_history 

     

       3
       6
        
       unsetopt beep extendedglob share_history

+2 -1

hosts/gecko/default.nix

···

       41
       41
        
             emacs.enable = true;

     

       42
       42
        
           };

     

       43
       43
        
           home.sessionVariables = {

     

       44
       44
       -
             LEDGER_FILE = "~/vault/finances.ledger";

     

       44
       44
       +
             LEDGER_FILE = "$HOME/vault/finances.ledger";

     

       45
       45
       +
             CALENDAR_DIR = "$HOME/calendar";

     

       45
       46
        
           };

     

       46
       47
        
           programs.git.extraConfig.commit.gpgSign = true;

     

       47
       48
        
           programs.direnv = {

+31

hosts/hippo/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         config,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         disko,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           ./hardware-configuration.nix

     

       12
       12
       +
           disko.nixosModules.disko

     

       13
       13
       +
           ./disk-config.nix

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       16
       16
       +
         custom = {

     

       17
       17
       +
           enable = true;

     

       18
       18
       +
           autoUpgrade.enable = true;

     

       19
       19
       +
           homeManager.enable = true;

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         home-manager.users.${config.custom.username}.config.custom.machineColour = "blue";

     

       23
       23
       +
       

     

       24
       24
       +
         networking.hostName = "iphito";

     

       25
       25
       +
       

     

       26
       26
       +
         services.openssh.openFirewall = true;

     

       27
       27
       +
       

     

       28
       28
       +
         users.users.root.openssh.authorizedKeys.keys = [

     

       29
       29
       +
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7UrJmBFWR3c7jVzpoyg4dJjON9c7t9bT9acfrj6G7i mtelvers"

     

       30
       30
       +
         ];

     

       31
       31
       +
       }

+33

hosts/hippo/disk-config.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         disko.devices = {

     

       5
       5
       +
           disk.disk1 = {

     

       6
       6
       +
             device = lib.mkDefault "/dev/sda";

     

       7
       7
       +
             type = "disk";

     

       8
       8
       +
             content = {

     

       9
       9
       +
               type = "gpt";

     

       10
       10
       +
               partitions = {

     

       11
       11
       +
                 ESP = {

     

       12
       12
       +
                   type = "EF00";

     

       13
       13
       +
                   size = "500M";

     

       14
       14
       +
                   content = {

     

       15
       15
       +
                     type = "filesystem";

     

       16
       16
       +
                     format = "vfat";

     

       17
       17
       +
                     mountpoint = "/boot";

     

       18
       18
       +
                     mountOptions = [ "umask=0077" ];

     

       19
       19
       +
                   };

     

       20
       20
       +
                 };

     

       21
       21
       +
                 root = {

     

       22
       22
       +
                   size = "100%";

     

       23
       23
       +
                   content = {

     

       24
       24
       +
                     type = "filesystem";

     

       25
       25
       +
                     format = "ext4";

     

       26
       26
       +
                     mountpoint = "/";

     

       27
       27
       +
                   };

     

       28
       28
       +
                 };

     

       29
       29
       +
               };

     

       30
       30
       +
             };

     

       31
       31
       +
           };

     

       32
       32
       +
         };

     

       33
       33
       +
       }

+40

hosts/hippo/hardware-configuration.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         modulesPath,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       {

     

       10
       10
       +
         imports = [

     

       11
       11
       +
           (modulesPath + "/installer/scan/not-detected.nix")

     

       12
       12
       +
         ];

     

       13
       13
       +
       

     

       14
       14
       +
         boot.initrd.availableKernelModules = [

     

       15
       15
       +
           "megaraid_sas"

     

       16
       16
       +
           "xhci_pci"

     

       17
       17
       +
           "nvme"

     

       18
       18
       +
           "ahci"

     

       19
       19
       +
           "sd_mod"

     

       20
       20
       +
         ];

     

       21
       21
       +
         boot.initrd.kernelModules = [ "dm-snapshot" ];

     

       22
       22
       +
         boot.kernelModules = [ "kvm-amd" ];

     

       23
       23
       +
         boot.extraModulePackages = [ ];

     

       24
       24
       +
       

     

       25
       25
       +
         networking.useDHCP = lib.mkDefault true;

     

       26
       26
       +
       

     

       27
       27
       +
         nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

     

       28
       28
       +
         hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

     

       29
       29
       +
       

     

       30
       30
       +
         boot.loader.grub = {

     

       31
       31
       +
           enable = true;

     

       32
       32
       +
           device = "nodev";

     

       33
       33
       +
           efiSupport = true;

     

       34
       34
       +
           efiInstallAsRemovable = true;

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
         boot.kernelParams = [

     

       38
       38
       +
           "console=ttyS1,115200n8"

     

       39
       39
       +
         ];

     

       40
       40
       +
       }

+38 -2

hosts/owl/services.nix

···

       93
       93
        
           "capybara.fn06.org"

     

       94
       94
        
           "shrew.freumh.org"

     

       95
       95
        
           "knot.freumh.org"

     

       96
       96
       +
           "enki.freumh.org"

     

       96
       97
        
         ];

     

       97
       98
        
       

     

       98
       99
        
         # VPN

     
···

       268
       269
        
             proxyWebsockets = true;

     

       269
       270
        
           };

     

       270
       271
        
         };

     

       271
       271
       -
         

     

       272
       272
       +
       

     

       273
       273
       +
         services.nginx.virtualHosts."enki.freumh.org" = {

     

       274
       274
       +
           forceSSL = true;

     

       275
       275
       +
           locations."/" = {

     

       276
       276
       +
             proxyPass = ''

     

       277
       277
       +
               http://localhost:8000

     

       278
       278
       +
             '';

     

       279
       279
       +
             proxyWebsockets = true;

     

       280
       280
       +
             extraConfig = ''

     

       281
       281
       +
               # SSE-specific settings

     

       282
       282
       +
               proxy_buffering off;

     

       283
       283
       +
               proxy_read_timeout 3600s;

     

       284
       284
       +
               proxy_send_timeout 3600s;

     

       285
       285
       +
               proxy_connect_timeout 60s;

     

       286
       286
       +
       

     

       287
       287
       +
               # Forward headers

     

       288
       288
       +
               proxy_set_header Connection "";

     

       289
       289
       +
               proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

     

       290
       290
       +
               proxy_set_header X-Forwarded-Proto $scheme;

     

       291
       291
       +
               proxy_set_header Host $host;

     

       292
       292
       +
             '';

     

       293
       293
       +
           };

     

       294
       294
       +
         };

     

       295
       295
       +
       

     

       272
       296
        
         # minecraft server

     

       273
       297
        
         services.minecraft-server = {

     

       274
       298
        
           enable = true;

     
···

       359
       383
        
                 name = "knot";

     

       360
       384
        
                 type = "CNAME";

     

       361
       385
        
                 value = "vps";

     

       386
       386
       +
               }

     

       387
       387
       +
       

     

       388
       388
       +
               {

     

       389
       389
       +
                 name = "enki";

     

       390
       390
       +
                 type = "CNAME";

     

       391
       391
       +
                 value = "vps";

     

       392
       392
       +
               }

     

       393
       393
       +
       

     

       394
       394
       +
               {

     

       395
       395
       +
                 name = "hippo";

     

       396
       396
       +
                 type = "A";

     

       397
       397
       +
                 value = "128.232.124.251";

     

       362
       398
        
               }

     

       363
       399
        
       

     

       364
       400
        
               # generate with

     
···

       479
       515
        
             ];

     

       480
       516
        
           };

     

       481
       517
        
         };

     

       482
       482
       -
       }
     

       518
       518
       +
       }

Compare changes