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

Compare commits

base: erwin:1438fdcff03612bf090271a4b25d0660e58bcc17
Branches Tags
erwin:main
...
compare: erwin:aba9fe6fe98ff044c4ab9c5a6572c4ecad779ca6
Branches Tags
erwin:main

5 commits
1438fdcff0 ... aba9fe6fe9

Author SHA1 Message Date
Erwin Boskma
aba9fe6fe9
work: Add easyeffects 2024-06-08 16:03:52 +02:00
Erwin Boskma
3e26d1851c
mimir: Switch to regreet 2024-06-08 16:03:24 +02:00
Erwin Boskma
bea4950cea
gtk/regreet: switch to Orchis theme 2024-06-08 16:02:42 +02:00
Erwin Boskma
cef6158ca7
anyrun: Update module attribute 2024-06-08 16:01:48 +02:00
Erwin Boskma
e8bc9aae49
flake.lock: Update 
Flake lock file updates:

• Updated input 'anyrun':
    'github:Kirottu/anyrun/f9d30e34fa4ccb2797c6becec37e8bcff6585d39?narHash=sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8%3D' (2024-04-16)
  → 'github:Kirottu/anyrun/8c1f7907a4ee51226b1fd20674086fe292e4136e?narHash=sha256-W22hMKD1Qa1ARgLS3zB4EIfOTmPvrAEfd%2BqZ71QgJyg%3D' (2024-06-05)
• Updated input 'anyrun/flake-parts':
    'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4?narHash=sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ%3D' (2023-10-03)
  → 'github:hercules-ci/flake-parts/2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8?narHash=sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw%3D' (2024-06-01)
• Added input 'anyrun/systems':
    'github:nix-systems/default-linux/31732fcf5e8fea42e59c2488ad31a0e651500f68?narHash=sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80%3D' (2023-07-14)
• Updated input 'atuin':
    'github:atuinsh/atuin/83637d96b04bed26fb222771baad51b081de1703?narHash=sha256-33wQ%2BdmdgOTXAlfdw6EkqU79r%2BmdmqCbEvVQnMHyeBs%3D' (2024-05-31)
  → 'github:atuinsh/atuin/9943c53a7012e1a571ed6a66c127884fa3249767?narHash=sha256-XzvSLzyVmaHjgjLastmsh7HD7QrQD8xOvV8yCTYyivw%3D' (2024-06-04)
• Updated input 'disko':
    'github:nix-community/disko/39cd5a1fcd6d7a476eac2894b09122ead99f6efc?narHash=sha256-gwx3rVXnt2jNxl8L2DybYv41fA8QhWVGebe932pa2nw%3D' (2024-06-03)
  → 'github:nix-community/disko/a838e83e21502a211b83373109a260e5ef5fbcf1?narHash=sha256-CivVhYExnMJ2afm%2Bo1ogB231pKW/azhUghMI53MHmOM%3D' (2024-06-04)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/76082b226e29dd266a67b6f4df4fcaa771152f9c?narHash=sha256-EzL1xZoyj946hb7DtcPxXFkzuiGcQMSlSRr1%2BMzRfCA%3D' (2024-06-03)
  → 'github:nix-community/emacs-overlay/d619b5b5ba751d6e3c16da1ca8178a31ef130047?narHash=sha256-SI42G6mLxgn6vvSNxSuydQl0M41UZFh%2BBx%2BePjXbuyI%3D' (2024-06-05)
• Updated input 'home-manager':
    'github:nix-community/home-manager/9b53a10f4c91892f5af87cf55d08fba59ca086af?narHash=sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI%3D' (2024-06-02)
  → 'github:nix-community/home-manager/a7117efb3725e6197dd95424136f79147aa35e5b?narHash=sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz%2Bhg%2Bx1pCcNkAws%3D' (2024-06-04)
