comparing 355cf57a1cac565a1540a90df535111b0e0418a7 and main on ovyerus.com/dotfiles

-105

darwin/shimmer/configuration.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         config,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         inputs,

     

       5
       5
       -
         pkgs,

     

       6
       6
       -
         ...

     

       7
       7
       -
       }: {

     

       8
       8
       -
         imports = [./homebrew.nix ./wm.nix ../../modules/nixpkgs.nix];

     

       9
       9
       -
       

     

       10
       10
       -
         nixpkgs.hostPlatform = "aarch64-darwin";

     

       11
       11
       -
       

     

       12
       12
       -
         # Nix setup

     

       13
       13
       -
         nix.distributedBuilds = true;

     

       14
       14
       -
       

     

       15
       15
       -
         nix.gc = {

     

       16
       16
       -
           automatic = true;

     

       17
       17
       -
           options = "--delete-older-than 7d";

     

       18
       18
       -
           interval.Weekday = 6;

     

       19
       19
       -
         };

     

       20
       20
       -
       

     

       21
       21
       -
         nix.optimise.automatic = true;

     

       22
       22
       -
       

     

       23
       23
       -
         nix.settings = {

     

       24
       24
       -
           builders-use-substitutes = true;

     

       25
       25
       -
           experimental-features = "nix-command flakes";

     

       26
       26
       -
           trusted-users = ["root" "ovy"];

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       29
       -
         environment.systemPackages = with pkgs; [

     

       30
       30
       -
           ffmpeg-full

     

       31
       31
       -
           git

     

       32
       32
       -
           imagemagick

     

       33
       33
       -
           nil

     

       34
       34
       -
           obsidian

     

       35
       35
       -
           openssh

     

       36
       36
       -
           wget

     

       37
       37
       -
           # TODO: the Xcode packages makes us manually download and put it into the Nix store

     

       38
       38
       -
           # but it seems to contain no reference to our actual result so I don't think `systemPackages`

     

       39
       39
       -
           # picks it up properly.  Need to see how `requireFile` works and how `systemPackages`

     

       40
       40
       -
           # works under the hood.

     

       41
       41
       -
           # darwin.xcode_14_1

     

       42
       42
       -
         ];

     

       43
       43
       -
       

     

       44
       44
       -
         programs.bash.enable = true;

     

       45
       45
       -
         programs.zsh.enable = true;

     

       46
       46
       -
         programs.fish.enable = true;

     

       47
       47
       -
       

     

       48
       48
       -
         # Fix problem in nix-darwin relating to $PATH order in fish.

     

       49
       49
       -
         # https://github.com/LnL7/nix-darwin/issues/122#issuecomment-1659465635

     

       50
       50
       -
         programs.fish.loginShellInit = let

     

       51
       51
       -
           dquote = str: "\"${str}\"";

     

       52
       52
       -
           makeBinPathList = map (path: path + "/bin");

     

       53
       53
       -
         in ''

     

       54
       54
       -
           fish_add_path --move --prepend --path ${lib.concatMapStringsSep " " dquote (makeBinPathList config.environment.profiles)}

     

       55
       55
       -
           set fish_user_paths $fish_user_paths

     

       56
       56
       -
           fish_add_path /opt/homebrew/bin

     

       57
       57
       -
           alias tailscale /Applications/Tailscale.app/Contents/MacOS/Tailscale

     

       58
       58
       -
         '';

     

       59
       59
       -
       

     

       60
       60
       -
         nix.buildMachines = [

     

       61
       61
       -
           {

     

       62
       62
       -
             hostName = "rushing.axolotl-map.ts.net";

     

       63
       63
       -
             sshUser = "colmena-deploy";

     

       64
       64
       -
             system = "x86_64-linux";

     

       65
       65
       -
             speedFactor = 2;

     

       66
       66
       -
             maxJobs = 6;

     

       67
       67
       -
             protocol = "ssh-ng";

     

       68
       68
       -
           }

     

       69
       69
       -
           {

     

       70
       70
       -
             hostName = "skyline.axolotl-map.ts.net";

     

       71
       71
       -
             sshUser = "colmena-deploy";

     

       72
       72
       -
             system = "aarch64-linux";

     

       73
       73
       -
             speedFactor = 1;

     

       74
       74
       -
             maxJobs = 2;

     

       75
       75
       -
             protocol = "ssh-ng";

     

       76
       76
       -
           }

     

       77
       77
       -
         ];

     

       78
       78
       -
       

     

       79
       79
       -
         # nix-darwin

     

       80
       80
       -
         system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null;

     

       81
       81
       -
         # Used for backwards compatibility, please read the changelog before changing.

     

       82
       82
       -
         # $ darwin-rebuild changelog

     

       83
       83
       -
         system.stateVersion = 4;

     

       84
       84
       -
       

     

       85
       85
       -
         system.defaults.NSGlobalDomain.AppleShowAllExtensions = true;

     

       86
       86
       -
         system.defaults.finder.ShowPathbar = true;

     

       87
       87
       -
         system.defaults.menuExtraClock.Show24Hour = true;

     

       88
       88
       -
         system.defaults.trackpad.Dragging = true;

     

       89
       89
       -
       

     

       90
       90
       -
         # Dock settings

     

       91
       91
       -
         system.defaults.dock = {

     

       92
       92
       -
           autohide = false;

     

       93
       93
       -
           magnification = false;

     

       94
       94
       -
           minimize-to-application = false;

     

       95
       95
       -
           mru-spaces = false;

     

       96
       96
       -
           orientation = "bottom";

     

       97
       97
       -
           show-recents = false;

     

       98
       98
       -
           tilesize = 48;

     

       99
       99
       -
         };

     

       100
       100
       -
       

     

       101
       101
       -
         fonts.packages = with pkgs; [

     

       102
       102
       -
           inter

     

       103
       103
       -
           inputs.iosevka-solai.packages.aarch64-darwin.bin

     

       104
       104
       -
         ];

     

       105
       105
       -
       }

-49

darwin/shimmer/homebrew.nix

···

       1
       1
       -
       {...}: {

     

       2
       2
       -
         homebrew = {

     

       3
       3
       -
           enable = true;

     

       4
       4
       -
           # Update and cleanup homebrew packages when rebuilding.

     

       5
       5
       -
           global.autoUpdate = false;

     

       6
       6
       -
           onActivation.autoUpdate = true;

     

       7
       7
       -
           onActivation.upgrade = true;

     

       8
       8
       -
           onActivation.cleanup = "zap";

     

       9
       9
       -
       

     

       10
       10
       -
           taps = [

     

       11
       11
       -
             "homebrew/cask-versions"

     

       12
       12
       -
             "ovyerus/klog"

     

       13
       13
       -
             "ovyerus/tap"

     

       14
       14
       -
           ];

     

       15
       15
       -
       

     

       16
       16
       -
           brews = [

     

       17
       17
       -
             "bitwarden-cli"

     

       18
       18
       -
             "klog"

     

       19
       19
       -
             "mas"

     

       20
       20
       -
             "swiftformat"

     

       21
       21
       -
             "xcbeautify"

     

       22
       22
       -
             "xcodegen"

     

       23
       23
       -
           ];

     

       24
       24
       -
       

     

       25
       25
       -
           casks = [

     

       26
       26
       -
             "1password"

     

       27
       27
       -
             "discord"

     

       28
       28
       -
             "figma"

     

       29
       29
       -
             "httpie"

     

       30
       30
       -
             "insomnia"

     

       31
       31
       -
             "iterm2"

     

       32
       32
       -
             "karabiner-elements"

     

       33
       33
       -
             "maccy"

     

       34
       34
       -
             "orbstack"

     

       35
       35
       -
             # Actually searches symlinks for apps, compared to Alfred.

     

       36
       36
       -
             "raycast"

     

       37
       37
       -
             "swiftformat-for-xcode"

     

       38
       38
       -
             "visual-studio-code"

     

       39
       39
       -
             # "vorta"

     

       40
       40
       -
           ];

     

       41
       41
       -
       

     

       42
       42
       -
           masApps = {

     

       43
       43
       -
             Keka = 470158793;

     

       44
       44
       -
             "Yubico Authenticator" = 1497506650;

     

       45
       45
       -
             "System Color Picker" = 1545870783;

     

       46
       46
       -
             Tailsacle = 1475387142;

     

       47
       47
       -
           };

     

       48
       48
       -
         };

     

       49
       49
       -
       }

-89

darwin/shimmer/wm.nix

···

       1
       1
       -
       {lib, ...}: {

     

       2
       2
       -
         services.yabai = {

     

       3
       3
       -
           enable = true;

     

       4
       4
       -
           config = let

     

       5
       5
       -
             gap = 10;

     

       6
       6
       -
             gapKeys = [

     

       7
       7
       -
               "window_gap"

     

       8
       8
       -
               "top_padding"

     

       9
       9
       -
               "bottom_padding"

     

       10
       10
       -
               "left_padding"

     

       11
       11
       -
               "right_padding"

     

       12
       12
       -
             ];

     

       13
       13
       -
       

     

       14
       14
       -
             gaps = builtins.listToAttrs (

     

       15
       15
       -
               builtins.map (k: lib.attrsets.nameValuePair k gap) gapKeys

     

       16
       16
       -
             );

     

       17
       17
       -
           in

     

       18
       18
       -
             {

     

       19
       19
       -
               layout = "bsp";

     

       20
       20
       -
               window_placement = "second_child";

     

       21
       21
       -
             }

     

       22
       22
       -
             // gaps;

     

       23
       23
       -
           extraConfig = ''

     

       24
       24
       -
             yabai -m rule --add app="Bitwarden"               manage=off

     

       25
       25
       -
             yabai -m rule --add app="Discord"                 manage=off

     

       26
       26
       -
             yabai -m rule --add app="^Finder$"                manage=off

     

       27
       27
       -
             yabai -m rule --add app="Keka"                    manage=off

     

       28
       28
       -
             yabai -m rule --add app="^System Information$"    manage=off

     

       29
       29
       -
             yabai -m rule --add app="^System Preferences$"    manage=off

     

       30
       30
       -
             yabai -m rule --add app="^System Settings$"       manage=off

     

       31
       31
       -
             yabai -m rule --add title="Preferences$"          manage=off

     

       32
       32
       -
             yabai -m rule --add title="^Archive Utility$"     manage=off

     

       33
       33
       -
             yabai -m rule --add title="Settings$"             manage=off

     

       34
       34
       -
             yabai -m rule --add title="Karabiner"             manage=off

     

       35
       35
       -
             yabai -m rule --add title="^Weather$"             manage=off

     

       36
       36
       -
             yabai -m rule --add title="Yubico Authenticator"  manage=off

     

       37
       37
       -
             yabai -m rule --add app="Rewind"                  manage=off

     

       38
       38
       -
             yabai -m rule --add app="eqMac"                   manage=off

     

       39
       39
       -
             yabai -m rule --add app="^Arc$"                   manage=off

     

       40
       40
       -
             yabai -m rule --add app="OBS"                     manage=off

     

       41
       41
       -
             yabai -m rule --add app="Raycast"                 manage=off

     

       42
       42
       -
           '';

     

       43
       43
       -
         };

     

       44
       44
       -
       

     

       45
       45
       -
         services.skhd = {

     

       46
       46
       -
           enable = true;

     

       47
       47
       -
           skhdConfig = ''

     

       48
       48
       -
             # Move/swap windows

     

       49
       49
       -
             meh - w : yabai -m window --swap north

     

       50
       50
       -
             meh - a : yabai -m window --swap west

     

       51
       51
       -
             meh - r : yabai -m window --swap south

     

       52
       52
       -
             meh - s : yabai -m window --swap east

     

       53
       53
       -
       

     

       54
       54
       -
             hyper - w : yabai -m window --warp north

     

       55
       55
       -
             hyper - a : yabai -m window --warp west

     

       56
       56
       -
             hyper - r : yabai -m window --warp south

     

       57
       57
       -
             hyper - s : yabai -m window --warp east

     

       58
       58
       -
       

     

       59
       59
       -
             # Focus windows

     

       60
       60
       -
             ralt + rcmd - w : yabai -m window --focus north

     

       61
       61
       -
             ralt + rcmd - a : yabai -m window --focus west

     

       62
       62
       -
             ralt + rcmd - r : yabai -m window --focus south

     

       63
       63
       -
             ralt + rcmd - s : yabai -m window --focus east

     

       64
       64
       -
       

     

       65
       65
       -
             # Increase window size

     

       66
       66
       -
             meh - n : yabai -m window --resize left:-100:0

     

       67
       67
       -
             meh - e : yabai -m window --resize bottom:0:100

     

       68
       68
       -
             meh - i : yabai -m window --resize top:0:-100

     

       69
       69
       -
             meh - o : yabai -m window --resize right:100:0

     

       70
       70
       -
       

     

       71
       71
       -
             # Decrease window size

     

       72
       72
       -
             hyper - n : yabai -m window --resize right:-100:0

     

       73
       73
       -
             hyper - e : yabai -m window --resize top:0:100

     

       74
       74
       -
             hyper - i : yabai -m window --resize bottom:0:-100

     

       75
       75
       -
             hyper - o : yabai -m window --resize left:100:0

     

       76
       76
       -
       

     

       77
       77
       -
             # Expand floating window to fill screen

     

       78
       78
       -
             # (full stop)

     

       79
       79
       -
             meh - 0x2F : yabai -m window --grid 1:1:0:0:1:1

     

       80
       80
       -
       

     

       81
       81
       -
             meh - p : yabai -m window --toggle float; \

     

       82
       82
       -
                       yabai -m window --grid 4:4:1:1:2:2

     

       83
       83
       -
       

     

       84
       84
       -
             # Rebalance grid

     

       85
       85
       -
             # (backtick)

     

       86
       86
       -
             hyper - 0x32 : yabai -m space --balance

     

       87
       87
       -
           '';

     

       88
       88
       -
         };

     

       89
       89
       -
       }

+4 -2

files/karabiner/keybind-helpers.json

···

       13
       13
        
                         "description": "MacBook internal keyboard",

     

       14
       14
        
                         "vendor_id": 1452,

     

       15
       15
        
                         "product_id": 641

     

       16
       16
       -
                       }

     

       16
       16
       +
                       },

     

       17
       17
       +
                       { "is_built_in_keyboard": true }

     

       17
       18
        
                     ]

     

       18
       19
        
                   }

     

       19
       20
        
                 ],

     
