nrabulinski/nix-config - Change TXA66OLAOYNGEDRBC4SKWDZPLBZXUU7WHDIAYN4TXGEJR6WIJOIQC

Readme change and other fixes

Created by nrabulinski on September 21, 2022

TXA66OLAOYNGEDRBC4SKWDZPLBZXUU7WHDIAYN4TXGEJR6WIJOIQC

Dependencies

In channels

main

Change contents

Insertion in nixos/common.nix at line 21 [3.3274]
[2.8097]
[3.3572]
```
  programs.fish.enable = true;
```
Replacement in home-manager/zellij.nix at line 12 [2.8166]
B:BD[2.8391] → [2.8391:8427]
```
        black = theme.bright.black;
```
[2.8391]
[2.8427]
```
        black = theme.dark.black;
```
Replacement in home-manager/desktop/xorg/alacritty.nix at line 24 [2.338257]
B:BD[2.338753] → [2.338753:338771]
```
        size = 7;
```
[2.338753]
[2.338771]
```
        size = 9;
```
File addition: wall.gif (----------)
[4.4673]

Insertion in home-manager/desktop/qute.nix at line 1 [4.4931]

[4.4931]

[4.4932]

{ config, pkgs, ... }:
let
  theme = import ../../theme.nix;
  bg = theme.dark.black;
  fg = theme.bright.white;
in

Replacement in home-manager/desktop/qute.nix at line 8 [4.4931]