• Updated input 'microvm':
    'github:astro/microvm.nix/16ec47e1fae62bcc2a76e164b7101152ad98849c?narHash=sha256-NBwB16qOv8TKaPg62UXfy%2BRojsDC%2BDLZPtohUqUyIM4%3D' (2024-06-01)
  → 'github:astro/microvm.nix/e3a4dd5b381fb580804105594cc9c71dc45abdb5?narHash=sha256-juxjgmLnFbl%2B/hhIO2cVtIa6caCO4pLKlZWUMwAOznM%3D' (2024-06-03)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/7b49d3967613d9aacac5b340ef158d493906ba79?narHash=sha256-e8X2eWjAHJQT82AAN%2BmCI0B68cIDBJpqJ156%2BVRrFO0%3D' (2024-06-01)
  → 'github:NixOS/nixos-hardware/82b2e20fbffe6a5f0555701af136ad3e734a5faa?narHash=sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE%3D' (2024-06-04)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/07098b424d114cd2dddec40be8d5586da339fddc?narHash=sha256-TcM4%2BoHTSLw8neTxk/Q0beODr8YiL%2BoI2j0ENYnNfk4%3D' (2024-06-03)
  → 'github:oxalica/rust-overlay/8795c817dfab19243a33387a16c98d2df4075bb3?narHash=sha256-%2Bt3XaYEvlMo5BUJ/6C6RZcEfBTWFVUdMHpNoqUU%2BpSE%3D' (2024-06-05)
• Updated input 'sops':
    'github:Mic92/sops-nix/ab2a43b0d21d1d37d4d5726a892f714eaeb4b075?narHash=sha256-cZC2f68w5UrJ1f%2B2NWGV9Gx0dEYmxwomWN2B0lx0QRA%3D' (2024-06-02)
  → 'github:Mic92/sops-nix/d4555e80d80d2fa77f0a44201ca299f9602492a0?narHash=sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM%3D' (2024-06-03)
 2024-06-05 09:24:16 +02:00
8 changed files with 103 additions and 59 deletions
Show stats Expand all files Collapse all files

84
flake.lock
View file

@ -5,14 +5,15 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1713259062, "lastModified": 1717563631,
"narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=", "narHash": "sha256-W22hMKD1Qa1ARgLS3zB4EIfOTmPvrAEfd+qZ71QgJyg=",
"owner": "Kirottu", "owner": "Kirottu",
"repo": "anyrun", "repo": "anyrun",
"rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39", "rev": "8c1f7907a4ee51226b1fd20674086fe292e4136e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -54,11 +55,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717179219, "lastModified": 1717533891,
"narHash": "sha256-33wQ+dmdgOTXAlfdw6EkqU79r+mdmqCbEvVQnMHyeBs=", "narHash": "sha256-XzvSLzyVmaHjgjLastmsh7HD7QrQD8xOvV8yCTYyivw=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "83637d96b04bed26fb222771baad51b081de1703", "rev": "9943c53a7012e1a571ed6a66c127884fa3249767",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717378144, "lastModified": 1717490821,
"narHash": "sha256-gwx3rVXnt2jNxl8L2DybYv41fA8QhWVGebe932pa2nw=", "narHash": "sha256-CivVhYExnMJ2afm+o1ogB231pKW/azhUghMI53MHmOM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "39cd5a1fcd6d7a476eac2894b09122ead99f6efc", "rev": "a838e83e21502a211b83373109a260e5ef5fbcf1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,11 +220,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1717379613, "lastModified": 1717552306,
"narHash": "sha256-EzL1xZoyj946hb7DtcPxXFkzuiGcQMSlSRr1+MzRfCA=", "narHash": "sha256-SI42G6mLxgn6vvSNxSuydQl0M41UZFh+Bx+ePjXbuyI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "76082b226e29dd266a67b6f4df4fcaa771152f9c", "rev": "d619b5b5ba751d6e3c16da1ca8178a31ef130047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,11 +377,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696343447, "lastModified": 1717285511,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,7 +440,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -457,7 +458,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -563,11 +564,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717316182, "lastModified": 1717525419,
"narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", "rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -587,11 +588,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1717281900, "lastModified": 1717441449,
"narHash": "sha256-NBwB16qOv8TKaPg62UXfy+RojsDC+DLZPtohUqUyIM4=", "narHash": "sha256-juxjgmLnFbl+/hhIO2cVtIa6caCO4pLKlZWUMwAOznM=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "16ec47e1fae62bcc2a76e164b7101152ad98849c", "rev": "e3a4dd5b381fb580804105594cc9c71dc45abdb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -670,11 +671,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1717248095, "lastModified": 1717515267,
"narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "narHash": "sha256-3d/rDckP583688YqVPc6SyXTy2gHpma0HzCv3idi1OE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "rev": "82b2e20fbffe6a5f0555701af136ad3e734a5faa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -905,11 +906,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717381101, "lastModified": 1717553884,
"narHash": "sha256-TcM4+oHTSLw8neTxk/Q0beODr8YiL+oI2j0ENYnNfk4=", "narHash": "sha256-+t3XaYEvlMo5BUJ/6C6RZcEfBTWFVUdMHpNoqUU+pSE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "07098b424d114cd2dddec40be8d5586da339fddc", "rev": "8795c817dfab19243a33387a16c98d2df4075bb3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -926,11 +927,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1717297459, "lastModified": 1717455931,
"narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -972,6 +973,21 @@
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -986,7 +1002,7 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": { "systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

