comparing 7358ffec6ab9d0a1d03bbefd4ddc2435abf3e4be and master on ryan.freumh.org/nixos

+21

flake.lock

···

       102
        
               "type": "github"

     

       103
        
             }

     

       104
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       105
        
           "eilean": {

     

       106
        
             "inputs": {

     

       107
        
               "eon": [

     
···

       1109
        
               "agenix": "agenix",

     

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

     

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

     

       0
        
       
     

       1112
        
               "eilean": "eilean",

     

       1113
        
               "eon": "eon",

     

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

···

       102
        
               "type": "github"

     

       103
        
             }

     

       104
        
           },

     

       105
       +
           "disko": {

     

       106
       +
             "inputs": {

     

       107
       +
               "nixpkgs": [

     

       108
       +
                 "nixpkgs"

     

       109
       +
               ]

     

       110
       +
             },

     

       111
       +
             "locked": {

     

       112
       +
               "lastModified": 1743598667,

     

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

     

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

     

       115
       +
               "repo": "disko",

     

       116
       +
               "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6",

     

       117
       +
               "type": "github"

     

       118
       +
             },

     

       119
       +
             "original": {

     

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

     

       121
       +
               "repo": "disko",

     

       122
       +
               "type": "github"

     

       123
       +
             }

     

       124
       +
           },

     

       125
        
           "eilean": {

     

       126
        
             "inputs": {

     

       127
        
               "eon": [

     
···

       1129
        
               "agenix": "agenix",

     

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

     

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

     

       1132
       +
               "disko": "disko",

     

       1133
        
               "eilean": "eilean",

     

       1134
        
               "eon": "eon",

     

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

+3 -1

flake.nix

···

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

     

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

     

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

     

       0
        
       
     

       24
        
       

     

       25
        
           # deduplicate flake inputs

     

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

     
···

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

     

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

     

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

     

       0
        
       
     

       41
        
         };

     

       42
        
       

     

       43
        
         outputs =

     
···

       116
        
                       (

     

       117
        
                         { config, ... }:

     

       118
        
                         {

     

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

     

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

     

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

     

       122
        
                           system.stateVersion = "24.05";

···

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

     

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

     

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

     

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

     

       25
        
       

     

       26
        
           # deduplicate flake inputs

     

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

     
···

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

     

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

     

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

     

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

     

       43
        
         };

     

       44
        
       

     

       45
        
         outputs =

     
···

       118
        
                       (

     

       119
        
                         { config, ... }:

     

       120
        
                         {

     

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

     

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

     

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

     

       124
        
                           system.stateVersion = "24.05";

-6

home/default.nix

···

       231
        
                 unbind C-b

     

       232
        
                 set-option -g prefix C-a

     

       233
        
                 bind-key C-a send-prefix

     

       234
       -
       

     

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

     

       236
        
                 set-option -g mouse on

     

       237
        
                 set-option -g set-titles on

     
···

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

     

       246
        
                 # locking

     

       247
        
                 set -s escape-time 0

     

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

     

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

     

       250
       -
                 bind L lock-session

     

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

     

       252
        
                 set-option -g update-environment XDG_VTNR

     

       253
        
                 # Allow clipboard with OSC-52 work

     
···

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

     

       262
        
                 # reload

     

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

     

       264
       -
                 # kill unattached

     

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

     

       266
        
               '';

     

       267
        
           };

     

       268

···

       231
        
                 unbind C-b

     

       232
        
                 set-option -g prefix C-a

     

       233
        
                 bind-key C-a send-prefix

     

       0
        
       
     

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

     

       235
        
                 set-option -g mouse on

     

       236
        
                 set-option -g set-titles on

     
···

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

     

       245
        
                 # locking

     

       246
        
                 set -s escape-time 0

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       248
        
                 set-option -g update-environment XDG_VTNR

     

       249
        
                 # Allow clipboard with OSC-52 work

     
···

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

     

       258
        
                 # reload

     

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

     

       0
        
       
     

       0
        
       
     

       260
        
               '';

     

       261
        
           };

     

       262

-1

home/gui/sway.nix

···

       63
        
               export MOZ_ENABLE_WAYLAND=1

     

       64
        
               export MOZ_DBUS_REMOTE=1

     

       65
        
               export QT_STYLE_OVERRIDE="Fusion"

     

       66
       -
               export WLR_NO_HARDWARE_CURSORS=1

     

       67
        
               export NIXOS_OZONE_WL=1

     

       68
        
       

     

       69
        
               # for intellij

···

       63
        
               export MOZ_ENABLE_WAYLAND=1

     

       64
        
               export MOZ_DBUS_REMOTE=1

     

       65
        
               export QT_STYLE_OVERRIDE="Fusion"

     

       0
        
       
     

       66
        
               export NIXOS_OZONE_WL=1

     

       67
        
       

     

       68
        
               # for intellij

+3

home/zsh.cfg

···

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1
        
       

     

       2
        
       setopt autocd nomatch notify interactive_comments inc_append_history 

     

       3
        
       unsetopt beep extendedglob share_history

···

       1
       +
       

     

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

     

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

     

       4
        
       

     

       5
        
       setopt autocd nomatch notify interactive_comments inc_append_history 

     

       6
        
       unsetopt beep extendedglob share_history

+31

hosts/hippo/default.nix

···

       1
       +
       {

     

       2
       +
         pkgs,

     

       3
       +
         config,

     

       4
       +
         lib,

     

       5
       +
         disko,

     

       6
       +
         ...

     

       7
       +
       }:

     

       8
       +
       

     

       9
       +
       {

     

       10
       +
         imports = [

     

       11
       +
           ./hardware-configuration.nix

     

       12
       +
           disko.nixosModules.disko

     

       13
       +
           ./disk-config.nix

     

       14
       +
         ];

     

       15
       +
       

     

       16
       +
         custom = {

     

       17
       +
           enable = true;

     

       18
       +
           autoUpgrade.enable = true;

     

       19
       +
           homeManager.enable = true;

     

       20
       +
         };

     

       21
       +
       

     

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

     

       23
       +
       

     

       24
       +
         networking.hostName = "iphito";

     

       25
       +
       

     

       26
       +
         services.openssh.openFirewall = true;

     

       27
       +
       

     

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

     

       29
       +
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7UrJmBFWR3c7jVzpoyg4dJjON9c7t9bT9acfrj6G7i mtelvers"

     

       30
       +
         ];

     

       31
       +
       }

+33

hosts/hippo/disk-config.nix

···

       1
       +
       { lib, ... }:

     

       2
       +
       

     

       3
       +
       {

     

       4
       +
         disko.devices = {

     

       5
       +
           disk.disk1 = {

     

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

     

       7
       +
             type = "disk";

     

       8
       +
             content = {

     

       9
       +
               type = "gpt";

     

       10
       +
               partitions = {

     

       11
       +
                 ESP = {

     

       12
       +
                   type = "EF00";

     

       13
       +
                   size = "500M";

     

       14
       +
                   content = {

     

       15
       +
                     type = "filesystem";

     

       16
       +
                     format = "vfat";

     

       17
       +
                     mountpoint = "/boot";

     

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

     

       19
       +
                   };

     

       20
       +
                 };

     

       21
       +
                 root = {

     

       22
       +
                   size = "100%";

     

       23
       +
                   content = {

     

       24
       +
                     type = "filesystem";

     

       25
       +
                     format = "ext4";

     

       26
       +
                     mountpoint = "/";

     

       27
       +
                   };

     

       28
       +
                 };

     

       29
       +
               };

     

       30
       +
             };

     

       31
       +
           };

     

       32
       +
         };

     

       33
       +
       }

+40

hosts/hippo/hardware-configuration.nix

···

       1
       +
       {

     

       2
       +
         config,

     

       3
       +
         lib,

     

       4
       +
         pkgs,

     

       5
       +
         modulesPath,

     

       6
       +
         ...

     

       7
       +
       }:

     

       8
       +
       

     

       9
       +
       {

     

       10
       +
         imports = [

     

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

     

       12
       +
         ];

     

       13
       +
       

     

       14
       +
         boot.initrd.availableKernelModules = [

     

       15
       +
           "megaraid_sas"

     

       16
       +
           "xhci_pci"

     

       17
       +
           "nvme"

     

       18
       +
           "ahci"

     

       19
       +
           "sd_mod"

     

       20
       +
         ];

     

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

     

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

     

       23
       +
         boot.extraModulePackages = [ ];

     

       24
       +
       

     

       25
       +
         networking.useDHCP = lib.mkDefault true;

     

       26
       +
       

     

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

     

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

     

       29
       +
       

     

       30
       +
         boot.loader.grub = {

     

       31
       +
           enable = true;

     

       32
       +
           device = "nodev";

     

       33
       +
           efiSupport = true;

     

       34
       +
           efiInstallAsRemovable = true;

     

       35
       +
         };

     

       36
       +
       

     

       37
       +
         boot.kernelParams = [

     

       38
       +
           "console=ttyS1,115200n8"

     

       39
       +
         ];

     

       40
       +
       }

+8 -2

hosts/owl/services.nix

···

       269
        
             proxyWebsockets = true;

     

       270
        
           };

     

       271
        
         };

     

       272
       -
         

     

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

     

       274
        
           forceSSL = true;

     

       275
        
           locations."/" = {

     
···

       391
        
                 value = "vps";

     

       392
        
               }

     

       393
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       394
        
               # generate with

     

       395
        
               #   sudo openssl x509 -in /var/lib/acme/mail.freumh.org/fullchain.pem -pubkey -noout | openssl pkey -pubin -outform der | sha256sum | awk '{print "3 1 1", $1}'

     

       396
        
               {

     
···

       509
        
             ];

     

       510
        
           };

     

       511
        
         };

     

       512
       -
       }

···

       269
        
             proxyWebsockets = true;

     

       270
        
           };

     

       271
        
         };

     

       272
       +
       

     

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

     

       274
        
           forceSSL = true;

     

       275
        
           locations."/" = {

     
···

       391
        
                 value = "vps";

     

       392
        
               }

     

       393
        
       

     

       394
       +
               {

     

       395
       +
                 name = "hippo";

     

       396
       +
                 type = "A";

     

       397
       +
                 value = "128.232.124.251";

     

       398
       +
               }

     

       399
       +
       

     

       400
        
               # generate with

     

       401
        
               #   sudo openssl x509 -in /var/lib/acme/mail.freumh.org/fullchain.pem -pubkey -noout | openssl pkey -pubin -outform der | sha256sum | awk '{print "3 1 1", $1}'

     

       402
        
               {

     
···

       515
        
             ];

     

       516
        
           };

     

       517
        
         };

     

       518
       +
       }

Compare changes