B:BD[4.4934] → [4.4934:5001]

  config,
  pkgs,
  ...
}: {
  programs.qutebrowser.enable = true;

[4.4934]

[4.5001]

  programs.qutebrowser = {
    enable = true;
    searchEngines = {
      r = "https://doc.rust-lang.org/stable/std/?search={}";
      lib = "https://lib.rs/search?q={}";
      nip = "https://jisho.org/search/{}";
    };
    # TODO: Make this prettier overall
    settings = {
      colors = {
        downloads = {
          bar.bg = bg;
          start.bg = theme.dark.blue;
          stop.bg = theme.bright.green;
        };
        tabs = rec {
          bar.bg = bg;
          odd.bg = bg;
          odd.fg = fg;
          even = odd;
          selected = rec {
            odd.bg = theme.bright.white;
            odd.fg = theme.dark.black;
            even = odd;
          };
          indicator.start = theme.dark.blue;
          indicator.stop = theme.bright.green;
        };
        statusbar = rec {
          url = {
            inherit fg;
            error.fg = theme.bright.red;
            warn.fg = theme.bright.yellow;
            hover.fg = theme.bright.cyan;
            success.http.fg = fg;
            success.https.fg = fg;
          };
          normal.bg = bg;
          normal.fg = fg;
          private.bg = theme.dark.magenta;
          private.fg = bg;
          insert.bg = theme.dark.green;
          insert.fg = bg;
          passthrough.bg = theme.dark.blue;
          passthrough.fg = bg;
          command = {
            inherit bg fg;
            private = { inherit bg fg; };
          };
        };
        completion = rec {
          inherit fg;
          category.bg = theme.bright.black;
          category.fg = fg;
          odd.bg = bg;
          even = odd;
          match.fg = theme.bright.red;
          item.selected = {
            inherit match;
            bg = fg;
            fg = bg;
            border.top = fg;
            border.bottom = fg;
          };
        };
      };
      tabs = {
        indicator.width = 3;
      };
      # TODO: The terminal shouldn't be hardcoded
      editor.command = [ "kitty" "hx" "{file}" ];
      fonts = {
        # default_family = "Cozette";
        # default_size = "13px";
        default_family = "Iosevka";
        default_size = "13px";
      };
      content = {
        canvas_reading = true;
        blocking.method = "both";
        blocking.whitelist = [ "*.amplitude.com" "amplitude.com" ];
      };
    };
    # Workaround because the nix module doesn't properly handle options that expect a dict
    extraConfig = ''
      c.tabs.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
      c.statusbar.padding = { 'top': 5, 'bottom': 5, 'right': 10, 'left': 10 }
    '';
    keyBindings = {
      passthrough = {
        "<Ctrl-Escape>" = "mode-leave";
      };
    };
  };
  xdg.mimeApps = {
    enable = true;
    defaultApplications = {
      "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
      "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
      "x-scheme-handler/chrome" = "org.qutebrowser.qutebrowser.desktop";
      "text/html" = "org.qutebrowser.qutebrowser.desktop";
      "application/x-extension-htm" = "org.qutebrowser.qutebrowser.desktop";
      "application/x-extension-html" = "org.qutebrowser.qutebrowser.desktop";
      "application/x-extension-shtml" = "org.qutebrowser.qutebrowser.desktop";
      "application/xhtml+xml" = "org.qutebrowser.qutebrowser.desktop";
      "application/x-extension-xhtml" = "org.qutebrowser.qutebrowser.desktop";
      "application/x-extension-xht" = "org.qutebrowser.qutebrowser.desktop";
      "application/pdf" = "org.qutebrowser.qutebrowser.desktop";
    };
  };

Replacement in home-manager/desktop/common.nix at line 1 [4.4694]
B:BD[4.4694] → [4.4695:4718]
```
{
  lib,
  pkgs,
  ...
```
[4.4694]
[4.4718]
```
{ lib
, pkgs
, ...
```

Replacement in home-manager/desktop/common.nix at line 5 [4.4694]

B:BD[4.4723] → [4.4723:4791]

  home.packages = with pkgs; [dunst libnotify bemenu transmission];

[4.4723]

[4.4791]

  home.packages = with pkgs; [
    dunst
    libnotify
    bemenu
    transmission
    nerdfonts
    cozette
    anki-bin
    pamixer
    brightnessctl
    # (callPackage ./cmvnd-fonts.nix { })
  ];

Insertion in home-manager/desktop/common.nix at line 23 [4.4694]
[4.4891]
[4.4891]
```
  fonts.fontconfig.enable = true;
```

File addition: cmvnd-fonts.nix (----------)

[4.4673]

{ stdenvNoCC, lib, fetchFromGitHub }:
let
  version = "1.2.0";
  src = fetchFromGitHub {
    owner = "cmvnd";
    repo = "fonts";
    rev = version;
    sha256 = "sha256-3/VL6E4hc8Y6JnR00P5NHnovXETsYsxIiC2Df+IjPWI=";
  };
in
stdenvNoCC.mkDerivation rec {
  inherit version src;
  pname = "cmvnd-fonts";
  installPhase = ''
    mkdir -p $out/share/fonts/${pname}
    cp -t $out/share/fonts/${pname} {.,spectrum-fonts}/{*.bdf,*.otb}
  '';
}

File addition: chromium.nix (----------)

[4.4673]

{ config, pkgs, ... }:
let
  theme = import ../../theme.nix;
  bg = theme.dark.black;
  fg = theme.bright.white;
in
{
  programs.chromium = {
    enable = true;
    extensions = [
      { id = "oocalimimngaihdkbihfgmpkcpnmlaoa"; }
    ];
  };
}

Insertion in flake.nix at line 12 [6.1162]

[5.1401]

      inputs.nixpkgs.follows = "nixpkgs";
    };
    deploy-rs = {
      url = "github:serokell/deploy-rs";

Insertion in flake.nix at line 18 [6.1162]

[5.1450]

[6.1395]

    nur = {
      url = "github:nix-community/NUR";
      inputs.nixpkgs.follows = "nixpkgs";
    };

Replacement in flake.nix at line 24 [6.1162]

B:BD[6.1401] → [4.2559:2721]

∅:D[4.2721] → [3.493:515]

B:BD[3.493] → [3.493:515]

B:BD[3.515] → [4.2722:3067]

  outputs = {
    nixpkgs,
    home-manager,
    fenix,
    ...
  }: let
    system = "x86_64-linux";
    user = "niko";
    hmConfig = with nixpkgs.lib;
      {
        rust ? false,
        sway ? false,
        qute ? false,
        imports ? [],
      }: {...}: {
        imports =
          [
            ./home-manager/home.nix
          ]
          ++ optional rust ./home-manager/rust.nix
          ++ optional sway ./home-manager/sway.nix
          ++ optional qute ./home-manager/desktop/qute.nix
          ++ imports;

[6.1401]

[3.720]

  outputs =
    { self
    , nixpkgs
    , home-manager
    , fenix
    , deploy-rs
    , nur
    , ...
    }:
    let
      system = "x86_64-linux";
      user = "niko";
      hmConfig = with nixpkgs.lib;
        { rust ? false
        , sway ? false
        , qute ? false
        , node ? false
        , chromium ? false
        , imports ? [ ]
        ,
        }: { ... }: {
          imports =
            [
              ./home-manager/home.nix
            ]
            ++ optional rust ./home-manager/rust.nix
            ++ optional sway ./home-manager/desktop/wayland/sway.nix
            ++ optional qute ./home-manager/desktop/qute.nix
            ++ optional node ./home-manager/node.nix
            ++ optional chromium ./home-manager/desktop/chromium.nix
            ++ imports;
        };
      nurpkgs = nixpkgs.legacyPackages.${system};
    in
    {
      homeConfigurations.wsl = home-manager.lib.homeManagerConfiguration {
        configuration = hmConfig { rust = true; };
        inherit system user;
        homeDirectory = "/home/${user}";
        stateVersion = "22.05";
        extraSpecialArgs = { inherit fenix; };

Deletion in flake.nix at line 67 [6.1162]

B:BD[3.729] → [4.3068:3195]

  in {
    homeConfigurations.wsl = home-manager.lib.homeManagerConfiguration {
      configuration = hmConfig {rust = true;};

Replacement in flake.nix at line 68 [6.1162]

B:BD[6.1637] → [4.3196:3342]

      inherit system user;
      homeDirectory = "/home/${user}";
      stateVersion = "22.05";
      extraSpecialArgs = {inherit fenix;};
    };

[6.1637]

[4.3342]

      nixosConfigurations.virtualBox = nixpkgs.lib.nixosSystem {
        inherit system;

Replacement in flake.nix at line 71 [6.1162]

B:BD[4.3343] → [4.3343:3428]

    nixosConfigurations.virtualBox = nixpkgs.lib.nixosSystem {
      inherit system;

[4.3343]

[4.3428]

        specialArgs = { inherit user; };

Replacement in flake.nix at line 73 [6.1162]

B:BD[4.3429] → [4.3429:3466]

      specialArgs = {inherit user;};

[4.3429]

[4.3466]

        modules = [
          ./nixos/virtualBox.nix
          ({ ... }: {
            nixpkgs.overlays = [ fenix.overlay ];
          })
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.${user} = hmConfig {
              rust = true;
              sway = true;
            };
          }
        ];
      };

Replacement in flake.nix at line 90 [6.1162]

B:BD[4.3467] → [4.3467:3859]

      modules = [
        ./nixos/virtualBox.nix
        ({...}: {nixpkgs.overlays = [fenix.overlay];})
        home-manager.nixosModules.home-manager
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
          home-manager.users.${user} = hmConfig {
            rust = true;
            sway = true;
          };
        }
      ];
    };

[4.3467]

[4.3859]

      nixosConfigurations.legion = nixpkgs.lib.nixosSystem {
        inherit system;

Replacement in flake.nix at line 93 [6.1162]

B:BD[4.3860] → [4.3860:3941]

    nixosConfigurations.legion = nixpkgs.lib.nixosSystem {
      inherit system;

[4.3860]

[4.3941]

        specialArgs = { inherit user; };

Replacement in flake.nix at line 95 [6.1162]

B:BD[4.3942] → [4.3942:3979]

      specialArgs = {inherit user;};

[4.3942]

[4.3979]

        modules = [
          ./nixos/legion.nix
          ({ ... }: {
            nixpkgs.overlays = [ fenix.overlay ];
            nixpkgs.config.packageOverrides = pkgs: {
              nur = import nur {
                inherit pkgs nurpkgs;
              };
            };
          })
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.${user} = hmConfig {
              rust = true;
              qute = true;
              sway = true;
              node = true;
              chromium = true;
              imports = [
                ./home-manager/desktop/xorg/i3.nix
                ./home-manager/pijul.nix
                ({ pkgs, ... }: {
                  home.packages = with pkgs; [ virt-manager steam-run slack logseq ghidra-bin pwndbg ];
                })
              ];
            };
          }
        ];
      };

Replacement in flake.nix at line 127 [6.1162]

B:BD[4.3980] → [4.3980:4594]

∅:D[3.1322] → [6.1756:1763]

∅:D[5.1807] → [6.1756:1763]

∅:D[4.4594] → [6.1756:1763]

B:BD[6.1756] → [6.1756:1763]

      modules = [
        ./nixos/legion.nix
        ({...}: {nixpkgs.overlays = [fenix.overlay];})
        home-manager.nixosModules.home-manager
        {
          home-manager.useGlobalPkgs = true;
          home-manager.useUserPackages = true;
          home-manager.users.${user} = hmConfig {
            rust = true;
            qute = true;
            imports = [
              ./home-manager/desktop/xorg/i3.nix
              ./home-manager/pijul.nix
              ({pkgs, ...}: {
                home.packages = with pkgs; [virt-manager];
              })
            ];
          };
        }
      ];
    };

[4.3980]

[4.4595]

      nixosConfigurations.server = nixpkgs.lib.nixosSystem {
        inherit system;
        specialArgs = { inherit user; };

Replacement in flake.nix at line 132 [6.1162]

B:BD[4.4596] → [4.4596:4671]

    formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
  };

[4.4596]

[6.1763]

        modules = [
          ./nixos/scaleway.nix
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.${user} = hmConfig {
              imports = [
                ./home-manager/pijul.nix
              ];
            };
          }
        ];
      };
      deploy.nodes.satelite = {
        hostname = "51.15.70.96";
        sshUser = "root";
        profiles.system = {
          user = "root";
          path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.server;
        };
      };
      formatter.${system} = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
    };

