flake: Add nix-init to devshell

emacs: Don't set services.emacs.defaultEditor
eww: Update workspaces script to new nushell syntax
2024-03-11 17:53:56 +01:00 · 2024-03-11 17:53:35 +01:00 · 2024-03-11 17:53:12 +01:00 · 2024-03-11 17:52:37 +01:00 · 2024-03-11 17:52:20 +01:00 · 2024-03-11 17:52:01 +01:00
12 changed files with 130 additions and 83 deletions
--- a/flake.lock
+++ b/flake.lock
@ -124,11 +124,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709773529,
-        "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=",
+        "lastModified": 1710119954,
+        "narHash": "sha256-e7AMYtBQgRzeRtn//k1dXu22xeiav+G0cQjm3gEky7o=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b",
+        "rev": "d389901567d9ceda5a1a833fbf8e8e254e18eb0a",
        "type": "github"
      },
      "original": {
@ -148,11 +148,11 @@
        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1709862236,
-        "narHash": "sha256-i/0IUNU2q11tTTYK6HCdJn+YV2vly08PMCRiN2Ksjr4=",
+        "lastModified": 1710121508,
+        "narHash": "sha256-lOfYN1BMBNarx3Nvcro6EEXq+ZSUHyhc2WJJdWACwoA=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "6cd7ddb6c8a8ac4b2bfb35ca3261d3e689740c8e",
+        "rev": "65f195e937a170adac199b12eab303b8488bf38b",
        "type": "github"
      },
      "original": {
@ -324,11 +324,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -414,11 +414,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709764752,
-        "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
+        "lastModified": 1710062421,
+        "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
+        "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a",
        "type": "github"
      },
      "original": {
@ -438,11 +438,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1709297667,
-        "narHash": "sha256-5JUaHyRFKDPqyeTlbMFS6VixAWRkO5uCRTS8asEjiyo=",
+        "lastModified": 1710080963,
+        "narHash": "sha256-E1qvw0/ZfJfVDMysc5EN7g8wD/0j2uF3a1efVxz7pWk=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "7f93206b22131aac8fa46d787696ea58460aecab",
+        "rev": "30e577e95ba469ba0d0c08e64e81604b1d097f9c",
        "type": "github"
      },
      "original": {
@ -521,11 +521,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1709410583,
-        "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
+        "lastModified": 1710123225,
+        "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
+        "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba",
        "type": "github"
      },
      "original": {
@ -586,11 +586,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1709677081,
-        "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
+        "lastModified": 1710021367,
+        "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
+        "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
        "type": "github"
      },
      "original": {
@ -618,11 +618,11 @@
    },
    "nixpkgs-stable_4": {
      "locked": {
-        "lastModified": 1709428628,
-        "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
+        "lastModified": 1710033658,
+        "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
+        "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8",
        "type": "github"
      },
      "original": {
@ -634,11 +634,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1709703039,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "lastModified": 1709961763,
+        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
        "type": "github"
      },
      "original": {
@ -762,11 +762,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709863839,
-        "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=",
+        "lastModified": 1710123130,
+        "narHash": "sha256-EoGL/WSM1M2L099Q91mPKO/FRV2iu2ZLOEp3y5sLfiE=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a",
+        "rev": "73aca260afe5d41d3ebce932c8d896399c9d5174",
        "type": "github"
      },
      "original": {
@ -783,11 +783,11 @@
        "nixpkgs-stable": "nixpkgs-stable_4"
      },
      "locked": {
-        "lastModified": 1709711091,
-        "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=",
+        "lastModified": 1710039806,
+        "narHash": "sha256-vC2fo/phnetp6ub/nRv6mgAi5LbhJ6ujGQWrRD2VgNs=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc",
+        "rev": "f8d5c8baa83fe620a28c0db633be9db3e34474b4",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -158,24 +158,19 @@
        overlays.default = import ./overlays;

        nixosModules = builtins.listToAttrs (
-          map
-            (x: {
-              name = x;
-              value = import (./modules + "/${x}");
-            })
-            (builtins.attrNames (builtins.readDir ./modules))
+          map (x: {
+            name = x;
+            value = import (./modules + "/${x}");
+          }) (builtins.attrNames (builtins.readDir ./modules))
        );

        nixosConfigurations = builtins.listToAttrs (
-          map
-            (machine: {
-              name = machine;
-              value =
-                self.lib.defSystem (machines.${machine}.system or "x86_64-linux")
-                  { imports = [ machines.${machine}.config ]; }
-                  (machines.${machine}.deploy or null);
-            })
-            (builtins.attrNames machines)
+          map (machine: {
+            name = machine;
+            value = self.lib.defSystem (machines.${machine}.system or "x86_64-linux") {
+              imports = [ machines.${machine}.config ];
+            } (machines.${machine}.deploy or null);
+          }) (builtins.attrNames machines)
        );

        colmena =
@ -189,22 +184,19 @@
            };
          }
          // builtins.listToAttrs (
