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

Compare commits

base: erwin:ae502375b342fa99c949e2506d3803eb7509abb7
Branches Tags
erwin:main
..
compare: erwin:794022de7c7fdcbd8bd99bd9b47b577185fb3f74
Branches Tags
erwin:main

2 commits
ae502375b3 ... 794022de7c

Author SHA1 Message Date
Erwin Boskma
794022de7c
work: Add ghostty, wlvncc, fix sway keybinds 2024-12-11 16:48:32 +01:00
Erwin Boskma
c7fd25bdae
mimir: Fix WireGuard config, secrets file name 2024-12-11 16:47:52 +01:00
5 changed files with 125 additions and 8 deletions
Show stats Expand all files Collapse all files

110
flake.lock
View file

@ -329,6 +329,41 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghostty": {
"inputs": {
"nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"zig": "zig"
},
"locked": {
"lastModified": 1733921208,
"narHash": "sha256-ywBbTxe+hf46qQbPviMmZ0yMsZNFnvwuupnK+Yz3JnQ=",
"path": "/home/erwin/ghostty-main",
"type": "path"
},
"original": {
"path": "/home/erwin/ghostty-main",
"type": "path"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -570,6 +605,22 @@
} }
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": {
"lastModified": 1733423277,
"narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e36963a147267afc055f7cf65225958633e536bf",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
@ -585,6 +636,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1733229606,
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pamedia": { "pamedia": {
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane_2",
@ -620,7 +687,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1733665616, "lastModified": 1733665616,
@ -648,6 +715,7 @@
"eww": "eww", "eww": "eww",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"ghostty": "ghostty",
"ha-now-playing": "ha-now-playing", "ha-now-playing": "ha-now-playing",
"home-manager": "home-manager", "home-manager": "home-manager",
"microvm": "microvm", "microvm": "microvm",
@ -765,6 +833,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -784,6 +867,31 @@
"repo": "treefmt-nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
},
"zig": {
"inputs": {
"flake-compat": [
"ghostty"
],
"flake-utils": "flake-utils_3",
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1717848532,
"narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

4
flake.nix
View file

@ -102,6 +102,10 @@
url = "github:vincentbernat/caddy-nix"; url = "github:vincentbernat/caddy-nix";
}; };
ghostty = {
url = "/home/erwin/ghostty-main";
};
caddy-with-plugins = { caddy-with-plugins = {
url = "github:eboskma/caddy-with-plugins"; url = "github:eboskma/caddy-with-plugins";
inputs = { inputs = {

4
machines/mimir/configuration.nix
View file

@ -296,7 +296,7 @@
AllowedIPs = [ AllowedIPs = [
"10.128.0.0/23" "10.128.0.0/23"
]; ];
EndPoint = "212.45.34.195:51822"; Endpoint = "212.45.34.195:51822";
PersistentKeepalive = 25; PersistentKeepalive = 25;
} }
]; ];
@ -436,7 +436,7 @@
services = { services = {
openssh.enable = true; openssh.enable = true;
envfs.enable = true; envfs.enable = false;
cpupower-gui.enable = true; cpupower-gui.enable = true;
flatpak.enable = true; flatpak.enable = true;

0
machines/mimir/secrets.yml → machines/mimir/secrets.yaml
View file

15
users/erwin/work.nix
View file

@ -165,8 +165,8 @@ in
extraKeybindings = { extraKeybindings = {
"Ctrl+Alt+1" = "exec ${pkgs.wayvnc}/bin/wayvncctl output-set DP-1"; "Ctrl+Alt+1" = "exec ${pkgs.wayvnc}/bin/wayvncctl output-set DP-1";
"Ctrl+Alt+2" = "exec ${pkgs.wayvnc}/bin/wayvncctl output-set DP-3"; "Ctrl+Alt+2" = "exec ${pkgs.wayvnc}/bin/wayvncctl output-set DP-3";
"Mod4+Ctrl+l" = "--locked output DP-1 enable, output DP-3 enable, output HDMI-A-1 disable"; "--locked Mod4+Ctrl+l" = "output DP-1 enable, output DP-3 enable, output HDMI-A-1 disable";
"Mod4+Ctrl+r" = "--locked output DP-1 disable, output DP-3 disable, output HDMI-A-1 enable"; "--locked Mod4+Ctrl+r" = "output DP-1 disable, output DP-3 disable, output HDMI-A-1 enable";
}; };
}; };
swaynotificationcenter.enable = true; swaynotificationcenter.enable = true;
@ -245,6 +245,7 @@ in
easyeffects easyeffects
fd fd
ffmpeg-full ffmpeg-full
inputs.ghostty.packages.${pkgs.system}.ghostty
icemon icemon
imagemagick imagemagick
(imv.override { (imv.override {
@ -283,6 +284,7 @@ in
# winetricks # winetricks
# wineWowPackages.waylandFull # wineWowPackages.waylandFull
wl-clipboard wl-clipboard
wlvncc
zathura zathura
zeal zeal
] ]
@ -343,9 +345,12 @@ in
}; };
configFile = { configFile = {
"gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets"; "gtk-4.0/assets".source =
"gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css"; "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets";
"gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css"; "gtk-4.0/gtk.css".source =
"${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css";
"gtk-4.0/gtk-dark.css".source =
"${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css";
}; };
}; };