Insertion in flake.lock at line 3 [6.4]

[6.20]

[5.1]

    "deploy-rs": {
      "inputs": {
        "flake-compat": "flake-compat",
        "nixpkgs": [
          "nixpkgs"
        ],
        "utils": "utils"
      },
      "locked": {
        "lastModified": 1659725433,
        "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=",
        "owner": "serokell",
        "repo": "deploy-rs",
        "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb",
        "type": "github"
      },
      "original": {
        "owner": "serokell",
        "repo": "deploy-rs",
        "type": "github"
      }
    },

Replacement in flake.lock at line 33 [6.4]

B:BD[5.162] → [4.60:170]

        "lastModified": 1655619932,
        "narHash": "sha256-/7L0/ymVXGL0FrQNLAP2P1Ch22RR0kt0N6jfdjm+WVc=",

[5.162]

[5.272]

        "lastModified": 1663311104,
        "narHash": "sha256-FgFdhRPr/PGB/KXZGXe+alNBW96vzyNj8QIwJTX9pnM=",

Replacement in flake.lock at line 37 [6.4]

B:BD[5.331] → [4.171:230]

        "rev": "55987185def5cf3afc616d38907406293a170cfe",

[5.331]

[5.390]

        "rev": "d5a8751249c2818d85c55506f7c4772179bee41f",

