erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:e596e8cb9a28b1a47cf54cbee86b06d202576982
Branches Tags
erwin:main
..
compare: erwin:2a3f0c0d9227744fb56765081ac9102ca6cfc4a8
Branches Tags
erwin:main

No commits in common. "e596e8cb9a28b1a47cf54cbee86b06d202576982" and "2a3f0c0d9227744fb56765081ac9102ca6cfc4a8" have entirely different histories.
e596e8cb9a ... 2a3f0c0d92

12 changed files with 83 additions and 130 deletions
Show stats Expand all files Collapse all files

66
flake.lock generated
View file

@ -124,11 +124,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710119954, "lastModified": 1709773529,
"narHash": "sha256-e7AMYtBQgRzeRtn//k1dXu22xeiav+G0cQjm3gEky7o=", "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "d389901567d9ceda5a1a833fbf8e8e254e18eb0a", "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1710121508, "lastModified": 1709862236,
"narHash": "sha256-lOfYN1BMBNarx3Nvcro6EEXq+ZSUHyhc2WJJdWACwoA=", "narHash": "sha256-i/0IUNU2q11tTTYK6HCdJn+YV2vly08PMCRiN2Ksjr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "65f195e937a170adac199b12eab303b8488bf38b", "rev": "6cd7ddb6c8a8ac4b2bfb35ca3261d3e689740c8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1709126324,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710062421, "lastModified": 1709764752,
"narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1710080963, "lastModified": 1709297667,
"narHash": "sha256-E1qvw0/ZfJfVDMysc5EN7g8wD/0j2uF3a1efVxz7pWk=", "narHash": "sha256-5JUaHyRFKDPqyeTlbMFS6VixAWRkO5uCRTS8asEjiyo=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "30e577e95ba469ba0d0c08e64e81604b1d097f9c", "rev": "7f93206b22131aac8fa46d787696ea58460aecab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +521,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1710123225, "lastModified": 1709410583,
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1710021367, "lastModified": 1709677081,
"narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -618,11 +618,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1710033658, "lastModified": 1709428628,
"narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709961763, "lastModified": 1709703039,
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710123130, "lastModified": 1709863839,
"narHash": "sha256-EoGL/WSM1M2L099Q91mPKO/FRV2iu2ZLOEp3y5sLfiE=", "narHash": "sha256-QpEL5FmZNi2By3sKZY55wGniFXc4wEn9PQczlE8TG0o=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "73aca260afe5d41d3ebce932c8d896399c9d5174", "rev": "e5ab9ee98f479081ad971473d2bc13c59e9fbc0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,11 +783,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1710039806, "lastModified": 1709711091,
"narHash": "sha256-vC2fo/phnetp6ub/nRv6mgAi5LbhJ6ujGQWrRD2VgNs=", "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f8d5c8baa83fe620a28c0db633be9db3e34474b4", "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc",
"type": "github" "type": "github"
}, },
"original": { "original": {

56
flake.nix
View file

@ -158,19 +158,24 @@
overlays.default = import ./overlays; overlays.default = import ./overlays;
nixosModules = builtins.listToAttrs ( nixosModules = builtins.listToAttrs (
map (x: { map
name = x; (x: {
value = import (./modules + "/${x}"); name = x;
}) (builtins.attrNames (builtins.readDir ./modules)) value = import (./modules + "/${x}");
})
(builtins.attrNames (builtins.readDir ./modules))
); );
nixosConfigurations = builtins.listToAttrs ( nixosConfigurations = builtins.listToAttrs (
map (machine: { map
name = machine; (machine: {
value = self.lib.defSystem (machines.${machine}.system or "x86_64-linux") { name = machine;
imports = [ machines.${machine}.config ]; value =
} (machines.${machine}.deploy or null); self.lib.defSystem (machines.${machine}.system or "x86_64-linux")
}) (builtins.attrNames machines) { imports = [ machines.${machine}.config ]; }
(machines.${machine}.deploy or null);
})
(builtins.attrNames machines)
); );
colmena = colmena =
@ -184,19 +189,22 @@
}; };
} }
// builtins.listToAttrs ( // builtins.listToAttrs (
map (machine: { map
name = machine; (machine: {
value = { name = machine;
deployment = { value = {
targetHost = machines.${machine}.deploy.host; deployment = {
targetUser = "root"; # machines.${machine}.deploy.sshUser; targetHost = machines.${machine}.deploy.host;
# targetUser = machines.${machine}.deploy.sshUser; targetUser = "root"; # machines.${machine}.deploy.sshUser;
tags = machines.${machine}.deploy.tags or [ ]; # 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;
}; };
imports = self.lib.systemModules (machines.${machine}.system or "x86_64-linux" })
) machines.${machine}.config; (builtins.filter (machine: machines.${machine} ? deploy) (builtins.attrNames machines))
};
}) (builtins.filter (machine: machines.${machine} ? deploy) (builtins.attrNames machines))
); );
}; };
@ -231,7 +239,6 @@
packages = { packages = {
incus-ui = pkgs.callPackage ./pkgs/incus-ui { }; incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
openfga = pkgs.callPackage ./pkgs/openfga { }; openfga = pkgs.callPackage ./pkgs/openfga { };
gitu = pkgs.callPackage ./pkgs/gitu { };
}; };
devShells.default = devShells.default =
@ -249,14 +256,13 @@
nodePackages.prettier nodePackages.prettier
multimarkdown multimarkdown
nix-diff nix-diff
nix-init nixfmt-rfc-style
nix-prefetch nix-prefetch
nix-prefetch-docker nix-prefetch-docker
nix-prefetch-github nix-prefetch-github
nix-prefetch-scripts nix-prefetch-scripts
nix-tree nix-tree
nix-top nix-top
nixfmt-rfc-style
openssl openssl
pciutils pciutils
pkgs.sops pkgs.sops