-            map
-              (machine: {
-                name = machine;
-                value = {
-                  deployment = {
-                    targetHost = machines.${machine}.deploy.host;
-                    targetUser = "root"; # machines.${machine}.deploy.sshUser;
-                    # targetUser = machines.${machine}.deploy.sshUser;
-                    tags = machines.${machine}.deploy.tags or [ ];
-                  };
-                  imports =
-                    self.lib.systemModules (machines.${machine}.system or "x86_64-linux")
-                      machines.${machine}.config;
+            map (machine: {
+              name = machine;
+              value = {
+                deployment = {
+                  targetHost = machines.${machine}.deploy.host;
+                  targetUser = "root"; # machines.${machine}.deploy.sshUser;
+                  # targetUser = machines.${machine}.deploy.sshUser;
+                  tags = machines.${machine}.deploy.tags or [ ];
                };
-              })
-              (builtins.filter (machine: machines.${machine} ? deploy) (builtins.attrNames machines))
+                imports = self.lib.systemModules (machines.${machine}.system or "x86_64-linux"
+                ) machines.${machine}.config;
+              };
+            }) (builtins.filter (machine: machines.${machine} ? deploy) (builtins.attrNames machines))
          );
      };

@ -239,6 +231,7 @@
          packages = {
            incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
            openfga = pkgs.callPackage ./pkgs/openfga { };
+            gitu = pkgs.callPackage ./pkgs/gitu { };
          };

          devShells.default =
@ -256,13 +249,14 @@
                nodePackages.prettier
                multimarkdown
                nix-diff
-                nixfmt-rfc-style
+                nix-init
                nix-prefetch
                nix-prefetch-docker
                nix-prefetch-github
                nix-prefetch-scripts
                nix-tree
                nix-top
+                nixfmt-rfc-style
                openssl
                pciutils
                pkgs.sops
--- a/home-manager/modules/emacs/default.nix
+++ b/home-manager/modules/emacs/default.nix
@ -174,7 +174,6 @@ in
      package = emacsWithPackages;
      client.enable = true;
      socketActivation.enable = true;
-      defaultEditor = true;
    };

    home.file."emacs.d/early-init.el".source = tangleEmacsConfig "early-init.el";
@ -194,7 +193,9 @@ in
        nodePackages.bash-language-server
        aspell
        lldb
-        (nil.overrideAttrs (_: { doCheck = false; }))
+        (nil.overrideAttrs (_: {
+          doCheck = false;
+        }))
        nixfmt-rfc-style
        python3
      ]
--- a/home-manager/modules/eww/config/scripts/workspaces.nu
+++ b/home-manager/modules/eww/config/scripts/workspaces.nu
@ -21,7 +21,7 @@ def is-i3 [] {
 }

 export def ipc-cmd [--raw, ...parameters: string] {
-    let result = (run-external --redirect-stdout (ipcCmd) $parameters)
+    let result = (run-external --redirect-stdout (ipcCmd) ...$parameters)
    if $raw {
       $result
    } else {
@ -48,4 +48,4 @@ def main [] {
             print (workspaces | to json -r)
         }
    }
-}
+}
--- a/home-manager/modules/git/default.nix
+++ b/home-manager/modules/git/default.nix
@ -176,6 +176,9 @@ in
      };
    };

-    home.packages = [ pkgs.git-credential-manager ];
+    home.packages = [
+      pkgs.git-credential-manager
+      pkgs.gitu
+    ];
  };
 }
--- a/home-manager/modules/nushell/default.nix
+++ b/home-manager/modules/nushell/default.nix
@ -35,7 +35,6 @@ in

          register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query
          register ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats
-          register ${pkgs.nushellPlugins.net}/bin/nu_plugin_net

          use kink.nu

@ -45,6 +44,7 @@ in
          $env.config = ($env.config | merge { color_config: (dracula)})
        '';
      };