Replacement in flake.lock at line 49 [6.4]

B:BD[4.333] → [4.333:443]

        "lastModified": 1650374568,
        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",

[4.333]

[4.443]

        "lastModified": 1648199409,
        "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",

Replacement in flake.lock at line 53 [6.4]

B:BD[4.504] → [4.504:563]

        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",

[4.504]

[4.563]

        "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",

Deletion in flake.lock at line 64 [6.4]
B:BD[6.60] → [4.679:719]
```
        "flake-compat": "flake-compat",
```

Replacement in flake.lock at line 67 [6.4]

B:BD[4.731] → [4.731:800]

        "nmd": "nmd",
        "nmt": "nmt",
        "utils": "utils"

[4.731]

[6.111]

        "utils": "utils_2"

Replacement in flake.lock at line 70 [6.4]

B:BD[6.138] → [4.801:911]

        "lastModified": 1655594877,
        "narHash": "sha256-AQ39Vlb6zhsJqIRz2cN923+ESBxHmeHMHoPqA80xOCE=",

[6.138]

[6.248]

        "lastModified": 1663328500,
        "narHash": "sha256-7n+J/exp8ky4dmk02y5a9R7CGmJvHpzrHMzfEkMtSWA=",

Replacement in flake.lock at line 74 [6.4]

B:BD[6.314] → [4.912:971]

        "rev": "5197e5df7d3a148b1ad080235f70800987bc3549",

[6.314]

[6.373]

        "rev": "5427f3d1f0ea4357cd4af0bffee7248d640c6ffc",

Replacement in flake.lock at line 85 [6.4]

B:BD[6.568] → [4.972:1082]

        "lastModified": 1655567057,
        "narHash": "sha256-Cc5hQSMsTzOHmZnYm8OSJ5RNUp22bd5NADWLHorULWQ=",

[6.568]

[6.678]

        "lastModified": 1663178737,
        "narHash": "sha256-ayOtdyoNx6BqJtTYVzdQCDz/YWb67TY/CMGacFCgNQo=",

Replacement in flake.lock at line 89 [6.4]