5
home-manager/modules/emacs/default.nix
View file

@ -174,6 +174,7 @@ in
package = emacsWithPackages; package = emacsWithPackages;
client.enable = true; client.enable = true;
socketActivation.enable = true; socketActivation.enable = true;
defaultEditor = true;
}; };
home.file."emacs.d/early-init.el".source = tangleEmacsConfig "early-init.el"; home.file."emacs.d/early-init.el".source = tangleEmacsConfig "early-init.el";
@ -193,9 +194,7 @@ in
nodePackages.bash-language-server nodePackages.bash-language-server
aspell aspell
lldb lldb
(nil.overrideAttrs (_: { (nil.overrideAttrs (_: { doCheck = false; }))
doCheck = false;
}))
nixfmt-rfc-style nixfmt-rfc-style
python3 python3
] ]

4
home-manager/modules/eww/config/scripts/workspaces.nu
View file

@ -21,7 +21,7 @@ def is-i3 [] {
} }
export def ipc-cmd [--raw, ...parameters: string] { 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 { if $raw {
$result $result
} else { } else {
@ -48,4 +48,4 @@ def main [] {
print (workspaces | to json -r) print (workspaces | to json -r)
} }
} }
} }

5
home-manager/modules/git/default.nix
View file

@ -176,9 +176,6 @@ in
}; };
}; };
home.packages = [ home.packages = [ pkgs.git-credential-manager ];
pkgs.git-credential-manager
pkgs.gitu
];
}; };
} }

2
home-manager/modules/nushell/default.nix
View file

@ -35,6 +35,7 @@ in
register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query
register ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats register ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats
register ${pkgs.nushellPlugins.net}/bin/nu_plugin_net
use kink.nu use kink.nu
@ -44,7 +45,6 @@ in
$env.config = ($env.config | merge { color_config: (dracula)}) $env.config = ($env.config | merge { color_config: (dracula)})
''; '';
}; };
# register ${pkgs.nushellPlugins.net}/bin/nu_plugin_net
carapace = { carapace = {
enable = true; enable = true;

2
home-manager/modules/vscode/default.nix
View file

@ -83,7 +83,7 @@ in
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
nil rnix-lsp
shellcheck shellcheck
]; ];
}; };

2
modules/fonts/default.nix
View file

@ -10,7 +10,7 @@ let
iosevka-buildplans = builtins.fromTOML (builtins.readFile "${pkgs.iosevka.src}/build-plans.toml"); iosevka-buildplans = builtins.fromTOML (builtins.readFile "${pkgs.iosevka.src}/build-plans.toml");
iosevka-aile = pkgs.iosevka.override { iosevka-aile = pkgs.iosevka.override {
privateBuildPlan = iosevka-buildplans.buildPlans.IosevkaAile; privateBuildPlan = iosevka-buildplans.buildPlans.iosevka-aile;
set = "aile"; set = "aile";
}; };
in in

1
overlays/default.nix
View file

@ -44,5 +44,4 @@ _final: prev: {
incus-ui = prev.pkgs.callPackage ../pkgs/incus-ui { }; incus-ui = prev.pkgs.callPackage ../pkgs/incus-ui { };
openfga = prev.pkgs.callPackage ../pkgs/openfga { }; openfga = prev.pkgs.callPackage ../pkgs/openfga { };
gitu = prev.pkgs.callPackage ../pkgs/gitu { };
} }

46
pkgs/gitu/default.nix
View file

@ -1,46 +0,0 @@
{
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";
};
}

10
users/erwin/home.nix
View file

@ -177,11 +177,9 @@ in
home = { home = {
username = "erwin"; username = "erwin";
homeDirectory = "/home/erwin"; homeDirectory = "/home/erwin";
sessionVariables = { sessionVariables = { };
EDITOR = "${config.home-manager.users.erwin.eboskma.programs.emacs.package}/bin/emacsclient -c";
};
stateVersion = "24.05"; stateVersion = "21.11";
packages = packages =
with pkgs; with pkgs;
@ -231,10 +229,10 @@ in
pass pass
pavucontrol pavucontrol
povray povray
quintom-cursor-theme
procs procs
prusa-slicer prusa-slicer
qgis qgis
quintom-cursor-theme
remmina remmina
ripgrep ripgrep
scid-vs-pc scid-vs-pc
@ -248,8 +246,6 @@ in
unzip unzip
vial vial
xdg-utils xdg-utils
wineWowPackages.waylandFull
winetricks
wl-clipboard wl-clipboard
zeal zeal
] ]

14
users/erwin/work.nix
View file

@ -43,10 +43,12 @@ let
let let
output = if name == "right" then "DP-1" else "DP-3"; output = if name == "right" then "DP-1" else "DP-3";
in in
builtins.map (ws: { builtins.map
inherit output; (ws: {
workspace = toString ws; inherit output;
}) workspaces workspace = toString ws;
})
workspaces
) )
(builtins.partition (n: (trivial.mod n 2) != 0) (lists.range 1 10)) (builtins.partition (n: (trivial.mod n 2) != 0) (lists.range 1 10))
@ -231,9 +233,9 @@ in
username = "erwin"; username = "erwin";
homeDirectory = "/home/erwin"; homeDirectory = "/home/erwin";
sessionVariables = { 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 = "24.05"; stateVersion = "22.11";
packages = packages =
with pkgs; with pkgs;