+      # register ${pkgs.nushellPlugins.net}/bin/nu_plugin_net

      carapace = {
        enable = true;
--- a/home-manager/modules/vscode/default.nix
+++ b/home-manager/modules/vscode/default.nix
@ -83,7 +83,7 @@ in
    };

    home.packages = with pkgs; [
-      rnix-lsp
+      nil
      shellcheck
    ];
  };
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@ -10,7 +10,7 @@ let

  iosevka-buildplans = builtins.fromTOML (builtins.readFile "${pkgs.iosevka.src}/build-plans.toml");
  iosevka-aile = pkgs.iosevka.override {
-    privateBuildPlan = iosevka-buildplans.buildPlans.iosevka-aile;
+    privateBuildPlan = iosevka-buildplans.buildPlans.IosevkaAile;
    set = "aile";
  };
 in
--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -44,4 +44,5 @@ _final: prev: {

  incus-ui = prev.pkgs.callPackage ../pkgs/incus-ui { };
  openfga = prev.pkgs.callPackage ../pkgs/openfga { };
+  gitu = prev.pkgs.callPackage ../pkgs/gitu { };
 }
--- a/pkgs/gitu/default.nix
+++ b/pkgs/gitu/default.nix
@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libgit2,
+  openssl,
+  zlib,
+  stdenv,
+  darwin,
+  git,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "gitu";
+  version = "0.5.4";
+
+  src = fetchFromGitHub {
+    owner = "altsem";
+    repo = "gitu";
+    rev = "v${version}";
+    hash = "sha256-a4hNgEizxanYE3XuHSCmbV6CkOqhXkznP3Sp0KLFFQs=";
+  };
+
+  cargoHash = "sha256-+CA3UG32oZedzRbt7b0wOlhH/subuym4BCL5SMNzrr8=";
+
+  nativeBuildInputs = [
+    pkg-config
+    git
+  ];
+
+  buildInputs = [
+    libgit2
+    openssl
+    zlib
+  ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+  meta = with lib; {
+    description = "A TUI Git client inspired by Magit";
+    homepage = "https://github.com/altsem/gitu";
+    changelog = "https://github.com/altsem/gitu/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+    mainProgram = "gitu";
+  };
+}
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@ -177,9 +177,11 @@ in
      home = {
        username = "erwin";
        homeDirectory = "/home/erwin";
-        sessionVariables = { };
+        sessionVariables = {
+          EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
+        };

-        stateVersion = "21.11";
+        stateVersion = "24.05";

        packages =
          with pkgs;
@ -229,10 +231,10 @@ in
            pass
            pavucontrol
            povray
-            quintom-cursor-theme
            procs
            prusa-slicer
            qgis
+            quintom-cursor-theme
            remmina
            ripgrep
            scid-vs-pc
@ -246,6 +248,8 @@ in
            unzip
            vial
            xdg-utils
+            wineWowPackages.waylandFull
+            winetricks
            wl-clipboard
            zeal
          ]
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@ -43,12 +43,10 @@ let
          let
            output = if name == "right" then "DP-1" else "DP-3";
          in
-          builtins.map
-            (ws: {
-              inherit output;
-              workspace = toString ws;
-            })
-            workspaces
+          builtins.map (ws: {
+            inherit output;
+            workspace = toString ws;
+          }) workspaces
        )

        (builtins.partition (n: (trivial.mod n 2) != 0) (lists.range 1 10))
@ -233,9 +231,9 @@ in
        username = "erwin";
        homeDirectory = "/home/erwin";
        sessionVariables = {
-          # EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
+          EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
        };
-        stateVersion = "22.11";
+        stateVersion = "24.05";

        packages =
          with pkgs;