···

       50
       51
        
                         "description": "MacBook internal keyboard",

     

       51
       52
        
                         "vendor_id": 1452,

     

       52
       53
        
                         "product_id": 641

     

       53
       53
       -
                       }

     

       54
       54
       +
                       },

     

       55
       55
       +
                       { "is_built_in_keyboard": true }

     

       54
       56
        
                     ]

     

       55
       57
        
                   }

     

       56
       58
        
                 ],

files/nixpkgs-config.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         allowUnfree = true;

     

       3
       3
       +
       }

+115 -114

flake.lock

···

       5
       5
        
               "home-manager": [

     

       6
       6
        
                 "home-manager"

     

       7
       7
        
               ],

     

       8
       8
       -
               "nix-darwin": "nix-darwin",

     

       8
       8
       +
               "nix-darwin": [

     

       9
       9
       +
                 "nix-darwin"

     

       10
       10
       +
               ],

     

       9
       11
        
               "nixpkgs": [

     

       10
       12
        
                 "nixpkgs"

     

       11
       13
        
               ],

     

       14
       14
       +
               "nixpkgs-lib": "nixpkgs-lib",

     

       12
       15
        
               "pre-commit-hooks": "pre-commit-hooks"

     

       13
       16
        
             },

     

       14
       17
        
             "locked": {

     

       15
       15
       -
               "lastModified": 1749374482,

     

       16
       16
       -
               "narHash": "sha256-IAyAgmxZ+8YUPkyxn6gvCUZiV93dX6oLmcOOCSU9We4=",

     

       18
       18
       +
               "lastModified": 1758123851,

     

       19
       19
       +
               "narHash": "sha256-sbKwqBOLI423TvXvzlX2UGZR4pE1M8C7KXi0699ImmQ=",

     

       17
       20
        
               "owner": "yunfachi",

     

       18
       21
        
               "repo": "denix",

     

       19
       19
       -
               "rev": "5a27d210ee6ff79375731a515810a02c6bb8b0d4",

     

       22
       22
       +
               "rev": "d90f816b7b93304e5d5e69d429de0052f64d5149",

     

       20
       23
        
               "type": "github"

     

       21
       24
        
             },

     

       22
       25
        
             "original": {

     
···

       28
       31
        
           "flake-compat": {

     

       29
       32
        
             "flake": false,

     

       30
       33
        
             "locked": {

     

       31
       31
       -
               "lastModified": 1696426674,

     

       32
       32
       -
               "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",

     

       34
       34
       +
               "lastModified": 1747046372,

     

       35
       35
       +
               "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",

     

       33
       36
        
               "owner": "edolstra",

     

       34
       37
        
               "repo": "flake-compat",

     

       35
       35
       -
               "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",

     

       38
       38
       +
               "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",

     

       36
       39
        
               "type": "github"

     

       37
       40
        
             },

     

       38
       41
        
             "original": {

     
···

       77
       80
        
               "type": "github"

     

       78
       81
        
             }

     

       79
       82
        
           },

     

       80
       80
       -
           "flake-utils_3": {

     

       81
       81
       -
             "inputs": {

     

       82
       82
       -
               "systems": "systems_3"

     

       83
       83
       -
             },

     

       84
       84
       -
             "locked": {

     

       85
       85
       -
               "lastModified": 1731533236,

     

       86
       86
       -
               "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",

     

       87
       87
       -
               "owner": "numtide",

     

       88
       88
       -
               "repo": "flake-utils",

     

       89
       89
       -
               "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",

     

       90
       90
       -
               "type": "github"

     

       91
       91
       -
             },

     

       92
       92
       -
             "original": {

     

       93
       93
       -
               "owner": "numtide",

     

       94
       94
       -
               "repo": "flake-utils",

     

       95
       95
       -
               "type": "github"

     

       96
       96
       -
             }

     

       97
       97
       -
           },

     

       98
       83
        
           "flakey-profile": {

     

       99
       84
        
             "locked": {

     

       100
       85
        
               "lastModified": 1712898590,

     
···

       139
       124
        
               ]

     

       140
       125
        
             },

     

       141
       126
        
             "locked": {

     

       142
       142
       -
               "lastModified": 1749526396,

     

       143
       143
       -
               "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=",

     

       127
       127
       +
               "lastModified": 1765480374,

     

       128
       128
       +
               "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",

     

       144
       129
        
               "owner": "nix-community",

     

       145
       130
        
               "repo": "home-manager",

     

       146
       146
       -
               "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044",

     

       131
       131
       +
               "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",

     

       147
       132
        
               "type": "github"

     

       148
       133
        
             },

     

       149
       134
        
             "original": {

     
···

       201
       186
        
               "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",

     

       202
       187
        
               "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe",

     

       203
       188
        
               "type": "tarball",

     

       204
       204
       -
               "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe"

     

       189
       189
       +
               "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz"

     

       205
       190
        
             },

     

       206
       191
        
             "original": {

     

       207
       192
        
               "type": "tarball",

     
···

       220
       205
        
               "xwayland-satellite-unstable": "xwayland-satellite-unstable"

     

       221
       206
        
             },

     

       222
       207
        
             "locked": {

     

       223
       223
       -
               "lastModified": 1749533158,

     

       224
       224
       -
               "narHash": "sha256-wIw3Q/Ls1nsLjBN4VsAiTMHZiyf5RGRVy2MWfyYPgMI=",

     

       208
       208
       +
               "lastModified": 1765528203,

     

       209
       209
       +
               "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=",

     

       225
       210
        
               "owner": "sodiboo",

     

       226
       211
        
               "repo": "niri-flake",

     

       227
       227
       -
               "rev": "e5c4564ec3704f5e358f50d883b5200c4e8dfd7e",

     

       212
       212
       +
               "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3",

     

       228
       213
        
               "type": "github"

     

       229
       214
        
             },

     

       230
       215
        
             "original": {

     
···

       236
       221
        
           "niri-stable": {

     

       237
       222
        
             "flake": false,

     

       238
       223
        
             "locked": {

     

       239
       239
       -
               "lastModified": 1740117926,

     

       240
       240
       -
               "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",

     

       224
       224
       +
               "lastModified": 1756556321,

     

       225
       225
       +
               "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",

     

       241
       226
        
               "owner": "YaLTeR",

     

       242
       227
        
               "repo": "niri",

     

       243
       243
       -
               "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",

     

       228
       228
       +
               "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",

     

       244
       229
        
               "type": "github"

     

       245
       230
        
             },

     

       246
       231
        
             "original": {

     

       247
       232
        
               "owner": "YaLTeR",

     

       248
       248
       -
               "ref": "v25.02",

     

       233
       233
       +
               "ref": "v25.08",

     

       249
       234
        
               "repo": "niri",

     

       250
       235
        
               "type": "github"

     

       251
       236
        
             }

     
···

       253
       238
        
           "niri-unstable": {

     

       254
       239
        
             "flake": false,

     

       255
       240
        
             "locked": {

     

       256
       256
       -
               "lastModified": 1749474820,

     

       257
       257
       -
               "narHash": "sha256-hf5eCZ0bbqwOKPvPKn8Rutwj+xs3GhAfB0AjGa8tIEM=",

     

       241
       241
       +
               "lastModified": 1765524373,

     

       242
       242
       +
               "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=",

     

       258
       243
        
               "owner": "YaLTeR",

     

       259
       244
        
               "repo": "niri",

     

       260
       260
       -
               "rev": "a18d24fc24d8b17242e336ccf39fcbe91e8161fd",

     

       245
       245
       +
               "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743",

     

       261
       246
        
               "type": "github"

     

       262
       247
        
             },

     

       263
       248
        
             "original": {

     
···

       269
       254
        
           "nix-darwin": {

     

       270
       255
        
             "inputs": {

     

       271
       256
        
               "nixpkgs": [

     

       272
       272
       -
                 "denix",

     

       273
       257
        
                 "nixpkgs"

     

       274
       258
        
               ]

     

       275
       259
        
             },

     

       276
       260
        
             "locked": {

     

       277
       277
       -
               "lastModified": 1746254942,

     

       278
       278
       -
               "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=",

     

       279
       279
       -
               "owner": "nix-darwin",

     

       261
       261
       +
               "lastModified": 1765065051,

     

       262
       262
       +
               "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=",

     

       263
       263
       +
               "owner": "LnL7",

     

       280
       264
        
               "repo": "nix-darwin",

     

       281
       281
       -
               "rev": "760a11c87009155afa0140d55c40e7c336d62d7a",

     

       265
       265
       +
               "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79",

     

       282
       266
        
               "type": "github"

     

       283
       267
        
             },

     

       284
       268
        
             "original": {

     
···

       287
       271
        
               "type": "github"

     

       288
       272
        
             }

     

       289
       273
        
           },

     

       290
       290
       -
           "nix-darwin_2": {

     

       291
       291
       -
             "inputs": {

     

       292
       292
       -
               "nixpkgs": [

     

       293
       293
       -
                 "nixpkgs"

     

       294
       294
       -
               ]

     

       295
       295
       -
             },

     

       296
       296
       -
             "locked": {

     

       297
       297
       -
               "lastModified": 1749194393,

     

       298
       298
       -
               "narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=",

     

       299
       299
       -
               "owner": "LnL7",

     

       300
       300
       -
               "repo": "nix-darwin",

     

       301
       301
       -
               "rev": "19346808c445f23b08652971be198b9df6c33edc",

     

       302
       302
       -
               "type": "github"

     

       303
       303
       -
             },

     

       304
       304
       -
             "original": {

     

       305
       305
       -
               "owner": "LnL7",

     

       306
       306
       -
               "repo": "nix-darwin",

     

       307
       307
       -
               "type": "github"

     

       308
       308
       -
             }

     

       309
       309
       -
           },

     

       310
       274
        
           "nix-index-database": {

     

       311
       275
        
             "inputs": {

     

       312
       276
        
               "nixpkgs": [

     
···

       314
       278
        
               ]

     

       315
       279
        
             },

     

       316
       280
        
             "locked": {

     

       317
       317
       -
               "lastModified": 1749355504,

     

       318
       318
       -
               "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=",

     

       281
       281
       +
               "lastModified": 1765267181,

     

       282
       282
       +
               "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",

     

       319
       283
        
               "owner": "nix-community",

     

       320
       284
        
               "repo": "nix-index-database",

     

       321
       321
       -
               "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94",

     

       285
       285
       +
               "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",

     

       322
       286
        
               "type": "github"

     

       323
       287
        
             },

     

       324
       288
        
             "original": {

     
···

       329
       293
        
           },

     

       330
       294
        
           "nix-vscode-extensions": {

     

       331
       295
        
             "inputs": {

     

       332
       332
       -
               "flake-utils": "flake-utils_3",

     

       333
       333
       -
               "nixpkgs": "nixpkgs"

     

       296
       296
       +
               "nixpkgs": "nixpkgs_2"

     

       334
       297
        
             },

     

       335
       298
        
             "locked": {

     

       336
       336
       -
               "lastModified": 1749521131,

     

       337
       337
       -
               "narHash": "sha256-ezZ15tLA2L+rmtn39dKLFW/UM2xlksC61V12blulpjE=",

     

       299
       299
       +
               "lastModified": 1765505053,

     

       300
       300
       +
               "narHash": "sha256-nDMsy5cVXs4iShqoLt8gCz/s1LdVxsaUFsTuSY/22rg=",

     

       338
       301
        
               "owner": "nix-community",

     

       339
       302
        
               "repo": "nix-vscode-extensions",

     

       340
       340
       -
               "rev": "299b2aa650d32310153746135b6a84a6c4de9c21",

     

       303
       303
       +
               "rev": "1778f178603ed65b4e4033c64f04ea51142ad6f6",

     

       341
       304
        
               "type": "github"

     

       342
       305
        
             },

     

       343
       306
        
             "original": {

     
···

       348
       311
        
           },

     

       349
       312
        
           "nixpkgs": {

     

       350
       313
        
             "locked": {

     

       351
       351
       -
               "lastModified": 1744868846,

     

       352
       352
       -
               "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=",

     

       314
       314
       +
               "lastModified": 1754340878,

     

       315
       315
       +
               "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",

     

       353
       316
        
               "owner": "NixOS",

     

       354
       317
        
               "repo": "nixpkgs",

     

       355
       355
       -
               "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",

     

       318
       318
       +
               "rev": "cab778239e705082fe97bb4990e0d24c50924c04",

     

       356
       319
        
               "type": "github"

     

       357
       320
        
             },

     

       358
       321
        
             "original": {

     

       359
       322
        
               "owner": "NixOS",

     

       323
       323
       +
               "ref": "nixpkgs-unstable",

     

       360
       324
        
               "repo": "nixpkgs",

     

       361
       361
       -
               "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c",

     

       325
       325
       +
               "type": "github"

     

       326
       326
       +
             }

     

       327
       327
       +
           },

     

       328
       328
       +
           "nixpkgs-lib": {

     

       329
       329
       +
             "locked": {

     

       330
       330
       +
               "lastModified": 1754184128,

     

       331
       331
       +
               "narHash": "sha256-AjhoyBL4eSyXf01Bmc6DiuaMrJRNdWopmdnMY0Pa/M0=",

     

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

     

       333
       333
       +
               "repo": "nixpkgs.lib",

     

       334
       334
       +
               "rev": "02e72200e6d56494f4a7c0da8118760736e41b60",

     

       335
       335
       +
               "type": "github"

     

       336
       336
       +
             },

     

       337
       337
       +
             "original": {

     

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

     

       339
       339
       +
               "repo": "nixpkgs.lib",

     

       362
       340
        
               "type": "github"

     

       363
       341
        
             }

     

       364
       342
        
           },

     

       365
       343
        
           "nixpkgs-stable": {

     

       366
       344
        
             "locked": {

     

       367
       367
       -
               "lastModified": 1749237914,

     

       368
       368
       -
               "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",

     

       345
       345
       +
               "lastModified": 1765311797,

     

       346
       346
       +
               "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",

     

       369
       347
        
               "owner": "NixOS",

     

       370
       348
        
               "repo": "nixpkgs",

     

       371
       371
       -
               "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",

     

       349
       349
       +
               "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",

     

       372
       350
        
               "type": "github"

     

       373
       351
        
             },

     

       374
       352
        
             "original": {

     

       375
       353
        
               "owner": "NixOS",

     

       376
       376
       -
               "ref": "nixos-25.05",

     

       354
       354
       +
               "ref": "nixos-25.11",

     

       355
       355
       +
               "ref": "nixos-25.11",

     

       377
       356
        
               "repo": "nixpkgs",

     

       378
       357
        
               "type": "github"

     

       379
       358
        
             }

     

       380
       359
        
           },

     

       381
       360
        
           "nixpkgs_2": {

     

       382
       361
        
             "locked": {

     

       383
       383
       -
               "lastModified": 1749285348,

     

       384
       384
       -
               "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",

     

       362
       362
       +
               "lastModified": 1759770925,

     

       363
       363
       +
               "narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=",

     

       364
       364
       +
               "owner": "nixos",

     

       365
       365
       +
               "repo": "nixpkgs",

     

       366
       366
       +
               "rev": "674c2b09c59a220204350ced584cadaacee30038",

     

       367
       367
       +
               "type": "github"

     

       368
       368
       +
             },

     

       369
       369
       +
             "original": {

     

       385
       370
        
               "owner": "nixos",

     

       386
       371
        
               "repo": "nixpkgs",

     

       387
       387
       -
               "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",

     

       372
       372
       +
               "rev": "674c2b09c59a220204350ced584cadaacee30038",

     

       373
       373
       +
               "type": "github"

     

       374
       374
       +
             }

     

       375
       375
       +
           },

     

       376
       376
       +
           "nixpkgs_3": {

     

       377
       377
       +
             "locked": {

     

       378
       378
       +
               "lastModified": 1765186076,

     

       379
       379
       +
               "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",

     

       380
       380
       +
               "owner": "nixos",

     

       381
       381
       +
               "repo": "nixpkgs",

     

       382
       382
       +
               "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",

     

       388
       383
        
               "type": "github"

     

       389
       384
        
             },

     

       390
       385
        
             "original": {

     
···

       398
       393
        
             "inputs": {

     

       399
       394
        
               "flake-compat": "flake-compat",

     

       400
       395
        
               "gitignore": "gitignore",

     

       401
       401
       -
               "nixpkgs": [

     

       402
       402
       -
                 "denix",

     

       403
       403
       -
                 "nixpkgs"

     

       404
       404
       -
               ]

     

       396
       396
       +
               "nixpkgs": "nixpkgs"

     

       405
       397
        
             },

     

       406
       398
        
             "locked": {

     

       407
       407
       -
               "lastModified": 1746537231,

     

       408
       408
       -
               "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",

     

       399
       399
       +
               "lastModified": 1754416808,

     

       400
       400
       +
               "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=",

     

       409
       401
        
               "owner": "cachix",

     

       410
       402
        
               "repo": "git-hooks.nix",

     

       411
       411
       -
               "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",

     

       403
       403
       +
               "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864",

     

       412
       404
        
               "type": "github"

     

       413
       405
        
             },

     

       414
       406
        
             "original": {

     
···

       424
       416
        
               "iosevka-solai": "iosevka-solai",

     

       425
       417
        
               "lix-module": "lix-module",

     

       426
       418
        
               "niri-flake": "niri-flake",

     

       427
       427
       -
               "nix-darwin": "nix-darwin_2",

     

       419
       419
       +
               "nix-darwin": "nix-darwin",

     

       428
       420
        
               "nix-index-database": "nix-index-database",

     

       429
       421
        
               "nix-vscode-extensions": "nix-vscode-extensions",

     

       430
       430
       -
               "nixpkgs": "nixpkgs_2"

     

       422
       422
       +
               "nixpkgs": "nixpkgs_3",

     

       423
       423
       +
               "zen-browser": "zen-browser"

     

       431
       424
        
             }

     

       432
       425
        
           },

     

       433
       426
        
           "systems": {

     
···

       460
       453
        
               "type": "github"

     

       461
       454
        
             }

     

       462
       455
        
           },

     

       463
       463
       -
           "systems_3": {

     

       456
       456
       +
           "xwayland-satellite-stable": {

     

       457
       457
       +
             "flake": false,

     

       464
       458
        
             "locked": {

     

       465
       465
       -
               "lastModified": 1681028828,

     

       466
       466
       -
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       467
       467
       -
               "owner": "nix-systems",

     

       468
       468
       -
               "repo": "default",

     

       469
       469
       -
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       459
       459
       +
               "lastModified": 1755491097,

     

       460
       460
       +
               "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",

     

       461
       461
       +
               "owner": "Supreeeme",

     

       462
       462
       +
               "repo": "xwayland-satellite",

     

       463
       463
       +
               "rev": "388d291e82ffbc73be18169d39470f340707edaa",

     

       470
       464
        
               "type": "github"

     

       471
       465
        
             },

     

       472
       466
        
             "original": {

     

       473
       473
       -
               "owner": "nix-systems",

     

       474
       474
       -
               "repo": "default",

     

       467
       467
       +
               "owner": "Supreeeme",

     

       468
       468
       +
               "ref": "v0.7",

     

       469
       469
       +
               "repo": "xwayland-satellite",

     

       475
       470
        
               "type": "github"

     

       476
       471
        
             }

     

       477
       472
        
           },

     

       478
       478
       -
           "xwayland-satellite-stable": {

     

       473
       473
       +
           "xwayland-satellite-unstable": {

     

       479
       474
        
             "flake": false,

     

       480
       475
        
             "locked": {

     

       481
       481
       -
               "lastModified": 1739246919,

     

       482
       482
       -
               "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",

     

       476
       476
       +
               "lastModified": 1765343581,

     

       477
       477
       +
               "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=",

     

       483
       478
        
               "owner": "Supreeeme",

     

       484
       479
        
               "repo": "xwayland-satellite",

     

       485
       485
       -
               "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",

     

       480
       480
       +
               "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",

     

       486
       481
        
               "type": "github"

     

       487
       482
        
             },

     

       488
       483
        
             "original": {

     

       489
       484
        
               "owner": "Supreeeme",

     

       490
       490
       -
               "ref": "v0.5.1",

     

       491
       485
        
               "repo": "xwayland-satellite",

     

       492
       486
        
               "type": "github"

     

       493
       487
        
             }

     

       494
       488
        
           },

     

       495
       495
       -
           "xwayland-satellite-unstable": {

     

       496
       496
       -
             "flake": false,

     

       489
       489
       +
           "zen-browser": {

     

       490
       490
       +
             "inputs": {

     

       491
       491
       +
               "nixpkgs": [

     

       492
       492
       +
                 "nixpkgs"

     

       493
       493
       +
               ]

     

       494
       494
       +
             },

     

       497
       495
        
             "locked": {

     

       498
       498
       -
               "lastModified": 1749315541,

     

       499
       499
       -
               "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",

     

       500
       500
       -
               "owner": "Supreeeme",

     

       501
       501
       -
               "repo": "xwayland-satellite",

     

       502
       502
       -
               "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",

     

       496
       496
       +
               "lastModified": 1764648680,

     

       497
       497
       +
               "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=",

     

       498
       498
       +
               "lastModified": 1764648680,

     

       499
       499
       +
               "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=",

     

       500
       500
       +
               "owner": "youwen5",

     

       501
       501
       +
               "repo": "zen-browser-flake",

     

       502
       502
       +
               "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20",

     

       503
       503
       +
               "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20",

     

       503
       504
        
               "type": "github"

     

       504
       505
        
             },

     

       505
       506
        
             "original": {

     

       506
       506
       -
               "owner": "Supreeeme",

     

       507
       507
       -
               "repo": "xwayland-satellite",

     

       507
       507
       +
               "owner": "youwen5",

     

       508
       508
       +
               "repo": "zen-browser-flake",

     

       508
       509
        
               "type": "github"

     

       509
       510
        
             }

     

       510
       511
        
           }

+24 -28

flake.nix

···

       5
       5
        
           # nur.url = "github:nix-community/NUR";

     

       6
       6
        
       

     

       7
       7
        
           nix-darwin = {

     

       8
       8
       -
             url = "github:LnL7/nix-darwin";

     

       8
       8
       +
             url = "github:nix-darwin/nix-darwin";

     

       9
       9
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       10
       10
        
           };

     

       11
       11
        
       

     
···

       37
       37
        
           denix = {

     

       38
       38
        
             url = "github:yunfachi/denix";

     

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

     

       40
       40
       +
             inputs.nix-darwin.follows = "nix-darwin";

     

       40
       41
        
             inputs.home-manager.follows = "home-manager";

     

       41
       42
        
           };

     

       42
       43
        
       

     

       43
       43
       -
           # ags = {

     

       44
       44
       -
           #   url = "github:Aylur/ags";

     

       45
       45
       -
           #   inputs.nixpkgs.follows = "nixpkgs";

     

       46
       46
       -
           # };

     

       44
       44
       +
           zen-browser = {

     

       45
       45
       +
             url = "github:youwen5/zen-browser-flake";

     

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

     

       47
       47
       +
           };

     

       47
       48
        
         };

     

       48
       49
        
       

     

       49
       50
        
         outputs = {

     

       50
       50
       -
           # ags,

     

       51
       51
        
           denix,

     

       52
       52
        
           home-manager,

     

       53
       53
        
           lix-module,

     
···

       58
       58
        
           self,

     

       59
       59
        
           ...

     

       60
       60
        
         } @ inputs: let

     

       61
       61
       -
           system = "x86_64-linux";

     

       62
       62
       -
           pkgs = nixpkgs.legacyPackages.${system};

     

       63
       63
       -
           # agsPkgs = ags.packages.${system};

     

       61
       61
       +
           forSystems = fn:

     

       62
       62
       +
             nixpkgs.lib.genAttrs [

     

       63
       63
       +
               "aarch64-linux"

     

       64
       64
       +
               "aarch64-darwin"

     

       65
       65
       +
               "x86_64-darwin"

     

       66
       66
       +
               "x86_64-linux"

     

       67
       67
       +
             ] (system: fn nixpkgs.legacyPackages.${system});

     

       68
       68
       +
           defaultForSystems = fn: forSystems (pkgs: {default = fn pkgs;});

     

       69
       69
       +
       

     

       64
       70
        
           mkConfigurations = moduleSystem:

     

       65
       71
        
             denix.lib.configurations (let

     

       66
       72
        
               homeManagerUser = "ovy";

     

       67
       73
        
             in {

     

       68
       74
        
               inherit moduleSystem homeManagerUser;

     

       69
       75
        
       

     

       70
       70
       -
               paths = [./denix/hosts ./denix/modules]; #./denix/rices];

     

       76
       76
       +
               paths = [./hosts ./modules]; #./rices];

     

       71
       77
        
               specialArgs = {inherit inputs moduleSystem homeManagerUser;};

     

       72
       78
        
             });

     

       73
       79
        
         in {

     

       74
       74
       -
           packages.${system} = {

     

       80
       80
       +
           packages = forSystems (pkgs: {

     

       75
       81
        
             iconifydl = pkgs.callPackage ./pkgs/iconifydl.nix {};

     

       82
       82
       +
           });

     

       76
       83
        
       

     

       77
       77
       -
             # default = ags.lib.bundle {

     

       78
       78
       -
             #   inherit pkgs;

     

       79
       79
       -
             #   src = ./files/astal;

     

       80
       80
       -
             #   name = "ovy-shell";

     

       81
       81
       -
             #   entry = "app.ts";

     

       82
       82
       -
             # };

     

       83
       83
       -
           };

     

       84
       84
       -
       

     

       85
       85
       -
           # devShells.x86_64-linux.default = pkgs.mkShell {

     

       86
       86
       -
           #   buildInputs = [agsPkgs.agsFull agsPkgs.io agsPkgs.apps agsPkgs.tray self.packages.${system}.iconifydl];

     

       87
       87
       -
           # };

     

       84
       84
       +
           devShells = defaultForSystems (pkgs:

     

       85
       85
       +
             pkgs.mkShell {

     

       86
       86
       +
               buildInputs = [pkgs.just];

     

       87
       87
       +
             });

     

       88
       88
        
       

     

       89
       89
        
           nixosConfigurations = mkConfigurations "nixos";

     

       90
       90
       +
           darwinConfigurations = mkConfigurations "darwin";

     

       90
       91
        
       

     

       91
       92
        
           # nixosModules.serverHomeManager = {...}: {

     

       92
       93
        
           #   imports = [home-manager.nixosModules.home-manager];

     
···

       100
       101
        
           #   };

     

       101
       102
        
           # };

     

       102
       103
        
       

     

       103
       103
       -
           formatter = {

     

       104
       104
       -
             aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra;

     

       105
       105
       -
             aarch64-darwin = nixpkgs.legacyPackages.aarch64-darwin.alejandra;

     

       106
       106
       -
             x86_64-darwin = nixpkgs.legacyPackages.x86_64-darwin.alejandra;

     

       107
       107
       -
             x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;

     

       108
       108
       -
           };

     

       104
       104
       +
           formatter = forSystems (pkgs: pkgs.alejandra);

     

       109
       105
        
         };

     

       110
       106
        
       }

+15

hosts/setsuna/default.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.host {

     

       3
       3
       +
         name = "setsuna";

     

       4
       4
       +
       

     

       5
       5
       +
         myconfig._1password.enable = false;

     

       6
       6
       +
         myconfig.gaming.enable = false;

     

       7
       7
       +
         myconfig.tray.enable = false;

     

       8
       8
       +
         myconfig.virtualisation.enable = false;

     

       9
       9
       +
       

     

       10
       10
       +
         myconfig.programs.chromium.enable = false;

     

       11
       11
       +
         myconfig.programs.desktop-apps.enable = false;

     

       12
       12
       +
         myconfig.programs.espanso.enable = false;

     

       13
       13
       +
         myconfig.programs.kitty.enable = false;

     

       14
       14
       +
         myconfig.programs.syncthing.enable = false;

     

       15
       15
       +
       }

+19

hosts/setsuna/hardware.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         inputs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.host {

     

       7
       7
       +
         name = "setsuna";

     

       8
       8
       +
       

     

       9
       9
       +
         homeManagerSystem = "aarch64-darwin";

     

       10
       10
       +
         home.home.stateVersion = "26.05";

     

       11
       11
       +
       

     

       12
       12
       +
         darwin = {

     

       13
       13
       +
           nixpkgs.hostPlatform = "aarch64-darwin";

     

       14
       14
       +
           # TODO: `darwin-rebuild changelog` to see what changed, latest is 6

     

       15
       15
       +
           system.stateVersion = 6;

     

       16
       16
       +
           # TODO: see what this does, i forgor

     

       17
       17
       +
           system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null;

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+15

hosts/shimmer/default.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.host {

     

       3
       3
       +
         name = "shimmer";

     

       4
       4
       +
       

     

       5
       5
       +
         myconfig._1password.enable = false;

     

       6
       6
       +
         myconfig.gaming.enable = false;

     

       7
       7
       +
         myconfig.tray.enable = false;

     

       8
       8
       +
         myconfig.virtualisation.enable = false;

     

       9
       9
       +
       

     

       10
       10
       +
         myconfig.programs.chromium.enable = false;

     

       11
       11
       +
         myconfig.programs.desktop-apps.enable = false;

     

       12
       12
       +
         myconfig.programs.espanso.enable = false;

     

       13
       13
       +
         myconfig.programs.kitty.enable = false;

     

       14
       14
       +
         myconfig.programs.syncthing.enable = false;

     

       15
       15
       +
       }

+19

hosts/shimmer/hardware.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         inputs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.host {

     

       7
       7
       +
         name = "shimmer";

     

       8
       8
       +
       

     

       9
       9
       +
         homeManagerSystem = "aarch64-darwin";

     

       10
       10
       +
         home.home.stateVersion = "24.05";

     

       11
       11
       +
       

     

       12
       12
       +
         darwin = {

     

       13
       13
       +
           nixpkgs.hostPlatform = "aarch64-darwin";

     

       14
       14
       +
           # TODO: `darwin-rebuild changelog` to see what changed, latest is 6

     

       15
       15
       +
           system.stateVersion = 4;

     

       16
       16
       +
           # TODO: see what this does, i forgor

     

       17
       17
       +
           system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null;

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+4 -1

hosts/wallsocket/hardware.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
        
         lib,

     

       4
       4
       +
         pkgs,

     

       4
       5
        
         ...

     

       5
       6
        
       }: let

     

       6
       7
        
         platform = "x86_64-linux";

     
···

       16
       17
        
             nixpkgs.hostPlatform = platform;

     

       17
       18
        
             system.stateVersion = stateVersion;

     

       18
       19
        
       

     

       19
       19
       -
             hardware.enableRedistributableFirmware = true;

     

       20
       20
       +
             hardware.enableAllFirmware = true;

     

       20
       21
        
             hardware.cpu.amd.updateMicrocode = true;

     

       21
       22
        
       

     

       22
       23
        
             # Kernel

     
···

       24
       25
        
             boot.initrd.kernelModules = [];

     

       25
       26
        
             boot.kernelModules = ["kvm-amd"];

     

       26
       27
        
             boot.extraModulePackages = [];

     

       28
       28
       +
             boot.kernelPackages = pkgs.linuxPackages_latest;

     

       27
       29
        
       

     

       28
       30
        
             # Bootloader

     

       29
       31
        
             boot.loader.systemd-boot.enable = true;

     

       30
       32
        
             boot.loader.systemd-boot.configurationLimit = 10;

     

       33
       33
       +
             boot.loader.systemd-boot.consoleMode = "max";

     

       31
       34
        
             boot.loader.efi.canTouchEfiVariables = true;

     

       32
       35
        
       

     

       33
       36
        
             # Disks

+15

justfile

···

       1
       1
       +
       [private]

     

       2
       2
       +
       default:

     

       3
       3
       +
         just --list

     

       4
       4
       +
       

     

       5
       5
       +
       [linux]

     

       6
       6
       +
       boot:

     

       7
       7
       +
         sudo nixos-rebuild boot -L

     

       8
       8
       +
       

     

       9
       9
       +
       [linux]

     

       10
       10
       +
       switch:

     

       11
       11
       +
         sudo nixos-rebuild switch -L

     

       12
       12
       +
       

     

       13
       13
       +
       [macos]

     

       14
       14
       +
       switch:

     

       15
       15
       +
         sudo darwin-rebuild switch --flake . -L

+5 -1

modules/1password.nix

···

       17
       17
        
           };

     

       18
       18
        
       

     

       19
       19
        
           environment.etc."1password/custom_allowed_browsers" = {

     

       20
       20
       -
             text = "vivaldi-bin";

     

       20
       20
       +
             text = ''

     

       21
       21
       +
               vivaldi-bin

     

       22
       22
       +
               zen

     

       23
       23
       +
               zen-bin

     

       24
       24
       +
             '';

     

       21
       25
        
             mode = "0755";

     

       22
       26
        
           };

     

       23
       27
        
         };

+10 -10

modules/bluetooth.nix

···

       11
       11
        
         nixos.ifEnabled = {

     

       12
       12
        
           hardware.bluetooth.enable = true;

     

       13
       13
        
           # TODO: determine if this actually affected me. Maybe should yeet.

     

       14
       14
       -
           hardware.bluetooth.settings = {

     

       15
       15
       -
             # Try and reduce latency from Xbox Series controllers

     

       16
       16
       -
             # https://atar-axis.github.io/xpadneo#high-latency-or-lost-button-events-with-bluetooth-le

     

       17
       17
       -
             LE = {

     

       18
       18
       -
               MinConnectionInterval = 7;

     

       19
       19
       -
               MaxConnectionInterval = 9;

     

       20
       20
       -
               ConnectionLatency = 0;

     

       21
       21
       -
             };

     

       22
       22
       -
           };

     

       23
       23
       -
           hardware.xpadneo.enable = true;

     

       14
       14
       +
           # hardware.bluetooth.settings = {

     

       15
       15
       +
           #   # Try and reduce latency from Xbox Series controllers

     

       16
       16
       +
           #   # https://atar-axis.github.io/xpadneo#high-latency-or-lost-button-events-with-bluetooth-le

     

       17
       17
       +
           #   LE = {

     

       18
       18
       +
           #     MinConnectionInterval = 7;

     

       19
       19
       +
           #     MaxConnectionInterval = 9;

     

       20
       20
       +
           #     ConnectionLatency = 0;

     

       21
       21
       +
           #   };

     

       22
       22
       +
           # };

     

       23
       23
       +
           # hardware.xpadneo.enable = true;

     

       24
       24
        
           environment.systemPackages = [pkgs.kdePackages.bluedevil];

     

       25
       25
        
         };

     

       26
       26
        
       }

+4 -1

modules/config/home.nix

···

       18
       18
        
         in {

     

       19
       19
        
           home = {

     

       20
       20
        
             inherit username;

     

       21
       21
       -
             homeDirectory = "/home/${username}";

     

       21
       21
       +
             homeDirectory =

     

       22
       22
       +
               if moduleSystem == "darwin"

     

       23
       23
       +
               then "/Users/${username}"

     

       24
       24
       +
               else "/home/${username}";

     

       22
       25
        
           };

     

       23
       26
        
           news.display = "silent";

     

       24
       27
        
           programs.home-manager.enable = false;

+15 -7

modules/config/user.nix

···

       9
       9
        
         nixos.always = {myconfig, ...}: let

     

       10
       10
        
           inherit (myconfig.constants) username userfullname;

     

       11
       11
        
         in {

     

       12
       12
       -
           users = {

     

       13
       13
       -
             users.${username} = {

     

       14
       14
       -
               isNormalUser = true;

     

       15
       15
       -
               description = userfullname;

     

       16
       16
       -
               extraGroups = ["wheel" "cdrom" "adbusers"];

     

       17
       17
       -
               shell = pkgs.fish;

     

       18
       18
       -
             };

     

       12
       12
       +
           users.users.${username} = {

     

       13
       13
       +
             isNormalUser = true;

     

       14
       14
       +
             description = userfullname;

     

       15
       15
       +
             extraGroups = ["wheel" "cdrom" "adbusers"];

     

       16
       16
       +
             shell = pkgs.fish;

     

       17
       17
       +
           };

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         darwin.always = {myconfig, ...}: let

     

       21
       21
       +
           inherit (myconfig.constants) username userfullname;

     

       22
       22
       +
         in {

     

       23
       23
       +
           users.users.${username} = {

     

       24
       24
       +
             description = userfullname;

     

       25
       25
       +
             home = "/Users/${username}";

     

       26
       26
       +
             shell = pkgs.fish;

     

       19
       27
        
           };

     

       20
       28
        
         };

     

       21
       29
        
       }

+24

modules/darwin/defaults.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.module {

     

       3
       3
       +
         name = "darwin.defaults";

     

       4
       4
       +
       

     

       5
       5
       +
         options = delib.singleEnableOption true;

     

       6
       6
       +
       

     

       7
       7
       +
         darwin.ifEnabled.system.defaults = {

     

       8
       8
       +
           NSGlobalDomain.AppleShowAllExtensions = true;

     

       9
       9
       +
           finder.ShowPathbar = true;

     

       10
       10
       +
           menuExtraClock.Show24Hour = true;

     

       11
       11
       +
           trackpad.Dragging = true;

     

       12
       12
       +
       

     

       13
       13
       +
           # Dock settings

     

       14
       14
       +
           dock = {

     

       15
       15
       +
             autohide = false;

     

       16
       16
       +
             magnification = false;

     

       17
       17
       +
             minimize-to-application = false;

     

       18
       18
       +
             mru-spaces = false;

     

       19
       19
       +
             orientation = "bottom";

     

       20
       20
       +
             show-recents = false;

     

       21
       21
       +
             tilesize = 48;

     

       22
       22
       +
           };

     

       23
       23
       +
         };

     

       24
       24
       +
       }

+53

modules/darwin/homebrew.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.module {

     

       3
       3
       +
         name = "darwin.homebrew";

     

       4
       4
       +
       

     

       5
       5
       +
         options = delib.singleEnableOption true;

     

       6
       6
       +
       

     

       7
       7
       +
         darwin.ifEnabled.homebrew = {

     

       8
       8
       +
           enable = true;

     

       9
       9
       +
           # Update and cleanup homebrew packages when rebuilding.

     

       10
       10
       +
           global.autoUpdate = false;

     

       11
       11
       +
           onActivation.autoUpdate = true;

     

       12
       12
       +
           onActivation.upgrade = true;

     

       13
       13
       +
           onActivation.cleanup = "zap";

     

       14
       14
       +
       

     

       15
       15
       +
           taps = [

     

       16
       16
       +
             "ovyerus/klog"

     

       17
       17
       +
             "ovyerus/tap"

     

       18
       18
       +
           ];

     

       19
       19
       +
       

     

       20
       20
       +
           brews = [

     

       21
       21
       +
             "klog"

     

       22
       22
       +
             "mas"

     

       23
       23
       +
             "swiftformat"

     

       24
       24
       +
             "xcbeautify"

     

       25
       25
       +
             "xcodegen"

     

       26
       26
       +
           ];

     

       27
       27
       +
       

     

       28
       28
       +
           casks = [

     

       29
       29
       +
             "1password"

     

       30
       30
       +
             "discord"

     

       31
       31
       +
             "figma"

     

       32
       32
       +
             "httpie"

     

       33
       33
       +
             "insomnia"

     

       34
       34
       +
             "iterm2"

     

       35
       35
       +
             "karabiner-elements"

     

       36
       36
       +
             "maccy"

     

       37
       37
       +
             "orbstack"

     

       38
       38
       +
             # Actually searches symlinks for apps, compared to Alfred.

     

       39
       39
       +
             "raycast"

     

       40
       40
       +
             "swiftformat-for-xcode"

     

       41
       41
       +
             "tailscale-app"

     

       42
       42
       +
             # "vorta"

     

       43
       43
       +
             "vesktop"

     

       44
       44
       +
             "zen"

     

       45
       45
       +
           ];

     

       46
       46
       +
       

     

       47
       47
       +
           masApps = {

     

       48
       48
       +
             Keka = 470158793;

     

       49
       49
       +
             "Yubico Authenticator" = 1497506650;

     

       50
       50
       +
             "System Color Picker" = 1545870783;

     

       51
       51
       +
           };

     

       52
       52
       +
         };

     

       53
       53
       +
       }

modules/darwin/system.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.module {

     

       3
       3
       +
         name = "darwin.system";

     

       4
       4
       +
       

     

       5
       5
       +
         darwin.always = {

     

       6
       6
       +
           system.primaryUser = "ovy";

     

       7
       7
       +
         };

     

       8
       8
       +
       }

+100

modules/darwin/wm.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.module {

     

       7
       7
       +
         name = "darwin.wm";

     

       8
       8
       +
       

     

       9
       9
       +
         options = delib.singleEnableOption true;

     

       10
       10
       +
       

     

       11
       11
       +
         darwin.ifEnabled = {

     

       12
       12
       +
           services.yabai = {

     

       13
       13
       +
             enable = true;

     

       14
       14
       +
             config = let

     

       15
       15
       +
               gap = 10;

     

       16
       16
       +
               gapKeys = [

     

       17
       17
       +
                 "window_gap"

     

       18
       18
       +
                 "top_padding"

     

       19
       19
       +
                 "bottom_padding"

     

       20
       20
       +
                 "left_padding"

     

       21
       21
       +
                 "right_padding"

     

       22
       22
       +
               ];

     

       23
       23
       +
       

     

       24
       24
       +
               gaps = builtins.listToAttrs (

     

       25
       25
       +
                 builtins.map (k: lib.attrsets.nameValuePair k gap) gapKeys

     

       26
       26
       +
               );

     

       27
       27
       +
             in

     

       28
       28
       +
               {

     

       29
       29
       +
                 layout = "bsp";

     

       30
       30
       +
                 window_placement = "second_child";

     

       31
       31
       +
               }

     

       32
       32
       +
               // gaps;

     

       33
       33
       +
             extraConfig = ''

     

       34
       34
       +
               yabai -m rule --add app="Bitwarden"               manage=off

     

       35
       35
       +
               yabai -m rule --add app="Discord"                 manage=off

     

       36
       36
       +
               yabai -m rule --add app="^Finder$"                manage=off

     

       37
       37
       +
               yabai -m rule --add app="Keka"                    manage=off

     

       38
       38
       +
               yabai -m rule --add app="^System Information$"    manage=off

     

       39
       39
       +
               yabai -m rule --add app="^System Preferences$"    manage=off

     

       40
       40
       +
               yabai -m rule --add app="^System Settings$"       manage=off

     

       41
       41
       +
               yabai -m rule --add title="Preferences$"          manage=off

     

       42
       42
       +
               yabai -m rule --add title="^Archive Utility$"     manage=off

     

       43
       43
       +
               yabai -m rule --add title="Settings$"             manage=off

     

       44
       44
       +
               yabai -m rule --add title="Karabiner"             manage=off

     

       45
       45
       +
               yabai -m rule --add title="^Weather$"             manage=off

     

       46
       46
       +
               yabai -m rule --add title="Yubico Authenticator"  manage=off

     

       47
       47
       +
               yabai -m rule --add app="Rewind"                  manage=off

     

       48
       48
       +
               yabai -m rule --add app="eqMac"                   manage=off

     

       49
       49
       +
               yabai -m rule --add app="^Arc$"                   manage=off

     

       50
       50
       +
               yabai -m rule --add app="OBS"                     manage=off

     

       51
       51
       +
               yabai -m rule --add app="Raycast"                 manage=off

     

       52
       52
       +
             '';

     

       53
       53
       +
           };

     

       54
       54
       +
       

     

       55
       55
       +
           services.skhd = {

     

       56
       56
       +
             enable = true;

     

       57
       57
       +
             skhdConfig = ''

     

       58
       58
       +
               # Move/swap windows

     

       59
       59
       +
               meh - w : yabai -m window --swap north

     

       60
       60
       +
               meh - a : yabai -m window --swap west

     

       61
       61
       +
               meh - r : yabai -m window --swap south

     

       62
       62
       +
               meh - s : yabai -m window --swap east

     

       63
       63
       +
       

     

       64
       64
       +
               hyper - w : yabai -m window --warp north

     

       65
       65
       +
               hyper - a : yabai -m window --warp west

     

       66
       66
       +
               hyper - r : yabai -m window --warp south

     

       67
       67
       +
               hyper - s : yabai -m window --warp east

     

       68
       68
       +
       

     

       69
       69
       +
               # Focus windows

     

       70
       70
       +
               ralt + rcmd - w : yabai -m window --focus north

     

       71
       71
       +
               ralt + rcmd - a : yabai -m window --focus west

     

       72
       72
       +
               ralt + rcmd - r : yabai -m window --focus south

     

       73
       73
       +
               ralt + rcmd - s : yabai -m window --focus east

     

       74
       74
       +
       

     

       75
       75
       +
               # Increase window size

     

       76
       76
       +
               meh - n : yabai -m window --resize left:-100:0

     

       77
       77
       +
               meh - e : yabai -m window --resize bottom:0:100

     

       78
       78
       +
               meh - i : yabai -m window --resize top:0:-100

     

       79
       79
       +
               meh - o : yabai -m window --resize right:100:0

     

       80
       80
       +
       

     

       81
       81
       +
               # Decrease window size

     

       82
       82
       +
               hyper - n : yabai -m window --resize right:-100:0

     

       83
       83
       +
               hyper - e : yabai -m window --resize top:0:100

     

       84
       84
       +
               hyper - i : yabai -m window --resize bottom:0:-100

     

       85
       85
       +
               hyper - o : yabai -m window --resize left:100:0

     

       86
       86
       +
       

     

       87
       87
       +
               # Expand floating window to fill screen

     

       88
       88
       +
               # (full stop)

     

       89
       89
       +
               meh - 0x2F : yabai -m window --grid 1:1:0:0:1:1

     

       90
       90
       +
       

     

       91
       91
       +
               meh - p : yabai -m window --toggle float; \

     

       92
       92
       +
                         yabai -m window --grid 4:4:1:1:2:2

     

       93
       93
       +
       

     

       94
       94
       +
               # Rebalance grid

     

       95
       95
       +
               # (backtick)

     

       96
       96
       +
               hyper - 0x32 : yabai -m space --balance

     

       97
       97
       +
             '';

     

       98
       98
       +
           };

     

       99
       99
       +
         };

     

       100
       100
       +
       }

+12 -1

modules/fonts.nix

···

       10
       10
        
         nixos.always = {

     

       11
       11
        
           fonts = {

     

       12
       12
        
             packages = [

     

       13
       13
       -
               pkgs.ubuntu_font_family

     

       13
       13
       +
               pkgs.ubuntu-classic

     

       14
       14
       +
               pkgs.ubuntu-sans

     

       14
       15
        
               pkgs.inter

     

       16
       16
       +
               # Only needed for one specific thing and now can't download from sourceforge for some reason

     

       17
       17
       +
               # pkgs.corefonts

     

       18
       18
       +
               # pkgs.vista-fonts

     

       15
       19
        
               inputs.iosevka-solai.packages.x86_64-linux.bin

     

       16
       20
        
             ];

     

       17
       21
        
       

     
···

       46
       50
        
           #     }

     

       47
       51
        
           #   ];

     

       48
       52
        
           # };

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       55
       55
       +
         darwin.always = {

     

       56
       56
       +
           fonts.packages = with pkgs; [

     

       57
       57
       +
             inter

     

       58
       58
       +
             inputs.iosevka-solai.packages.aarch64-darwin.bin

     

       59
       59
       +
           ];

     

       49
       60
        
         };

     

       50
       61
        
       }

+4 -2

modules/gaming.nix

···

       7
       7
        
       delib.module {

     

       8
       8
        
         name = "gaming";

     

       9
       9
        
       

     

       10
       10
       -
         nixos.always = {

     

       10
       10
       +
         options = delib.singleEnableOption true;

     

       11
       11
       +
       

     

       12
       12
       +
         nixos.ifEnabled = {

     

       11
       13
        
           programs.steam = {

     

       12
       14
        
             enable = true;

     

       13
       15
        
             remotePlay.openFirewall = true;

     
···

       19
       21
        
           programs.gamemode.enable = true;

     

       20
       22
        
         };

     

       21
       23
        
       

     

       22
       22
       -
         home.always = {

     

       24
       24
       +
         home.ifEnabled = {

     

       23
       25
        
           programs.mangohud = {

     

       24
       26
        
             enable = true;

     

       25
       27
        
             settings = {

+5 -1

modules/graphics.nix

···

       15
       15
        
             enable = true;

     

       16
       16
        
             enable32Bit = true;

     

       17
       17
        
           };

     

       18
       18
       +
           hardware.amdgpu = {

     

       19
       19
       +
             initrd.enable = true;

     

       20
       20
       +
             opencl.enable = true;

     

       21
       21
       +
           };

     

       18
       22
        
       

     

       19
       19
       -
           environment.systemPackages = with pkgs; [amdgpu_top lact nvtopPackages.full];

     

       23
       23
       +
           environment.systemPackages = with pkgs; [amdgpu_top lact];

     

       20
       24
        
       

     

       21
       25
        
           systemd.services.lactd = {

     

       22
       26
        
             description = "AMDGPU Control Daemon";

-11

modules/logitech.nix

···

       1
       1
       -
       {delib, ...}:

     

       2
       2
       -
       delib.module {

     

       3
       3
       -
         name = "logitech";

     

       4
       4
       -
       

     

       5
       5
       -
         options = delib.singleEnableOption true;

     

       6
       6
       -
       

     

       7
       7
       -
         nixos.ifEnabled = {

     

       8
       8
       -
           hardware.logitech.wireless.enable = true;

     

       9
       9
       -
           hardware.new-lg4ff.enable = true;

     

       10
       10
       -
         };

     

       11
       11
       -
       }

-6

modules/networking.nix

···

       39
       39
        
             # dnsovertls = "trues";

     

       40
       40
        
           };

     

       41
       41
        
       

     

       42
       42
       -
           services.tailscale = {

     

       43
       43
       -
             enable = true;

     

       44
       44
       -
             openFirewall = true;

     

       45
       45
       -
             useRoutingFeatures = "client";

     

       46
       46
       -
           };

     

       47
       47
       -
       

     

       48
       42
        
           # services.mullvad-vpn.enable = true;

     

       49
       43
        
           # services.mullvad-vpn.package = pkgs.mullvad-vpn;

     

       50
       44

+76 -29

modules/nix.nix

···

       2
       2
        
         delib,

     

       3
       3
        
         inputs,

     

       4
       4
        
         ...

     

       5
       5
       -
       }: let

     

       6
       6
       -
         shared.nix.settings = {

     

       7
       7
       -
           auto-optimise-store = true;

     

       8
       8
       -
           experimental-features = ["nix-command" "flakes"];

     

       9
       9
       -
           trusted-users = ["root" "@wheel"];

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.module {

     

       7
       7
       +
         name = "nix";

     

       8
       8
       +
       

     

       9
       9
       +
         # TODO: double check home-manager options

     

       10
       10
       +
         home.always = {

     

       11
       11
       +
           nixpkgs.config = import ../files/nixpkgs-config.nix;

     

       12
       12
       +
           xdg.configFile."nixpkgs/config.nix".source = ../files/nixpkgs-config.nix;

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         nixos.always = {

     

       16
       16
       +
           nixpkgs.config = import ../files/nixpkgs-config.nix;

     

       17
       17
       +
       

     

       18
       18
       +
           nix = {

     

       19
       19
       +
             gc = {

     

       20
       20
       +
               automatic = true;

     

       21
       21
       +
               options = "--delete-older-than 10d";

     

       22
       22
       +
               dates = "weekly";

     

       23
       23
       +
             };

     

       24
       24
       +
       

     

       25
       25
       +
             nixPath = ["nixpkgs=${inputs.nixpkgs}"];

     

       26
       26
       +
       

     

       27
       27
       +
             registry.nixpkgs.to = {

     

       28
       28
       +
               type = "path";

     

       29
       29
       +
               path = inputs.nixpkgs;

     

       30
       30
       +
               narHash = inputs.nixpkgs.narHash;

     

       31
       31
       +
             };

     

       32
       32
       +
       

     

       33
       33
       +
             settings = {

     

       34
       34
       +
               auto-optimise-store = true;

     

       35
       35
       +
               experimental-features = ["nix-command" "flakes"];

     

       36
       36
       +
               trusted-users = ["root" "@wheel" "ovy"];

     

       37
       37
       +
               warn-dirty = false;

     

       38
       38
       +
             };

     

       39
       39
       +
           };

     

       40
       40
       +
       

     

       41
       41
       +
           system.tools.nixos-option.enable = false;

     

       10
       42
        
         };

     

       11
       11
       -
       in

     

       12
       12
       -
         delib.module {

     

       13
       13
       -
           name = "nix";

     

       43
       43
       +
       

     

       44
       44
       +
         darwin.always = {

     

       45
       45
       +
           nixpkgs.config = import ../files/nixpkgs-config.nix;

     

       46
       46
       +
       

     

       47
       47
       +
           nix = {

     

       48
       48
       +
             buildMachines = [

     

       49
       49
       +
               {

     

       50
       50
       +
                 hostName = "rushing.axolotl-map.ts.net";

     

       51
       51
       +
                 sshUser = "colmena-deploy";

     

       52
       52
       +
                 system = "x86_64-linux";

     

       53
       53
       +
                 speedFactor = 2;

     

       54
       54
       +
                 maxJobs = 6;

     

       55
       55
       +
                 protocol = "ssh-ng";

     

       56
       56
       +
               }

     

       57
       57
       +
               {

     

       58
       58
       +
                 hostName = "skyline.axolotl-map.ts.net";

     

       59
       59
       +
                 sshUser = "colmena-deploy";

     

       60
       60
       +
                 system = "aarch64-linux";

     

       61
       61
       +
                 speedFactor = 1;

     

       62
       62
       +
                 maxJobs = 2;

     

       63
       63
       +
                 protocol = "ssh-ng";

     

       64
       64
       +
               }

     

       65
       65
       +
             ];

     

       14
       66
        
       

     

       15
       15
       -
           # TODO: double check home-manager options

     

       16
       16
       -
           home.always = shared;

     

       17
       17
       -
           nixos.always =

     

       18
       18
       -
             shared

     

       19
       19
       -
             // {

     

       20
       20
       -
               nix = {

     

       21
       21
       -
                 gc = {

     

       22
       22
       -
                   automatic = true;

     

       23
       23
       -
                   options = "--delete-older-than 10d";

     

       24
       24
       -
                   dates = "weekly";

     

       25
       25
       -
                 };

     

       67
       67
       +
             distributedBuilds = true;

     

       26
       68
        
       

     

       27
       27
       -
                 nixPath = ["nixpkgs=${inputs.nixpkgs}"];

     

       69
       69
       +
             gc = {

     

       70
       70
       +
               automatic = true;

     

       71
       71
       +
               options = "--delete-older-than 7d";

     

       72
       72
       +
               interval.Weekday = 6;

     

       73
       73
       +
             };

     

       28
       74
        
       

     

       29
       29
       -
                 registry.nixpkgs.to = {

     

       30
       30
       -
                   type = "path";

     

       31
       31
       -
                   path = inputs.nixpkgs;

     

       32
       32
       -
                   narHash = inputs.nixpkgs.narHash;

     

       33
       33
       -
                 };

     

       34
       34
       -
               };

     

       75
       75
       +
             optimise.automatic = true;

     

       35
       76
        
       

     

       36
       36
       -
               nixpkgs.config.allowUnfree = true;

     

       37
       37
       -
               system.tools.nixos-option.enable = false;

     

       77
       77
       +
             settings = {

     

       78
       78
       +
               builders-use-substitutes = true;

     

       79
       79
       +
               experimental-features = "nix-command flakes";

     

       80
       80
       +
               trusted-users = ["root" "ovy"];

     

       81
       81
       +
               sandbox = true;

     

       82
       82
       +
               warn-dirty = false;

     

       38
       83
        
             };

     

       39
       39
       -
         }

     

       84
       84
       +
           };

     

       85
       85
       +
         };

     

       86
       86
       +
       }

-10

modules/ollama.nix

···

       1
       1
       -
       {delib, ...}:

     

       2
       2
       -
       delib.module {

     

       3
       3
       -
         name = "ollama";

     

       4
       4
       -
       

     

       5
       5
       -
         nixos.always.services.ollama = {

     

       6
       6
       -
           enable = true;

     

       7
       7
       -
           acceleration = "rocm";

     

       8
       8
       -
           rocmOverrideGfx = "11.0.0";

     

       9
       9
       -
         };

     

       10
       10
       -
       }

+15 -1

modules/plasma.nix

···

       27
       27
        
           environment.plasma6.excludePackages = with pkgs.kdePackages; [

     

       28
       28
        
             elisa

     

       29
       29
        
             gwenview

     

       30
       30
       +
             kate

     

       30
       31
        
             konsole

     

       32
       32
       +
             krunner

     

       31
       33
        
           ];

     

       32
       34
        
       

     

       33
       35
        
           qt = {

     
···

       38
       40
        
       

     

       39
       41
        
           # environment.sessionVariables."NIXOS_OZONE_WL" = 1;

     

       40
       42
        
           environment.sessionVariables."MOZ_ENABLE_WAYLAND" = 0;

     

       41
       41
       -
           environment.systemPackages = with pkgs; [adwaita-icon-theme kdePackages.kcalc kdePackages.partitionmanager kdePackages.kcolorchooser];

     

       43
       43
       +
           environment.systemPackages = with pkgs; [

     

       44
       44
       +
             adwaita-icon-theme

     

       45
       45
       +
             kdePackages.kcalc

     

       46
       46
       +
             kdePackages.partitionmanager

     

       47
       47
       +
             kdePackages.kcolorchooser

     

       48
       48
       +
             kdePackages.kdenlive

     

       49
       49
       +
           ];

     

       50
       50
       +
       

     

       51
       51
       +
           # TODO: move

     

       52
       52
       +
           boot.plymouth = {

     

       53
       53
       +
             enable = true;

     

       54
       54
       +
             theme = "breeze";

     

       55
       55
       +
           };

     

       42
       56
        
         };

     

       43
       57
        
       }

+3 -1

modules/programs/bat.nix

···

       2
       2
        
       delib.module {

     

       3
       3
        
         name = "programs.bat";

     

       4
       4
        
       

     

       5
       5
       -
         home.always.programs.bat = {

     

       5
       5
       +
         options = delib.singleEnableOption true;

     

       6
       6
       +
       

     

       7
       7
       +
         home.ifEnabled.programs.bat = {

     

       6
       8
        
           enable = true;

     

       7
       9
        
           config = {

     

       8
       10
        
             theme = "DarkNeon";

+38 -3

modules/programs/core-cli.nix

···

       6
       6
        
       delib.module {

     

       7
       7
        
         name = "programs.core-cli";

     

       8
       8
        
       

     

       9
       9
       +
         options = delib.singleEnableOption true;

     

       10
       10
       +
       

     

       9
       11
        
         nixos.always = {

     

       10
       12
        
           environment.systemPackages = with pkgs; [

     

       11
       13
        
             ffmpeg-full

     
···

       16
       18
        
             openssh

     

       17
       19
        
             p7zip

     

       18
       20
        
             pciutils

     

       19
       19
       -
             solaar

     

       20
       21
        
             sysstat

     

       21
       22
        
             unar

     

       22
       22
       -
             wcurl

     

       23
       23
        
             wget

     

       24
       24
        
             wineWowPackages.full

     

       25
       25
        
           ];

     
···

       27
       27
        
           programs.fish.enable = true;

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
       +
         darwin.always = {

     

       31
       31
       +
           environment.systemPackages = with pkgs; [

     

       32
       32
       +
             ffmpeg-full

     

       33
       33
       +
             git

     

       34
       34
       +
             imagemagick

     

       35
       35
       +
             nil

     

       36
       36
       +
             openssh

     

       37
       37
       +
             wget

     

       38
       38
       +
             # TODO: the Xcode packages makes us manually download and put it into the Nix store

     

       39
       39
       +
             # but it seems to contain no reference to our actual result so I don't think `systemPackages`

     

       40
       40
       +
             # picks it up properly.  Need to see how `requireFile` works and how `systemPackages`

     

       41
       41
       +
             # works under the hood.

     

       42
       42
       +
             # darwin.xcode_14_1

     

       43
       43
       +
           ];

     

       44
       44
       +
       

     

       45
       45
       +
           programs.bash.enable = true;

     

       46
       46
       +
           programs.zsh.enable = true;

     

       47
       47
       +
           programs.fish.enable = true;

     

       48
       48
       +
       

     

       49
       49
       +
           # Fix problem in nix-darwin relating to $PATH order in fish.

     

       50
       50
       +
           # https://github.com/LnL7/nix-darwin/issues/122#issuecomment-1659465635

     

       51
       51
       +
           # programs.fish.loginShellInit = let

     

       52
       52
       +
           #   dquote = str: "\"${str}\"";

     

       53
       53
       +
           #   makeBinPathList = map (path: path + "/bin");

     

       54
       54
       +
           # in ''

     

       55
       55
       +
           #   fish_add_path --move --prepend --path ${lib.concatMapStringsSep " " dquote (makeBinPathList config.environment.profiles)}

     

       56
       56
       +
           #   set fish_user_paths $fish_user_paths

     

       57
       57
       +
           #   fish_add_path /opt/homebrew/bin

     

       58
       58
       +
           # '';

     

       59
       59
       +
       

     

       60
       60
       +
           programs.fish.loginShellInit = ''

     

       61
       61
       +
             alias tailscale /Applications/Tailscale.app/Contents/MacOS/Tailscale

     

       62
       62
       +
           '';

     

       63
       63
       +
         };

     

       64
       64
       +
       

     

       30
       65
        
         home.always = {

     

       31
       66
        
           home.packages = with pkgs; [

     

       32
       67
        
             curlie

     

       33
       33
       -
             du-dust

     

       68
       68
       +
             dust

     

       34
       69
        
             duf

     

       35
       70
        
             fd

     

       36
       71
        
             jq

+35 -7

modules/programs/desktop-apps.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
        
         pkgs,

     

       4
       4
       +
         homeConfig,

     

       4
       5
        
         ...

     

       5
       6
        
       }:

     

       6
       7
        
       delib.module {

     

       7
       8
        
         name = "programs.desktop-apps";

     

       8
       9
        
       

     

       9
       9
       -
         home.always = {

     

       10
       10
       +
         options = delib.singleEnableOption true;

     

       11
       11
       +
       

     

       12
       12
       +
         home.ifEnabled = {

     

       10
       13
        
           home.packages = with pkgs; [

     

       11
       14
        
             alejandra

     

       12
       15
        
             audacity

     

       13
       16
        
             blender

     

       14
       17
        
             btop # TODO: module & options

     

       15
       18
        
             bruno

     

       16
       16
       -
             # davinci-resolve

     

       17
       17
       -
             # distrobox

     

       19
       19
       +
             davinci-resolve

     

       20
       20
       +
             (discord.override {

     

       21
       21
       +
               withOpenASAR = true;

     

       22
       22
       +
               withVencord = true;

     

       23
       23
       +
             })

     

       18
       24
        
             gajim

     

       19
       25
        
             glaxnimate

     

       20
       26
        
             # godot_4

     
···

       26
       32
        
             lunacy

     

       27
       33
        
             lutris

     

       28
       34
        
             # mixxx

     

       29
       29
       -
             obs-studio

     

       30
       35
        
             obsidian

     

       36
       36
       +
             opencloud-desktop

     

       31
       37
        
             oversteer

     

       32
       38
        
             p7zip

     

       33
       39
        
             picard

     
···

       35
       41
        
             piper

     

       36
       42
        
             podman-tui

     

       37
       43
        
             # plasticity

     

       38
       38
       -
             prismlauncher

     

       44
       44
       +
             (prismlauncher.override {

     

       45
       45
       +
               jdks = [

     

       46
       46
       +
                 temurin-bin-21

     

       47
       47
       +
                 temurin-bin-8

     

       48
       48
       +
                 temurin-bin-17

     

       49
       49
       +
               ];

     

       50
       50
       +
             })

     

       51
       51
       +
             protonup-qt

     

       39
       52
        
             qbittorrent

     

       40
       53
        
             qimgv

     

       41
       54
        
             slack

     

       42
       42
       -
             vesktop

     

       55
       55
       +
             # vesktop

     

       43
       56
        
             vlc

     

       44
       57
        
             vorta

     

       45
       58
        
             winetricks

     
···

       47
       60
        
             yubioath-flutter

     

       48
       61
        
           ];

     

       49
       62
        
       

     

       50
       50
       -
           services.owncloud-client.enable = true;

     

       63
       63
       +
           systemd.user.services.opencloud-client = {

     

       64
       64
       +
             Unit = {

     

       65
       65
       +
               Description = "OpenCloud Client";

     

       66
       66
       +
               After = ["graphical-session.target"];

     

       67
       67
       +
               PartOf = ["graphical-session.target"];

     

       68
       68
       +
             };

     

       69
       69
       +
       

     

       70
       70
       +
             Service = {

     

       71
       71
       +
               Environment = ["PATH=${homeConfig.home.profileDirectory}/bin"];

     

       72
       72
       +
               ExecStart = "${pkgs.opencloud-desktop}/bin/opencloud";

     

       73
       73
       +
             };

     

       74
       74
       +
       

     

       75
       75
       +
             Install = {

     

       76
       76
       +
               WantedBy = ["graphical-session.target"];

     

       77
       77
       +
             };

     

       78
       78
       +
           };

     

       51
       79
        
         };

     

       52
       80
        
       }

+43 -18

modules/programs/desktop-cli.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
       +
         lib,

     

       3
       4
        
         pkgs,

     

       4
       5
        
         ...

     

       5
       6
        
       }:

     

       6
       7
        
       delib.module {

     

       7
       8
        
         name = "programs.desktop-cli";

     

       8
       9
        
       

     

       9
       9
       -
         home.always.home.packages = with pkgs; [

     

       10
       10
       -
           age-plugin-yubikey

     

       11
       11
       -
           alejandra

     

       12
       12
       -
           cachix

     

       13
       13
       -
           colmena

     

       14
       14
       -
           fastfetch

     

       15
       15
       -
           hexyl

     

       16
       16
       -
           lazydocker

     

       17
       17
       -
           macchina

     

       18
       18
       -
           minio-client

     

       19
       19
       -
           mix2nix

     

       20
       20
       -
           minisign

     

       21
       21
       -
           mtr

     

       22
       22
       -
           nix-output-monitor

     

       23
       23
       -
           pgcli

     

       24
       24
       -
           rage

     

       25
       25
       -
           systemctl-tui

     

       26
       26
       -
         ];

     

       10
       10
       +
         options = delib.singleEnableOption true;

     

       11
       11
       +
       

     

       12
       12
       +
         home.ifEnabled.home.packages = with pkgs;

     

       13
       13
       +
           [

     

       14
       14
       +
             age-plugin-yubikey

     

       15
       15
       +
             alejandra

     

       16
       16
       +
             cachix

     

       17
       17
       +
             fastfetch

     

       18
       18
       +
             hexyl

     

       19
       19
       +
             lazydocker

     

       20
       20
       +
             macchina

     

       21
       21
       +
             minio-client

     

       22
       22
       +
             mix2nix

     

       23
       23
       +
             minisign

     

       24
       24
       +
             mtr

     

       25
       25
       +
             nix-output-monitor

     

       26
       26
       +
             pgcli

     

       27
       27
       +
             rage

     

       28
       28
       +
             systemctl-tui

     

       29
       29
       +
           ]

     

       30
       30
       +
           ++ (lib.optional pkgs.stdenv.isLinux [pkgs.claude-code pkgs.claude-code-router]);

     

       31
       31
       +
       

     

       32
       32
       +
         nixos.ifEnabled = {myconfig, ...}: {

     

       33
       33
       +
           programs.nh = {

     

       34
       34
       +
             enable = true;

     

       35
       35
       +
             flake = "/etc/nixos";

     

       36
       36
       +
           };

     

       37
       37
       +
       

     

       38
       38
       +
           environment.systemPackages = with pkgs.gst_all_1; [

     

       39
       39
       +
             gstreamer

     

       40
       40
       +
             gst-vaapi

     

       41
       41
       +
             gst-libav

     

       42
       42
       +
             gst-plugins-good

     

       43
       43
       +
             gst-plugins-ugly

     

       44
       44
       +
             gst-plugins-bad

     

       45
       45
       +
           ];

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
         darwin.ifEnabled = {myconfig, ...}: {

     

       49
       49
       +
           environment.systemPackages = with pkgs; [nh];

     

       50
       50
       +
           environment.variables.NH_FLAKE = "/Users/${myconfig.constants.username}/.config/nix-darwin";

     

       51
       51
       +
         };

     

       27
       52
        
       }

+1 -1

modules/programs/direnv.nix

···

       4
       4
        
         ...

     

       5
       5
        
       }:

     

       6
       6
        
       delib.module {

     

       7
       7
       -
         name = "programs.bat";

     

       7
       7
       +
         name = "programs.direnv";

     

       8
       8
        
       

     

       9
       9
        
         home.always.programs.direnv = {

     

       10
       10
        
           enable = true;

+7 -1

modules/programs/espanso.nix

···

       6
       6
        
       delib.module {

     

       7
       7
        
         name = "programs.espanso";

     

       8
       8
        
       

     

       9
       9
       -
         home.always.services.espanso = {

     

       9
       9
       +
         options = delib.singleEnableOption true;

     

       10
       10
       +
       

     

       11
       11
       +
         home.ifEnabled.services.espanso = {

     

       10
       12
        
           enable = true;

     

       11
       13
        
           package = pkgs.espanso-wayland;

     

       12
       14
        
           matches.base.matches = [

     

       13
       15
        
             {

     

       14
       16
        
               trigger = ":degrees";

     

       15
       17
        
               replace = "°";

     

       18
       18
       +
             }

     

       19
       19
       +
             {

     

       20
       20
       +
               trigger = ":--";

     

       21
       21
       +
               replace = "—";

     

       16
       22
        
             }

     

       17
       23
        
           ];

     

       18
       24
        
         };

+7 -3

modules/programs/fish.nix

···

       26
       26
        
       

     

       27
       27
        
             nix-your-shell fish | source

     

       28
       28
        
       

     

       29
       29
       +
             if test -d /opt/homebrew/bin;

     

       30
       30
       +
               fish_add_path /opt/homebrew/bin

     

       31
       31
       +
             end;

     

       32
       32
       +
       

     

       29
       33
        
             # Docker compose alias that switches to if the standalone binary is present.

     

       30
       34
        
             if which docker-compose &> /dev/null;

     

       31
       35
        
               alias dc docker-compose;

     
···

       35
       39
        
           '';

     

       36
       40
        
       

     

       37
       41
        
           shellAbbrs = {

     

       38
       38
       -
             code = "codium";

     

       42
       42
       +
             # code = "codium";

     

       39
       43
        
             ga = "git add";

     

       40
       44
        
             gaa = "git add -A";

     

       41
       45
        
             gc = {

     
···

       80
       84
        
                 owner = "PatrickF1";

     

       81
       85
        
                 repo = "fzf.fish";

     

       82
       86
        
                 rev = "8920367cf85eee5218cc25a11e209d46e2591e7a";

     

       83
       83
       -
                 hash = "sha256-lxQZo6APemNjt2c21IL7+uY3YVs81nuaRUL7NDMcB6s=";

     

       87
       87
       +
                 hash = "sha256-T8KYLA/r/gOKvAivKRoeqIwE2pINlxFQtZJHpOy9GMM=";

     

       84
       88
        
               };

     

       85
       89
        
             }

     

       86
       90
        
             {

     
···

       89
       93
        
                 owner = "gazorby";

     

       90
       94
        
                 repo = "fifc";

     

       91
       95
        
                 rev = "a01650cd432becdc6e36feeff5e8d657bd7ee84a";

     

       92
       92
       -
                 hash = "sha256-Nrart7WAh2VQhsDDe0EFI59TqvBO56US2MraqencxgE";

     

       96
       96
       +
                 hash = "sha256-Ynb0Yd5EMoz7tXwqF8NNKqCGbzTZn/CwLsZRQXIAVp4=";

     

       93
       97
        
               };

     

       94
       98
        
             }

     

       95
       99
        
             {

+79 -6

modules/programs/git.nix

···

       1
       1
       -
       {delib, ...}:

     

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       2
       6
        
       delib.module {

     

       3
       7
        
         name = "programs.git";

     

       4
       8
        
       

     

       5
       9
        
         home.always = {myconfig, ...}: let

     

       6
       10
        
           inherit (myconfig.constants) userfullname useremail;

     

       7
       11
        
         in {

     

       8
       8
       -
           xdg.configFile."git/allowed_signers".source = ../../../files/git/allowed_signers;

     

       12
       12
       +
           xdg.configFile."git/allowed_signers".source = ../../files/git/allowed_signers;

     

       13
       13
       +
       

     

       14
       14
       +
           home.packages = [pkgs.jjui];

     

       9
       15
        
       

     

       10
       16
        
           programs.git = {

     

       11
       17
        
             enable = true;

     

       12
       12
       -
             userName = userfullname;

     

       13
       13
       -
             userEmail = useremail;

     

       14
       14
       -
             delta.enable = true;

     

       15
       18
        
       

     

       16
       19
        
             signing = {

     

       17
       20
        
               signByDefault = true;

     
···

       19
       22
        
               key = "~/.ssh/id_ed25519_sk_rk";

     

       20
       23
        
             };

     

       21
       24
        
       

     

       22
       22
       -
             extraConfig = {

     

       25
       25
       +
             settings = {

     

       26
       26
       +
               user = {

     

       27
       27
       +
                 name = userfullname;

     

       28
       28
       +
                 email = useremail;

     

       29
       29
       +
               };

     

       30
       30
       +
       

     

       23
       31
        
               # TODO: custom pretty stuff?

     

       24
       32
        
               blame.showEmail = true;

     

       25
       33
        
               init.defaultBranch = "main";

     
···

       38
       46
        
                 ff = "only";

     

       39
       47
        
                 # Really only useful on a well-managed team. Maybe eventually.

     

       40
       48
        
                 # verifySignatures = true;

     

       49
       49
       +
                 conflictStyle = "diff3";

     

       41
       50
        
               };

     

       42
       51
        
       

     

       43
       52
        
               push = {

     
···

       69
       78
        
               };

     

       70
       79
        
             };

     

       71
       80
        
           };

     

       81
       81
       +
       

     

       82
       82
       +
           programs.jujutsu = {

     

       83
       83
       +
             enable = true;

     

       84
       84
       +
             settings = {

     

       85
       85
       +
               user = {

     

       86
       86
       +
                 name = userfullname;

     

       87
       87
       +
                 email = useremail;

     

       88
       88
       +
               };

     

       89
       89
       +
       

     

       90
       90
       +
               ui = {

     

       91
       91
       +
                 default-command = "log";

     

       92
       92
       +
                 show-cryptographic-signatures = true;

     

       93
       93
       +
                 conflict-marker-style = "git";

     

       94
       94
       +
                 # diff-formatter = "delta";

     

       95
       95
       +
                 editor = "codium -w";

     

       96
       96
       +
                 merge-editor = "vscodium";

     

       97
       97
       +
               };

     

       98
       98
       +
       

     

       99
       99
       +
               revset-aliases = {

     

       100
       100
       +
                 "closest_bookmark(to)" = "heads(::to & bookmarks())";

     

       101
       101
       +
                 "p(n)" = "p(@, n)";

     

       102
       102
       +
                 "p(r, n)" = "roots(r | ancestors(r-, n))";

     

       103
       103
       +
                 "tail()" = "tail(@)";

     

       104
       104
       +
                 "tail(h)" = "roots(trunk()..h)";

     

       105
       105
       +
               };

     

       106
       106
       +
       

     

       107
       107
       +
               aliases = {

     

       108
       108
       +
                 e = ["edit"];

     

       109
       109
       +
                 n = ["new"];

     

       110
       110
       +
                 tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       111
       111
       +
                 tug-here = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "@"];

     

       112
       112
       +
                 solve = ["resolve" "--tool" "mergiraf"];

     

       113
       113
       +
               };

     

       114
       114
       +
       

     

       115
       115
       +
               merge-tools.mergiraf = {

     

       116
       116
       +
                 program = "mergiraf";

     

       117
       117
       +
                 merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];

     

       118
       118
       +
                 merge-conflict-exit-codes = [1];

     

       119
       119
       +
                 conflict-marker-style = "git";

     

       120
       120
       +
               };

     

       121
       121
       +
       

     

       122
       122
       +
               git = {

     

       123
       123
       +
                 sign-on-push = true;

     

       124
       124
       +
                 write-change-id-header = true;

     

       125
       125
       +
               };

     

       126
       126
       +
       

     

       127
       127
       +
               signing = {

     

       128
       128
       +
                 behavior = "drop";

     

       129
       129
       +
                 backend = "ssh";

     

       130
       130
       +
                 key = "~/.ssh/id_ed25519_sk_rk.pub";

     

       131
       131
       +
                 backends.ssh.allowed-signers = "~/.config/git/allowed_signers";

     

       132
       132
       +
               };

     

       133
       133
       +
       

     

       134
       134
       +
               remotes.origin.auto-track-bookmarks = "glob:*";

     

       135
       135
       +
             };

     

       136
       136
       +
           };

     

       137
       137
       +
       

     

       138
       138
       +
           programs.delta = {

     

       139
       139
       +
             enable = true;

     

       140
       140
       +
             enableGitIntegration = true;

     

       141
       141
       +
             enableJujutsuIntegration = true;

     

       142
       142
       +
           };

     

       143
       143
       +
       

     

       144
       144
       +
           programs.mergiraf.enable = true;

     

       72
       145
        
         };

     

       73
       146
        
       }

+1 -1

modules/programs/kitty.nix

···

       14
       14
        
             cursor_shape = "block";

     

       15
       15
        
             cursor_shape_unfocused = "hollow";

     

       16
       16
        
             scrollback_lines = 10000;

     

       17
       17
       -
             scrollback_pager = "moar +INPUT_LINE_NUMBER";

     

       17
       17
       +
             scrollback_pager = "moor +INPUT_LINE_NUMBER";

     

       18
       18
        
             scrollback_pager_history_size = 5;

     

       19
       19
        
             window_padding_width = 8;

     

       20
       20
        
             hide_window_decorations = true;

+20

modules/programs/obs-studio.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         delib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       delib.module {

     

       7
       7
       +
         name = "programs.obs-studio";

     

       8
       8
       +
       

     

       9
       9
       +
         options = delib.singleEnableOption true;

     

       10
       10
       +
       

     

       11
       11
       +
         nixos.ifEnabled.programs.obs-studio = {

     

       12
       12
       +
           enable = true;

     

       13
       13
       +
           plugins = with pkgs.obs-studio-plugins; [

     

       14
       14
       +
             obs-vaapi

     

       15
       15
       +
             obs-gstreamer

     

       16
       16
       +
             obs-vkcapture

     

       17
       17
       +
             obs-pipewire-audio-capture

     

       18
       18
       +
           ];

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+3 -1

modules/programs/ssh.nix

···

       4
       4
        
       

     

       5
       5
        
         home.always.programs.ssh = {

     

       6
       6
        
           enable = true;

     

       7
       7
       +
           enableDefaultConfig = false;

     

       8
       8
       +
       

     

       7
       9
        
           matchBlocks = {

     

       8
       10
        
             "*" = {

     

       9
       11
        
               identitiesOnly = true;

     
···

       13
       15
        
           };

     

       14
       16
        
       

     

       15
       17
        
           # TODO: if darwin

     

       16
       16
       -
           # programs.ssh.includes = ["~/.orbstack/ssh/config"];

     

       18
       18
       +
           includes = ["~/.orbstack/ssh/config"];

     

       17
       19
        
         };

     

       18
       20
        
       }

+5 -1

modules/programs/vscode.nix

···

       38
       38
        
                   ms-azuretools.vscode-docker

     

       39
       39
        
                   editorconfig.editorconfig

     

       40
       40
        
                   irongeek.vscode-env

     

       41
       41
       +
                   jjk.jjk

     

       41
       42
        
                   pgourlain.erlang

     

       42
       43
        
                   usernamehw.errorlens

     

       43
       44
        
                   dbaeumer.vscode-eslint

     
···

       46
       47
        
                   bmalehorn.vscode-fish

     

       47
       48
        
                   github.vscode-github-actions

     

       48
       49
        
                   eamodio.gitlens

     

       49
       49
       -
                   # TODO: terraform (use opentofu instead)

     

       50
       50
        
                   ms-vscode.hexeditor

     

       51
       51
        
                   lokalise.i18n-ally

     

       52
       52
        
                   kisstkondoros.vscode-gutter-preview

     
···

       58
       58
        
                   vunguyentuan.vscode-postcss

     

       59
       59
        
                   esbenp.prettier-vscode

     

       60
       60
        
                   prisma.prisma

     

       61
       61
       +
                   gleam.gleam

     

       61
       62
        
                   # TODO: use jedi instead of pylance

     

       62
       63
        
                   ms-python.python

     

       63
       64
        
                   ms-python.debugpy

     
···

       79
       80
        
                   wakatime.vscode-wakatime

     

       80
       81
        
                   redhat.vscode-yaml

     

       81
       82
        
                   arcanis.vscode-zipfs

     

       83
       83
       +
                   golang.go

     

       82
       84
        
                   vscode-marketplace.wraith13.background-phi-colors

     

       83
       85
        
                   vscode-marketplace.be5invis.theme-dolch

     

       84
       86
        
                   vscode-marketplace.fabiospampinato.vscode-diff

     
···

       99
       101
        
                 "[prisma]"."editor.defaultFormatter" = "Prisma.prisma";

     

       100
       102
        
                 "[python]"."editor.defaultFormatter" = "ms-python.python";

     

       101
       103
        
                 "[rust]"."editor.defaultFormatter" = "rust-lang.rust-analyzer";

     

       104
       104
       +
                 "[go]"."editor.defaultFormatter" = "golang.go";

     

       102
       105
        
       

     

       103
       106
        
                 # Sane defaults

     

       104
       107
        
                 "editor.tabSize" = 2;

     
···

       147
       150
        
                 ];

     

       148
       151
        
                 # "prettier.prettierPath" = "prettierd";

     

       149
       152
        
                 "prettier.proseWrap" = "always";

     

       153
       153
       +
                 "chat.disableAIFeatures" = true;

     

       150
       154
        
       

     

       151
       155
        
                 # Pretties

     

       152
       156
        
                 "workbench.colorTheme" = "Dolch";

+9 -3

modules/systemd.nix

···

       4
       4
        
       

     

       5
       5
        
         nixos.always = {

     

       6
       6
        
           systemd = {

     

       7
       7
       -
             extraConfig = ''

     

       8
       8
       -
               DefaultTimeoutStopSec=30s

     

       9
       9
       -
             '';

     

       7
       7
       +
             settings.Manager.DefaultTimeoutStopSec = "30s";

     

       10
       8
        
             user.extraConfig = ''

     

       11
       9
        
               DefaultTimeoutStopSec=30s

     

       12
       10
        
             '';

     

       13
       11
        
           };

     

       12
       12
       +
       

     

       13
       13
       +
           services.udev.extraRules = ''

     

       14
       14
       +
             # USB device rules for both dongle and mouse (Lamzu Maya)

     

       15
       15
       +
             SUBSYSTEM=="usb", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50d", MODE="0666", GROUP="input", TAG+="uaccess"

     

       16
       16
       +
             SUBSYSTEM=="usb", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50f", MODE="0666", GROUP="input", TAG+="uaccess"

     

       17
       17
       +
             KERNEL=="hidraw*", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50d", MODE="0666", GROUP="input", TAG+="uaccess"

     

       18
       18
       +
             KERNEL=="hidraw*", ATTRS{idVendor}=="3554", ATTRS{idProduct}=="f50f", MODE="0666", GROUP="input", TAG+="uaccess"

     

       19
       19
       +
           '';

     

       14
       20
        
         };

     

       15
       21
        
       }

+14

modules/tailscale.nix

···

       1
       1
       +
       {delib, ...}:

     

       2
       2
       +
       delib.module {

     

       3
       3
       +
         name = "tailscale";

     

       4
       4
       +
       

     

       5
       5
       +
         options = delib.singleEnableOption true;

     

       6
       6
       +
       

     

       7
       7
       +
         nixos.ifEnabled.services.tailscale = {

     

       8
       8
       +
           enable = true;

     

       9
       9
       +
           openFirewall = true;

     

       10
       10
       +
           useRoutingFeatures = "client";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         # home.ifEnabled.services.tailscale-systray.enable = true;

     

       14
       14
       +
       }

+4 -6

modules/tray.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         delib,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         ...

     

       5
       5
       -
       }:

     

       1
       1
       +
       {delib, ...}:

     

       6
       2
        
       delib.module {

     

       7
       3
        
         name = "tray";

     

       4
       4
       +
       

     

       5
       5
       +
         options = delib.singleEnableOption true;

     

       8
       6
        
       

     

       9
       7
        
         # TODO: i don't think this is needed anymore???

     

       10
       10
       -
         home.always.systemd.user.targets.tray = {

     

       8
       8
       +
         home.ifEnabled.systemd.user.targets.tray = {

     

       11
       9
        
           Unit = {

     

       12
       10
        
             Description = "Home Manager System Tray";

     

       13
       11
        
             Requires = ["graphical-session-pre.target"];

+4 -2

modules/virtualisation.nix

···

       6
       6
        
       delib.module {

     

       7
       7
        
         name = "virtualisation";

     

       8
       8
        
       

     

       9
       9
       -
         nixos.always = {myconfig, ...}: let

     

       9
       9
       +
         options = delib.singleEnableOption true;

     

       10
       10
       +
       

     

       11
       11
       +
         nixos.ifEnabled = {myconfig, ...}: let

     

       10
       12
        
           inherit (myconfig.constants) username;

     

       11
       13
        
         in {

     

       12
       14
        
           environment.systemPackages = [pkgs.docker-compose];

     
···

       22
       24
        
           users.users.${username}.extraGroups = ["libvirtd"];

     

       23
       25
        
         };

     

       24
       26
        
       

     

       25
       25
       -
         home.always.home.sessionVariables.DOCKER_HOST = "unix:///run/user/1000/podman/podman.sock";

     

       27
       27
       +
         home.ifEnabled.home.sessionVariables.DOCKER_HOST = "unix:///run/user/1000/podman/podman.sock";

     

       26
       28
        
       }

+18 -19

modules/xdg.nix

···

       1
       1
        
       {

     

       2
       2
        
         delib,

     

       3
       3
       +
         moduleSystem,

     

       3
       4
        
         pkgs,

     

       5
       5
       +
         lib,

     

       4
       6
        
         ...

     

       5
       7
        
       }:

     

       6
       8
        
       delib.module {

     

       7
       7
       -
         name = "programs.espanso";

     

       9
       9
       +
         name = "xdg";

     

       8
       10
        
       

     

       9
       11
        
         home.always = let

     

       10
       12
        
           vivalarc = pkgs.fetchFromGitHub {

     
···

       13
       15
        
             rev = "7ee09e9efb46c1524a43f0cb6763b9750db6e81c";

     

       14
       16
        
             hash = "sha256-xYSxB8KjcbeUDEdbA2AJ9FeQC1TkqyXdB9rTMMSm+FA=";

     

       15
       17
        
           };

     

       16
       16
       -
         in {

     

       17
       17
       -
           xdg.desktopEntries.davinci-resolve = {

     

       18
       18
       -
             name = "Davinci Resolve";

     

       19
       19
       -
             exec = "davinci-resolve";

     

       20
       20
       -
             categories = ["AudioVideo" "AudioVideoEditing" "Video" "Graphics"];

     

       21
       21
       -
             comment = "Professional video editing, color, effects and audio post-processing";

     

       22
       22
       -
             genericName = "Video Editor";

     

       23
       23
       -
             type = "Application";

     

       24
       24
       -
             settings.Version = "1.4";

     

       25
       25
       -
           };

     

       26
       26
       -
       

     

       27
       27
       -
           xdg.dataFile."vivalarc".source = vivalarc;

     

       28
       28
       -
         };

     

       29
       29
       -
       

     

       30
       30
       -
         # if darwin:   xdg.configFile = {

     

       31
       31
       -
         # TODO: replace with the full karabiner config instead of needing to manually set complex mods

     

       32
       32
       -
         #   "karabiner/assets/complex_modifications/keybind-helpers.json".source = ../../../files/karabiner/keybind-helpers.json;

     

       33
       33
       -
         # };

     

       18
       18
       +
         in ({

     

       19
       19
       +
             xdg.dataFile."vivalarc".source = vivalarc;

     

       20
       20
       +
             xdg.configFile."karabiner/assets/complex_modifications/keybind-helpers.json".source = ../files/karabiner/keybind-helpers.json;

     

       21
       21
       +
           }

     

       22
       22
       +
           // lib.optionalAttrs (moduleSystem == "nixos") {

     

       23
       23
       +
             xdg.desktopEntries.davinci-resolve = {

     

       24
       24
       +
               name = "Davinci Resolve";

     

       25
       25
       +
               exec = "davinci-resolve";

     

       26
       26
       +
               categories = ["AudioVideo" "AudioVideoEditing" "Video" "Graphics"];

     

       27
       27
       +
               comment = "Professional video editing, color, effects and audio post-processing";

     

       28
       28
       +
               genericName = "Video Editor";

     

       29
       29
       +
               type = "Application";

     

       30
       30
       +
               settings.Version = "1.4";

     

       31
       31
       +
             };

     

       32
       32
       +
           });

     

       34
       33
        
       }

Compare changes