B:BD[6.731] → [4.1083:1142]

        "rev": "e0a42267f73ea52adc061a64650fddc59906fc99",

[6.731]

[6.790]

        "rev": "1158501e7c7cba26d922723cf9f70099995eb755",

Replacement in flake.lock at line 99 [6.4]
B:BD[6.970] → [4.1143:1178]
```
    "nmd": {
      "flake": false,
```
[6.970]
[4.1178]
```
    "nur": {
```

Replacement in flake.lock at line 101 [6.4]

B:BD[4.1196] → [4.1196:1853]

        "lastModified": 1653339422,
        "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",
        "owner": "rycee",
        "repo": "nmd",
        "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",
        "type": "gitlab"
      },
      "original": {
        "owner": "rycee",
        "repo": "nmd",
        "type": "gitlab"
      }
    },
    "nmt": {
      "flake": false,
      "locked": {
        "lastModified": 1648075362,
        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
        "owner": "rycee",
        "repo": "nmt",
        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
        "type": "gitlab"

[4.1196]

[4.1853]

        "lastModified": 1663330052,
        "narHash": "sha256-jvMr54DdvkwR3WGsT8pS7CRp2qW0HRtFpXExYJ8FoJI=",
        "owner": "nix-community",
        "repo": "NUR",
        "rev": "5144a46baaccc807cd6ca6fad428068b05cd8d53",
        "type": "github"

Replacement in flake.lock at line 109 [6.4]

B:BD[4.1882] → [4.1882:1956]

        "owner": "rycee",
        "repo": "nmt",
        "type": "gitlab"

[4.1882]

[4.1956]

        "owner": "nix-community",
        "repo": "NUR",
        "type": "github"

Insertion in flake.lock at line 116 [6.4]
[6.1002]
[5.715]
```
        "deploy-rs": "deploy-rs",
```

Replacement in flake.lock at line 119 [6.4]

B:BD[6.1042] → [6.1042:1071]

        "nixpkgs": "nixpkgs"

[6.1042]

[5.742]

        "nixpkgs": "nixpkgs",
        "nur": "nur"

Replacement in flake.lock at line 126 [6.4]

B:BD[5.824] → [4.1972:2082]

        "lastModified": 1655591884,
        "narHash": "sha256-eBjsdPC5vudbUv4/i7AAggrrTATnCTzMfQetCiJndaQ=",

[5.824]

[5.934]

        "lastModified": 1662896065,
        "narHash": "sha256-1LkSsXzI1JTAmP/GMTz4fTJd8y/tw8R79l96q+h7mu8=",

Replacement in flake.lock at line 130 [6.4]

B:BD[5.997] → [4.2083:2142]

        "rev": "eb9b36075272013984ac5d27128e87a714b90c9a",

[5.997]

[5.1056]

        "rev": "2e9f1204ca01c3e20898d4a67c8b84899d394a88",

Replacement in flake.lock at line 142 [6.4]

B:BD[4.2183] → [4.2183:2293]

        "lastModified": 1653893745,
        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",

[4.2183]

[4.2293]

        "lastModified": 1648297722,
        "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
        "type": "github"
      },
      "original": {

Replacement in flake.lock at line 152 [6.4]

B:BD[4.2352] → [4.2352:2411]

        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",

[4.2352]

[4.2411]

        "type": "github"
      }
    },
    "utils_2": {
      "locked": {
        "lastModified": 1659877975,
        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",

Replacement in README.md at line 3 [3.1]

B:BD[4.2] → [4.2:58]

Moved to: https://nest.pijul.com/nrabulinski/nix-config

[4.2]

[7.1]

Rough roadmap:
- [x] Basic setup with ease of adding new hosts
- [ ] Modularize the codebase
- [ ] Make it possible to update user configuration without root access, even on machines which use NixOS Home Manager module
- [ ] Make the theme consistent throughout the system
- [ ] Hopefully make it so that others can use some parts of this config without having to copy or fork it :)

Replacement in README.md at line 10 [3.1]

B:BD[7.2] → [7.2:62]

Theme used throughout:
https://github.com/Manas140/paradise

[7.2]

## Hosts
- `legion` - My main laptop and development machine
- `satelite` - Small VPS I use to experiment with remote deployments
- `wsl` - Obsolete, configuration for when I used Nix on WSL
- `virtualBox` - Obsolete, VirtualBox config I tried before installing NixOS

File addition: .ignore (----------)
[6.2]
```
.git
.DS_Store
```