Author	SHA1	Message	Date
Erwin Boskma	e596e8cb9a	flake: Add nix-init to devshell	2024-03-11 17:53:56 +01:00
Erwin Boskma	ceb4f2ff11	emacs: Don't set services.emacs.defaultEditor	2024-03-11 17:53:35 +01:00
Erwin Boskma	9d87464447	eww: Update workspaces script to new nushell syntax	2024-03-11 17:53:12 +01:00
Erwin Boskma	66389a861d	nushell: Disable net plugin due to incompatibility with nushell 0.91	2024-03-11 17:52:37 +01:00
Erwin Boskma	5c583faab2	vscode: Replace rnix-lsp with nil	2024-03-11 17:52:20 +01:00
Erwin Boskma	4b6c062870	fonts: Update iosevka aile build plan name	2024-03-11 17:52:01 +01:00
Erwin Boskma	964eb2d6a1	Set default editor	2024-03-11 17:51:52 +01:00
Erwin Boskma	2026cc9248	home: Add wine	2024-03-11 17:51:36 +01:00
Erwin Boskma	7b82251c57	Add gitu	2024-03-11 17:49:47 +01:00
Erwin Boskma	323b0291df	Formatting	2024-03-11 17:47:04 +01:00
Erwin Boskma	e8006179f8	flake.lock: Update Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/72818e54ec29427f8d9f9cfa6fc859d01ca6dc66' (2024-03-09) → 'github:nix-community/disko/d389901567d9ceda5a1a833fbf8e8e254e18eb0a' (2024-03-11) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/aed9a9e58391a498c2ed2b5bbd0b59ec3d862f6d' (2024-03-09) → 'github:nix-community/emacs-overlay/65f195e937a170adac199b12eab303b8488bf38b' (2024-03-11) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/2be119add7b37dc535da2dd4cba68e2cf8d1517e' (2024-03-08) → 'github:NixOS/nixpkgs/b94a96839afcc56de3551aa7472b8d9a3e77e05d' (2024-03-09) • Updated input 'flake-utils': 'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'home-manager': 'github:nix-community/home-manager/16311f1d3c518656f680b7d09e29e37826f9802e' (2024-03-09) → 'github:nix-community/home-manager/36f873dfc8e2b6b89936ff3e2b74803d50447e0a' (2024-03-10) • Updated input 'microvm': 'github:astro/microvm.nix/8b4539658e09b3c35adda0c4c7bb491aa29dcfef' (2024-03-08) → 'github:astro/microvm.nix/30e577e95ba469ba0d0c08e64e81604b1d097f9c' (2024-03-10) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/59e37017b9ed31dee303dbbd4531c594df95cfbc' (2024-03-02) → 'github:NixOS/nixos-hardware/ad2fd7b978d5e462048729a6c635c45d3d33c9ba' (2024-03-11) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9df3e30ce24fd28c7b3e2de0d986769db5d6225d' (2024-03-06) → 'github:nixos/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/d3a05d053b145349b8ad395741c5951f332280ef' (2024-03-09) → 'github:oxalica/rust-overlay/73aca260afe5d41d3ebce932c8d896399c9d5174' (2024-03-11) • Updated input 'sops': 'github:Mic92/sops-nix/25dd60fdd08fcacee2567a26ba6b91fe098941dc' (2024-03-06) → 'github:Mic92/sops-nix/f8d5c8baa83fe620a28c0db633be9db3e34474b4' (2024-03-10) • Updated input 'sops/nixpkgs-stable': 'github:NixOS/nixpkgs/66d65cb00b82ffa04ee03347595aa20e41fe3555' (2024-03-03) → 'github:NixOS/nixpkgs/b17375d3bb7c79ffc52f3538028b2ec06eb79ef8' (2024-03-10)	2024-03-11 09:40:09 +01:00
Erwin Boskma	2ca74329de	flake.lock: Update Flake lock file updates: • Updated input 'disko': 'github:nix-community/disko/a2009bc2b4e1d3ff5360048292deb0d610aa064b' (2024-03-07) → 'github:nix-community/disko/72818e54ec29427f8d9f9cfa6fc859d01ca6dc66' (2024-03-09) • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/6cd7ddb6c8a8ac4b2bfb35ca3261d3e689740c8e' (2024-03-08) → 'github:nix-community/emacs-overlay/aed9a9e58391a498c2ed2b5bbd0b59ec3d862f6d' (2024-03-09) • Updated input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/880992dcc006a5e00dd0591446fdf723e6a51a64' (2024-03-05) → 'github:NixOS/nixpkgs/2be119add7b37dc535da2dd4cba68e2cf8d1517e' (2024-03-08) • Updated input 'home-manager': 'github:nix-community/home-manager/cf111d1a849ddfc38e9155be029519b0e2329615' (2024-03-06) → 'github:nix-community/home-manager/16311f1d3c518656f680b7d09e29e37826f9802e' (2024-03-09) • Updated input 'microvm': 'github:astro/microvm.nix/7f93206b22131aac8fa46d787696ea58460aecab' (2024-03-01) → 'github:astro/microvm.nix/8b4539658e09b3c35adda0c4c7bb491aa29dcfef' (2024-03-08) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/e5ab9ee98f479081ad971473d2bc13c59e9fbc0a' (2024-03-08) → 'github:oxalica/rust-overlay/d3a05d053b145349b8ad395741c5951f332280ef' (2024-03-09)	2024-03-09 13:50:08 +01:00