10
machines/mimir/configuration.nix
View file

@ -49,7 +49,7 @@
fonts.enable = true; fonts.enable = true;
gnome.enable = true; gnome.enable = true;
greetd = { greetd = {
enable = true; enable = false;
sway = true; sway = true;
wayvnc = true; wayvnc = true;
wallpaper = ../../wallpapers/river-3840.png; wallpaper = ../../wallpapers/river-3840.png;
@ -88,6 +88,11 @@
enable = true; enable = true;
cross-systems = [ "aarch64-linux" ]; cross-systems = [ "aarch64-linux" ];
}; };
regreet = {
enable = true;
wallpaper = ../../wallpapers/river-3840.png;
wayvnc = true;
};
sound.enable = true; sound.enable = true;
systemd.enable = true; systemd.enable = true;
tailscale.enable = true; tailscale.enable = true;
@ -303,7 +308,7 @@
Name = "microvm"; Name = "microvm";
}; };
addresses = [ { addressConfig.Address = "172.16.0.1/24"; } ]; addresses = [ { Address = "172.16.0.1/24"; } ];
}; };
"11-microvm" = { "11-microvm" = {
@ -330,6 +335,7 @@
swaylock swaylock
swayidle swayidle
]; ];
extraOptions = [ "--unsupported-gpu" ];
}; };
gnome-disks.enable = true; gnome-disks.enable = true;
nix-ld = { nix-ld = {

2
machines/thor/home.nix
View file

@ -153,7 +153,7 @@ in
imports = imports =
[ [
../../modules/options ../../modules/options
inputs.anyrun.nixosModules.home-manager inputs.anyrun.homeManagerModules.default
] ]
++ (map (mod: (../../home-manager/modules + "/${mod}")) ( ++ (map (mod: (../../home-manager/modules + "/${mod}")) (
builtins.attrNames (builtins.readDir ../../home-manager/modules) builtins.attrNames (builtins.readDir ../../home-manager/modules)

18
modules/greetd/default.nix
View file

@ -79,7 +79,15 @@ in
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
pantheon.elementary-gtk-theme (orchis-theme.override {
tweaks = [
"black"
"compact"
"macos"
];
border-radius = 5;
})
catppuccin-cursors.mochaDark
pantheon.elementary-icon-theme pantheon.elementary-icon-theme
]; ];
etc = { etc = {
@ -122,9 +130,9 @@ in
"xdg/gtk-3.0/settings.ini" = { "xdg/gtk-3.0/settings.ini" = {
text = generators.toINI { } { text = generators.toINI { } {
Settings = { Settings = {
gtk-theme-name = "elementary"; gtk-theme-name = "Orchis-Dark";
gtk-icon-theme-name = "elementary"; gtk-icon-theme-name = "elementary";
gtk-cursor-theme-name = "elementary"; gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
gtk-application-prefer-dark-theme = "true"; gtk-application-prefer-dark-theme = "true";
}; };
}; };
@ -132,9 +140,9 @@ in
"xdg/gtk-4.0/settings.ini" = { "xdg/gtk-4.0/settings.ini" = {
text = generators.toINI { } { text = generators.toINI { } {
Settings = { Settings = {
gtk-theme-name = "elementary"; gtk-theme-name = "Orchis-Dark";
gtk-icon-theme-name = "elementary"; gtk-icon-theme-name = "elementary";
gtk-cursor-theme-name = "elementary"; gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
gtk-application-prefer-dark-theme = "true"; gtk-application-prefer-dark-theme = "true";
}; };
}; };

21
modules/regreet/default.nix
View file

@ -37,10 +37,10 @@ in
GTK = { GTK = {
application_prefer_dark_theme = true; application_prefer_dark_theme = true;
theme_name = "elementary"; theme_name = "Orchis-Dark";
cursor_theme = "elementary"; cursor_theme = "Catppuccin-Mocha-Dark-Cursors";
icon_theme_name = "elementary"; icon_theme_name = "elementary";
font_name = "Iosevka Aile 16"; font_name = "Monaspace Neon 16";
}; };
commands = { commands = {
@ -54,6 +54,11 @@ in
]; ];
}; };
}; };
cageArgs = [
"-s"
"-m"
"last"
];
}; };
security.pam.services.greetd.u2fAuth = false; security.pam.services.greetd.u2fAuth = false;
@ -63,7 +68,15 @@ in
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
pantheon.elementary-gtk-theme (orchis-theme.override {
tweaks = [
"black"
"compact"
"macos"
];
border-radius = 5;
})
catppuccin-cursors.mochaDark
pantheon.elementary-icon-theme pantheon.elementary-icon-theme
]; ];
}; };

