commit 708135ac3e53a8be5b56dfa359c8a0fdbd87ca9d · wiro.world/dotfiles

+3 -3

apps/flash-installer.nix

···

       1
       -
       { self, system, lib, writeShellApplication, ... }@pkgs:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
        
       let

     

       6
       -
         inherit (self.inputs) nixpkgs;

     

       7
        
       

     

       8
       -
         iso = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit self; }; modules = [ ../nixos/profiles/installer.nix ]; };

     

       9
        
         # Build installer ISO

     

       10
        
         isoPath = "${iso.config.system.build.isoImage}/iso/${iso.config.isoImage.isoName}";

     

       11

···

       1
       +
       { self, lib, writeShellApplication, ... }@pkgs:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
        
       let

     

       6
       +
         inherit (self.outputs) flakeLib;

     

       7
        
       

     

       8
       +
         iso = flakeLib.createSystem pkgs [ ../nixos/profiles/installer.nix ];

     

       9
        
         # Build installer ISO

     

       10
        
         isoPath = "${iso.config.system.build.isoImage}/iso/${iso.config.isoImage.isoName}";

     

       11

+28 -28

flake.lock

···

       44
        
           "base16-schemes": {

     

       45
        
             "flake": false,

     

       46
        
             "locked": {

     

       47
       -
               "lastModified": 1689473676,

     

       48
       -
               "narHash": "sha256-L0RhUr9+W5EPWBpLcmkKpUeCEWRs/kLzVMF3Vao2ZU0=",

     

       49
        
               "owner": "tinted-theming",

     

       50
        
               "repo": "base16-schemes",

     

       51
       -
               "rev": "d95123ca6377cd849cfdce92c0a24406b0c6a789",

     

       52
        
               "type": "github"

     

       53
        
             },

     

       54
        
             "original": {

     
···

       107
        
               ]

     

       108
        
             },

     

       109
        
             "locked": {

     

       110
       -
               "lastModified": 1704741201,

     

       111
       -
               "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=",

     

       112
        
               "owner": "nix-community",

     

       113
        
               "repo": "disko",

     

       114
       -
               "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54",

     

       115
        
               "type": "github"

     

       116
        
             },

     

       117
        
             "original": {

     
···

       247
        
               ]

     

       248
        
             },

     

       249
        
             "locked": {

     

       250
       -
               "lastModified": 1704099619,

     

       251
       -
               "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=",

     

       252
        
               "owner": "nix-community",

     

       253
        
               "repo": "home-manager",

     

       254
       -
               "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851",

     

       255
        
               "type": "github"

     

       256
        
             },

     

       257
        
             "original": {

     
···

       326
        
               "nixpkgs-lib": "nixpkgs-lib"

     

       327
        
             },

     

       328
        
             "locked": {

     

       329
       -
               "lastModified": 1695388192,

     

       330
       -
               "narHash": "sha256-2jelpE7xK+4M7jZNyWL7QYOYegQLYBDQS5bvdo8XRUQ=",

     

       331
        
               "owner": "misterio77",

     

       332
        
               "repo": "nix-colors",

     

       333
       -
               "rev": "37227f274b34a3b51649166deb94ce7fec2c6a4c",

     

       334
        
               "type": "github"

     

       335
        
             },

     

       336
        
             "original": {

     
···

       341
        
           },

     

       342
        
           "nixos-hardware": {

     

       343
        
             "locked": {

     

       344
       -
               "lastModified": 1704786394,

     

       345
       -
               "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=",

     

       346
        
               "owner": "nixos",

     

       347
        
               "repo": "nixos-hardware",

     

       348
       -
               "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b",

     

       349
        
               "type": "github"

     

       350
        
             },

     

       351
        
             "original": {

     
···

       372
        
           },

     

       373
        
           "nixpkgs-lib": {

     

       374
        
             "locked": {

     

       375
       -
               "lastModified": 1694911725,

     

       376
       -
               "narHash": "sha256-8YqI+YU1DGclEjHsnrrGfqsQg3Wyga1DfTbJrN3Ud0c=",

     

       377
        
               "owner": "nix-community",

     

       378
        
               "repo": "nixpkgs.lib",

     

       379
       -
               "rev": "819180647f428a3826bfc917a54449da1e532ce0",

     

       380
        
               "type": "github"

     

       381
        
             },

     

       382
        
             "original": {

     
···

       403
        
           },

     

       404
        
           "nixpkgs-unstable": {

     

       405
        
             "locked": {

     

       406
       -
               "lastModified": 1704722960,

     

       407
       -
               "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",

     

       408
        
               "owner": "nixos",

     

       409
        
               "repo": "nixpkgs",

     

       410
       -
               "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",

     

       411
        
               "type": "github"

     

       412
        
             },

     

       413
        
             "original": {

     
···

       419
        
           },

     

       420
        
           "nixpkgs_2": {

     

       421
        
             "locked": {

     

       422
       -
               "lastModified": 1704732714,

     

       423
       -
               "narHash": "sha256-ABqK/HggMYA/jMUXgYyqVAcQ8QjeMyr1jcXfTpSHmps=",

     

       424
        
               "owner": "nixos",

     

       425
        
               "repo": "nixpkgs",

     

       426
       -
               "rev": "6723fa4e4f1a30d42a633bef5eb01caeb281adc3",

     

       427
        
               "type": "github"

     

       428
        
             },

     

       429
        
             "original": {

     
···

       444
        
               ]

     

       445
        
             },

     

       446
        
             "locked": {

     

       447
       -
               "lastModified": 1704898994,

     

       448
       -
               "narHash": "sha256-v0+4gdcd5GjnMZGs6D77szQ1fEu0CICgDezT2N63edM=",

     

       449
        
               "ref": "refs/heads/master",

     

       450
       -
               "rev": "2e781b1efdbca8781c43b43e350cf17fce8d6750",

     

       451
       -
               "revCount": 1605,

     

       452
        
               "type": "git",

     

       453
        
               "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5"

     

       454
        
             },

···

       44
        
           "base16-schemes": {

     

       45
        
             "flake": false,

     

       46
        
             "locked": {

     

       47
       +
               "lastModified": 1696158499,

     

       48
       +
               "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",

     

       49
        
               "owner": "tinted-theming",

     

       50
        
               "repo": "base16-schemes",

     

       51
       +
               "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",

     

       52
        
               "type": "github"

     

       53
        
             },

     

       54
        
             "original": {

     
···

       107
        
               ]

     

       108
        
             },

     

       109
        
             "locked": {

     

       110
       +
               "lastModified": 1707524024,

     

       111
       +
               "narHash": "sha256-HmumZ8FuWAAYZrWUKm3N4G4h8nmZ5VUVX+vXLmCJNKM=",

     

       112
        
               "owner": "nix-community",

     

       113
        
               "repo": "disko",

     

       114
       +
               "rev": "d07de570ba05cec2807d058daaa044f6955720c7",

     

       115
        
               "type": "github"

     

       116
        
             },

     

       117
        
             "original": {

     
···

       247
        
               ]

     

       248
        
             },

     

       249
        
             "locked": {

     

       250
       +
               "lastModified": 1706981411,

     

       251
       +
               "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",

     

       252
        
               "owner": "nix-community",

     

       253
        
               "repo": "home-manager",

     

       254
       +
               "rev": "652fda4ca6dafeb090943422c34ae9145787af37",

     

       255
        
               "type": "github"

     

       256
        
             },

     

       257
        
             "original": {

     
···

       326
        
               "nixpkgs-lib": "nixpkgs-lib"

     

       327
        
             },

     

       328
        
             "locked": {

     

       329
       +
               "lastModified": 1706637303,

     

       330
       +
               "narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=",

     

       331
        
               "owner": "misterio77",

     

       332
        
               "repo": "nix-colors",

     

       333
       +
               "rev": "fc080c51d2a219b40d886870e364243783ed5ca1",

     

       334
        
               "type": "github"

     

       335
        
             },

     

       336
        
             "original": {

     
···

       341
        
           },

     

       342
        
           "nixos-hardware": {

     

       343
        
             "locked": {

     

       344
       +
               "lastModified": 1707211557,

     

       345
       +
               "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",

     

       346
        
               "owner": "nixos",

     

       347
        
               "repo": "nixos-hardware",

     

       348
       +
               "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",

     

       349
        
               "type": "github"

     

       350
        
             },

     

       351
        
             "original": {

     
···

       372
        
           },

     

       373
        
           "nixpkgs-lib": {

     

       374
        
             "locked": {

     

       375
       +
               "lastModified": 1697935651,

     

       376
       +
               "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",

     

       377
        
               "owner": "nix-community",

     

       378
        
               "repo": "nixpkgs.lib",

     

       379
       +
               "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",

     

       380
        
               "type": "github"

     

       381
        
             },

     

       382
        
             "original": {

     
···

       403
        
           },

     

       404
        
           "nixpkgs-unstable": {

     

       405
        
             "locked": {

     

       406
       +
               "lastModified": 1707546158,

     

       407
       +
               "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",

     

       408
        
               "owner": "nixos",

     

       409
        
               "repo": "nixpkgs",

     

       410
       +
               "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",

     

       411
        
               "type": "github"

     

       412
        
             },

     

       413
        
             "original": {

     
···

       419
        
           },

     

       420
        
           "nixpkgs_2": {

     

       421
        
             "locked": {

     

       422
       +
               "lastModified": 1707650010,

     

       423
       +
               "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",

     

       424
        
               "owner": "nixos",

     

       425
        
               "repo": "nixpkgs",

     

       426
       +
               "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",

     

       427
        
               "type": "github"

     

       428
        
             },

     

       429
        
             "original": {

     
···

       444
        
               ]

     

       445
        
             },

     

       446
        
             "locked": {

     

       447
       +
               "lastModified": 1707742994,

     

       448
       +
               "narHash": "sha256-TXUY4cCxqNgvy5CzsVbt4MHvfw3qc8n90GMapcwPoN0=",

     

       449
        
               "ref": "refs/heads/master",

     

       450
       +
               "rev": "9767b485c2aad1e23097d2b5165287ba84cfa452",

     

       451
       +
               "revCount": 1687,

     

       452
        
               "type": "git",

     

       453
        
               "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5"

     

       454
        
             },

+9 -3

flake.nix

···

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

     

       17
        
           disko.inputs.nixpkgs.follows = "nixpkgs";

     

       18
        
       

     

       0
        
       
     

       19
        
           nix-colors.url = "github:misterio77/nix-colors";

     

       20
        
       

     

       21
        
           nixos-hardware.url = "github:nixos/nixos-hardware";

     
···

       35
        
             inherit (self) outputs;

     

       36
        
             inherit (nixpkgs.lib) genAttrs;

     

       37
        
       

     

       38
       -
             forAllSystems = genAttrs [ "aarch64-linux" "i686-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];

     

       39
        
             flakeLib = import ./lib/flake (nixpkgs // { inherit self; });

     

       40
        
       

     

       0
        
       
     

       41
        
             pkgs = forAllSystems (system: (import nixpkgs {

     

       42
        
               inherit system;

     

       43
        
               config.allowUnfreePredicate = import ./lib/unfree.nix;

     
···

       56
        
             homeManagerModules = import ./modules/home-manager;

     

       57
        
             templates = import ./templates;

     

       58
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       59
        
             nixosConfigurations = with flakeLib; {

     

       60
       -
               "neo-wiro-laptop" = createSystem [

     

       61
        
                 (system "neo-wiro-laptop" "laptop")

     

       62
        
                 (managedDiskLayout "luks-btrfs" { device = "nvme0n1"; swapSize = 12; })

     

       63
        
                 (user "milomoisson" { description = "Milo Moisson"; profile = "desktop"; })

     

       64
        
               ];

     

       65
        
       

     

       66
       -
               "archaic-wiro-laptop" = createSystem [

     

       67
        
                 (system "archaic-wiro-laptop" "laptop")

     

       68
        
                 (user "milomoisson" { description = "Milo Moisson"; profile = "desktop"; })

     

       69
        
               ];

···

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

     

       17
        
           disko.inputs.nixpkgs.follows = "nixpkgs";

     

       18
        
       

     

       19
       +
           # TODO: replace with a custom module, this just acts as a module definition

     

       20
        
           nix-colors.url = "github:misterio77/nix-colors";

     

       21
        
       

     

       22
        
           nixos-hardware.url = "github:nixos/nixos-hardware";

     
···

       36
        
             inherit (self) outputs;

     

       37
        
             inherit (nixpkgs.lib) genAttrs;

     

       38
        
       

     

       39
       +
             forAllSystems = genAttrs [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];

     

       40
        
             flakeLib = import ./lib/flake (nixpkgs // { inherit self; });

     

       41
        
       

     

       42
       +
             # This sould be the only constructed nixpkgs instance in this flake

     

       43
        
             pkgs = forAllSystems (system: (import nixpkgs {

     

       44
        
               inherit system;

     

       45
        
               config.allowUnfreePredicate = import ./lib/unfree.nix;

     
···

       58
        
             homeManagerModules = import ./modules/home-manager;

     

       59
        
             templates = import ./templates;

     

       60
        
       

     

       61
       +
             # Custom exports

     

       62
       +
             inherit flakeLib;

     

       63
       +
             lib = forAllSystems (system: import ./lib pkgs.${system});

     

       64
       +
       

     

       65
        
             nixosConfigurations = with flakeLib; {

     

       66
       +
               "neo-wiro-laptop" = createSystem pkgs."x86_64-linux" [

     

       67
        
                 (system "neo-wiro-laptop" "laptop")

     

       68
        
                 (managedDiskLayout "luks-btrfs" { device = "nvme0n1"; swapSize = 12; })

     

       69
        
                 (user "milomoisson" { description = "Milo Moisson"; profile = "desktop"; })

     

       70
        
               ];

     

       71
        
       

     

       72
       +
               "archaic-wiro-laptop" = createSystem pkgs."x86_64-linux" [

     

       73
        
                 (system "archaic-wiro-laptop" "laptop")

     

       74
        
                 (user "milomoisson" { description = "Milo Moisson"; profile = "desktop"; })

     

       75
        
               ];

+1 -1

home-manager/modules/vm/default.nix

···

       12
        
       let

     

       13
        
         inherit (self.outputs) homeManagerModules;

     

       14
        
       

     

       15
       -
         theme = config.colorScheme.colors;

     

       16
        
         swayCfg = config.wayland.windowManager.sway.config;

     

       17
        
       

     

       18
        
         workspacesRange = zipListsWith (num: ws: { inherit ws num; }) [ 1 2 3 4 5 6 7 8 9 0 ] (range 1 10);

···

       12
        
       let

     

       13
        
         inherit (self.outputs) homeManagerModules;

     

       14
        
       

     

       15
       +
         theme = config.colorScheme.palette;

     

       16
        
         swayCfg = config.wayland.windowManager.sway.config;

     

       17
        
       

     

       18
        
         workspacesRange = zipListsWith (num: ws: { inherit ws num; }) [ 1 2 3 4 5 6 7 8 9 0 ] (range 1 10);

+1 -1

home-manager/modules/vm/search.nix

···

       7
        
       with lib;

     

       8
        
       

     

       9
        
       let

     

       10
       -
         theme = config.colorScheme.colors;

     

       11
        
         keyValueFormat = lib.generators.toKeyValue { };

     

       12
        
       in

     

       13
        
       {

···

       7
        
       with lib;

     

       8
        
       

     

       9
        
       let

     

       10
       +
         theme = config.colorScheme.palette;

     

       11
        
         keyValueFormat = lib.generators.toKeyValue { };

     

       12
        
       in

     

       13
        
       {

+2 -2

home-manager/modules/vm/swaybar.nix

···

       7
        
       with lib;

     

       8
        
       

     

       9
        
       let

     

       10
       -
         theme = config.colorScheme.colors;

     

       11
        
       in

     

       12
        
       {

     

       13
        
         options = { };

     
···

       15
        
         config = {

     

       16
        
           programs.i3status-rust = {

     

       17
        
             enable = true;

     

       18
       -
             bars.default = rec {

     

       19
        
               theme = "modern";

     

       20
        
               icons = "awesome6";

     

       21
        
               blocks = [

···

       7
        
       with lib;

     

       8
        
       

     

       9
        
       let

     

       10
       +
         theme = config.colorScheme.palette;

     

       11
        
       in

     

       12
        
       {

     

       13
        
         options = { };

     
···

       15
        
         config = {

     

       16
        
           programs.i3status-rust = {

     

       17
        
             enable = true;

     

       18
       +
             bars.default = {

     

       19
        
               theme = "modern";

     

       20
        
               icons = "awesome6";

     

       21
        
               blocks = [

+4 -30

home-manager/profiles/desktop.nix

···

       1
        
       { self

     

       2
        
       , lib

     

       0
        
       
     

       3
        
       , config

     

       4
        
       , pkgs

     

       5
        
         # Provides the NixOS configuration if HM was loaded through the NixOS module

     
···

       11
        
       

     

       12
        
       let

     

       13
        
         inherit (self.inputs) agenix nix-colors;

     

       14
       -
         inherit (self.outputs) overlays;

     

       15
        
       

     

       16
        
         tomlFormat = pkgs.formats.toml { };

     

       17
        
       in

     
···

       22
        
       

     

       23
        
           # Nix colors

     

       24
        
           nix-colors.homeManagerModules.default

     

       25
       -
           { colorScheme = nix-colors.colorSchemes.onedark; }

     

       26
        
       

     

       27
        
           ../modules/vm

     

       28
        
           ../modules/git.nix

     
···

       30
        
         ];

     

       31
        
       

     

       32
        
         config = {

     

       33
       -
           nixpkgs = {

     

       34
       -
             overlays = [ overlays.all ];

     

       35
       -
             config.allowUnfreePredicate = import ../../lib/unfree.nix;

     

       36
       -
           };

     

       37
       -
       

     

       38
        
           programs.home-manager.enable = osConfig == null;

     

       39
        
       

     

       40
        
           home = {

     
···

       82
        
               element-desktop

     

       83
        
               gnome.gnome-disk-utility

     

       84
        
               imv

     

       0
        
       
     

       85
        
               mpv

     

       86
        
               transmission-gtk

     

       87
        
               audacity

     

       0
        
       
     

       88
        
               libreoffice-qt

     

       89
        
       

     

       90
        
               # Needed for libreoffice

     
···

       214
        
           programs.gpg = {

     

       215
        
             enable = true;

     

       216
        
             homedir = "${config.xdg.dataHome}/gnupg";

     

       217
       -
           };

     

       218
       -
       

     

       219
       -
           programs.topgrade = {

     

       220
       -
             enable = true;

     

       221
       -
             package = pkgs.unstable.topgrade;

     

       222
       -
             settings = {

     

       223
       -
               misc = {

     

       224
       -
                 # Don't ask for confirmations

     

       225
       -
                 assume_yes = true;

     

       226
       -
       

     

       227
       -
                 # Run `sudo -v` to cache credentials at the start of the run; this avoids a

     

       228
       -
                 # blocking password prompt in the middle of a possibly-unattended run.

     

       229
       -
                 pre_sudo = true;

     

       230
       -
       

     

       231
       -
                 skip_notify = true;

     

       232
       -
                 disable = [ "rustup" ];

     

       233
       -
                 no_retry = true;

     

       234
       -
                 cleanup = true;

     

       235
       -
               };

     

       236
       -
       

     

       237
       -
               # TODO: sepcify via global config 

     

       238
       -
               git.repos = [ "~/Developement/*/*" "~/.config/dotfiles" ];

     

       239
       -
             };

     

       240
        
           };

     

       241
        
         };

     

       242
        
       }

···

       1
        
       { self

     

       2
        
       , lib

     

       3
       +
       , llib

     

       4
        
       , config

     

       5
        
       , pkgs

     

       6
        
         # Provides the NixOS configuration if HM was loaded through the NixOS module

     
···

       12
        
       

     

       13
        
       let

     

       14
        
         inherit (self.inputs) agenix nix-colors;

     

       0
        
       
     

       15
        
       

     

       16
        
         tomlFormat = pkgs.formats.toml { };

     

       17
        
       in

     
···

       22
        
       

     

       23
        
           # Nix colors

     

       24
        
           nix-colors.homeManagerModules.default

     

       25
       +
           { config.colorScheme = llib.colorSchemes.oneDark; }

     

       26
        
       

     

       27
        
           ../modules/vm

     

       28
        
           ../modules/git.nix

     
···

       30
        
         ];

     

       31
        
       

     

       32
        
         config = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       33
        
           programs.home-manager.enable = osConfig == null;

     

       34
        
       

     

       35
        
           home = {

     
···

       77
        
               element-desktop

     

       78
        
               gnome.gnome-disk-utility

     

       79
        
               imv

     

       80
       +
               (lutris.override { extraPkgs = pkgs: [ winetricks vulkan-loader ]; })

     

       81
        
               mpv

     

       82
        
               transmission-gtk

     

       83
        
               audacity

     

       84
       +
       

     

       85
        
               libreoffice-qt

     

       86
        
       

     

       87
        
               # Needed for libreoffice

     
···

       211
        
           programs.gpg = {

     

       212
        
             enable = true;

     

       213
        
             homedir = "${config.xdg.dataHome}/gnupg";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       214
        
           };

     

       215
        
         };

     

       216
        
       }

+37

lib/colorSchemes.nix

···

       1
       +
       {

     

       2
       +
         # Found in <https://github.com/tinted-theming/schemes/blob/spec-0.11/base24/one-dark.yaml>

     

       3
       +
         # Transformed using `yaml2nix`

     

       4
       +
         oneDark = {

     

       5
       +
           name = "One Dark";

     

       6
       +
           author = "FredHappyface (https://github.com/FredHappyface)";

     

       7
       +
           variant = "dark";

     

       8
       +
           # system = "base24";

     

       9
       +
           palette = {

     

       10
       +
             base00 = "282c34";

     

       11
       +
             base01 = "3f4451";

     

       12
       +
             base02 = "4f5666";

     

       13
       +
             base03 = "545862";

     

       14
       +
             base04 = "9196a1";

     

       15
       +
             base05 = "abb2bf";

     

       16
       +
             base06 = "e6e6e6";

     

       17
       +
             base07 = "ffffff";

     

       18
       +
             base08 = "e05561";

     

       19
       +
             base09 = "d18f52";

     

       20
       +
             base0A = "e6b965";

     

       21
       +
             base0B = "8cc265";

     

       22
       +
             base0C = "42b3c2";

     

       23
       +
             base0D = "4aa5f0";

     

       24
       +
             base0E = "c162de";

     

       25
       +
             base0F = "bf4034";

     

       26
       +
             base10 = "21252b";

     

       27
       +
             base11 = "181a1f";

     

       28
       +
             base12 = "ff616e";

     

       29
       +
             base13 = "f0a45d";

     

       30
       +
             base14 = "a5e075";

     

       31
       +
             base15 = "4cd1e0";

     

       32
       +
             base16 = "4dc4ff";

     

       33
       +
             base17 = "de73ff";

     

       34
       +
           };

     

       35
       +
         };

     

       36
       +
       

     

       37
       +
       }

+4 -2

lib/default.nix

···

       1
       -
       # This will be merged with nixpkgs' lib

     

       2
       -
       pkgs: { }

     

       0
        
       
     

       0

···

       1
       +
       # This flake library is available to modules via the `llib` arg

     

       2
       +
       pkgs: {

     

       3
       +
         colorSchemes = import ./colorSchemes.nix;

     

       4
       +
       }

+17 -4

lib/flake/default.nix

···

       1
       -
       { self, lib, ... }@pkgs:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       5
        
       {

     

       6
       -
         createSystem = modules: nixosSystem {

     

       7
       -
           specialArgs = { inherit self; };

     

       8
       -
           inherit modules;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
         };

     

       10
        
       

     

       11
        
         system = hostName: profile: {

···

       1
       +
       { self, lib, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
       +
       let

     

       6
       +
         inherit (self.inputs) nixpkgs-unstable;

     

       7
       +
       in

     

       8
        
       {

     

       9
       +
         # Makes

     

       10
       +
         # - flake accessible through `self`

     

       11
       +
         # - local flake library accessible through `llib`

     

       12
       +
         # - unstable nixpkgs set accessible through `upkgs`

     

       13
       +
         specialModuleArgs = pkgs: {

     

       14
       +
           inherit self;

     

       15
       +
           llib = import ../. pkgs;

     

       16
       +
           upkgs = import nixpkgs-unstable { inherit (pkgs) system config; };

     

       17
       +
         };

     

       18
       +
       

     

       19
       +
         createSystem = pkgs: modules: nixosSystem {

     

       20
       +
           inherit pkgs modules;

     

       21
       +
           specialArgs = self.flakeLib.specialModuleArgs pkgs;

     

       22
        
         };

     

       23
        
       

     

       24
        
         system = hostName: profile: {

+2 -2

lib/flake/user.nix

···

       31
        
           } // user;

     

       32
        
       

     

       33
        
           home-manager = {

     

       34
       -
             extraSpecialArgs = { inherit self; };

     

       35
        
       

     

       36
        
             useUserPackages = false;

     

       37
       -
             useGlobalPkgs = false;

     

       38
        
       

     

       39
        
             users.${name} = import ../../home-manager/profiles/${profile}.nix;

     

       40
        
           };

···

       31
        
           } // user;

     

       32
        
       

     

       33
        
           home-manager = {

     

       34
       +
             extraSpecialArgs = self.flakeLib.specialModuleArgs pkgs;

     

       35
        
       

     

       36
        
             useUserPackages = false;

     

       37
       +
             useGlobalPkgs = true;

     

       38
        
       

     

       39
        
             users.${name} = import ../../home-manager/profiles/${profile}.nix;

     

       40
        
           };

+5 -7

nixos/hardware/archaic-wiro-laptop.nix

···

       1
       -
       { config

     

       2
       -
       , lib

     

       3
       -
       , pkgs

     

       4
       -
       , modulesPath

     

       5
       -
       , ...

     

       6
       -
       }: {

     

       7
       -
         imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];

     

       8
        
       

     

       0
        
       
     

       9
        
         config = {

     

       10
        
           local.screen = {

     

       11
        
             width = 1920;

     
···

       45
        
           nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

     

       46
        
           powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";

     

       47
        
           hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       48
        
         };

     

       49
        
       }

···

       1
       +
       { config, lib, ... }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
       +
       {

     

       4
        
         config = {

     

       5
        
           local.screen = {

     

       6
        
             width = 1920;

     
···

       40
        
           nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

     

       41
        
           powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";

     

       42
        
           hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

     

       43
       +
       

     

       44
       +
           # Replaces `<modules>/installer/scan/not-detected.nix` import

     

       45
       +
           hardware.enableRedistributableFirmware = lib.mkDefault true;

     

       46
        
         };

     

       47
        
       }

+4 -3

nixos/hardware/neo-wiro-laptop.nix

···

       1
       -
       { self, config, lib, pkgs, modulesPath, ... }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         inherit (self.outputs) nixosModules;

     

       5
        
       in

     

       6
        
       {

     

       7
        
         imports = [

     

       8
       -
           "${modulesPath}/installer/scan/not-detected.nix"

     

       9
       -
       

     

       10
        
           # Patches ACPI tables to fix sound issue

     

       11
        
           nixosModules.hardware.asus.zenbook.ux3402za.sound

     

       12
        
         ];

     
···

       36
        
       

     

       37
        
           nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

     

       38
        
           hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       39
        
         };

     

       40
        
       }

···

       1
       +
       { self, config, lib, ... }:

     

       2
        
       

     

       3
        
       let

     

       4
        
         inherit (self.outputs) nixosModules;

     

       5
        
       in

     

       6
        
       {

     

       7
        
         imports = [

     

       0
        
       
     

       0
        
       
     

       8
        
           # Patches ACPI tables to fix sound issue

     

       9
        
           nixosModules.hardware.asus.zenbook.ux3402za.sound

     

       10
        
         ];

     
···

       34
        
       

     

       35
        
           nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

     

       36
        
           hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

     

       37
       +
       

     

       38
       +
           # Replaces `<modules>/installer/scan/not-detected.nix` import

     

       39
       +
           hardware.enableRedistributableFirmware = lib.mkDefault true;

     

       40
        
         };

     

       41
        
       }

-9

nixos/modules/nix.nix

···

       1
        
       { self

     

       2
        
       , lib

     

       3
        
       , config

     

       4
       -
       , pkgs

     

       5
        
       , ...

     

       6
        
       }:

     

       7
        
       

     

       8
        
       with lib;

     

       9
        
       

     

       10
       -
       let

     

       11
       -
         inherit (self.outputs) overlays;

     

       12
       -
       in

     

       13
        
       {

     

       14
        
         config = {

     

       15
       -
           nixpkgs = {

     

       16
       -
             overlays = [ overlays.all ];

     

       17
       -
             config.allowUnfreePredicate = import ../../lib/unfree.nix;

     

       18
       -
           };

     

       19
       -
       

     

       20
        
           nix = {

     

       21
        
             # Make system registry consistent with flake inputs

     

       22
        
             # Add `self` registry input that refers to flake

···

       1
        
       { self

     

       2
        
       , lib

     

       3
        
       , config

     

       0
        
       
     

       4
        
       , ...

     

       5
        
       }:

     

       6
        
       

     

       7
        
       with lib;

     

       8
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       9
        
       {

     

       10
        
         config = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
           nix = {

     

       12
        
             # Make system registry consistent with flake inputs

     

       13
        
             # Add `self` registry input that refers to flake

nixos/modules/virtualisation.nix

···

       17
        
           };

     

       18
        
       

     

       19
        
           virtualisation.waydroid.enable = true;

     

       0
        
       
     

       0
        
       
     

       20
        
         };

     

       21
        
       }

···

       17
        
           };

     

       18
        
       

     

       19
        
           virtualisation.waydroid.enable = true;

     

       20
       +
       

     

       21
       +
           services.flatpak.enable = true;

     

       22
        
         };

     

       23
        
       }

+1 -2

nixos/profiles/installer.nix

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       let

     

       6
       -
         inherit (self.inputs) disko;

     

       7
       -
         inherit (pkgs) writeShellScriptBin writeShellApplication pastebinit;

     

       8
        
       

     

       9
        
         binName = drv: drv.meta.mainProgram;

     

       10

···

       3
        
       with lib;

     

       4
        
       

     

       5
        
       let

     

       6
       +
         inherit (pkgs) writeShellScriptBin pastebinit;

     

       0
        
       
     

       7
        
       

     

       8
        
         binName = drv: drv.meta.mainProgram;

     

       9

+3 -14

overlays/default.nix

···

       4
        
       }:

     

       5
        
       

     

       6
        
       let

     

       7
       -
         inherit (self.inputs) nixpkgs-unstable;

     

       8
        
         inherit (lib) composeManyExtensions;

     

       9
        
       in

     

       10
        
       rec {

     

       11
        
         # Bundles all overlays, order matters here

     

       12
       -
         all = composeManyExtensions [ addFlakeAsSelf localLib additions patches unstablePackages ];

     

       13
        
       

     

       14
       -
         # Passing our flake as `self` makes it easy to access inputs and outputs

     

       15
       -
         addFlakeAsSelf = final: prev: { inherit self; };

     

       16
       -
       

     

       17
       -
         # Merge our local library to nixpkgs'

     

       18
       -
         localLib = final: prev: {

     

       19
       -
           lib = { local = import ../lib final; } // prev.lib;

     

       20
       -
         };

     

       21
        
       

     

       22
        
         # Bring our custom packages from the `pkgs` directory

     

       23
        
         additions = final: prev: import ../pkgs prev;

     

       24
        
       

     

       25
        
         # Custom derivation patches that temporarily fix a package

     

       26
        
         patches = import ./patches.nix;

     

       27
       -
       

     

       28
       -
         # Makes the unstable nixpkgs set accessible through `pkgs.unstable`

     

       29
       -
         unstablePackages = final: prev: {

     

       30
       -
           unstable = import nixpkgs-unstable { inherit (final) system config; };

     

       31
       -
         };

     

       32
        
       }

···

       4
        
       }:

     

       5
        
       

     

       6
        
       let

     

       0
        
       
     

       7
        
         inherit (lib) composeManyExtensions;

     

       8
        
       in

     

       9
        
       rec {

     

       10
        
         # Bundles all overlays, order matters here

     

       11
       +
         all = composeManyExtensions [ bringSpecialArgs additions patches ];

     

       12
        
       

     

       13
       +
         # Bring `self`, `llib` and `upkgs`

     

       14
       +
         bringSpecialArgs = final: prev: self.flakeLib.specialModuleArgs final;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
        
         # Bring our custom packages from the `pkgs` directory

     

       17
        
         additions = final: prev: import ../pkgs prev;

     

       18
        
       

     

       19
        
         # Custom derivation patches that temporarily fix a package

     

       20
        
         patches = import ./patches.nix;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
       }