12
users/erwin/home.nix
View file

@ -333,14 +333,14 @@ in
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = {
name = "Catppuccin-Mocha-Compact-Blue-Dark"; name = "Orchis-Dark";
package = pkgs.catppuccin-gtk.override { package = pkgs.orchis-theme.override {
size = "compact";
tweaks = [ tweaks = [
"rimless"
"black" "black"
"compact"
"macos"
]; ];
variant = "mocha"; border-radius = 5;
}; };
}; };
@ -404,7 +404,7 @@ in
imports = imports =
[ [
../../modules/options ../../modules/options
inputs.anyrun.nixosModules.home-manager inputs.anyrun.homeManagerModules.default
] ]
++ (map (mod: (../../home-manager/modules + "/${mod}")) ( ++ (map (mod: (../../home-manager/modules + "/${mod}")) (
builtins.attrNames (builtins.readDir ../../home-manager/modules) builtins.attrNames (builtins.readDir ../../home-manager/modules)

2
users/erwin/server.nix
View file

@ -63,7 +63,7 @@ in
imports = imports =
[ [
../../modules/options ../../modules/options
inputs.anyrun.nixosModules.home-manager inputs.anyrun.homeManagerModules.default
] ]
++ (map (mod: (../../home-manager/modules + "/${mod}")) ( ++ (map (mod: (../../home-manager/modules + "/${mod}")) (
builtins.attrNames (builtins.readDir ../../home-manager/modules) builtins.attrNames (builtins.readDir ../../home-manager/modules)

13
users/erwin/work.nix
View file

@ -244,6 +244,7 @@ in
chromium chromium
dbeaver-bin dbeaver-bin
dconf dconf
easyeffects
fd fd
ffmpeg_5-full ffmpeg_5-full
gnome.nautilus gnome.nautilus
@ -358,14 +359,14 @@ in
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = {
name = "Catppuccin-Mocha-Compact-Dark"; name = "Orchis-Dark";
package = pkgs.catppuccin-gtk.override { package = pkgs.orchis-theme.override {
size = "compact";
tweaks = [ tweaks = [
"rimless"
"black" "black"
"compact"
"macos"
]; ];
variant = "mocha"; border-radius = 5;
}; };
}; };
@ -400,7 +401,7 @@ in
imports = imports =
[ [
../../modules/options ../../modules/options
inputs.anyrun.nixosModules.home-manager inputs.anyrun.homeManagerModules.default
] ]
++ (map (mod: (../../home-manager/modules + "/${mod}")) ( ++ (map (mod: (../../home-manager/modules + "/${mod}")) (
builtins.attrNames (builtins.readDir ../../home-manager/modules) builtins.attrNames (builtins.readDir ../../home-manager/modules)