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

Compare commits

base: erwin:0d8c0352f66d2170431c5855173d638d082519fc
Branches Tags
erwin:main
..
compare: erwin:c002b728e4b42b07c2ef6c04caccaf26942995bf
Branches Tags
erwin:main

No commits in common. "0d8c0352f66d2170431c5855173d638d082519fc" and "c002b728e4b42b07c2ef6c04caccaf26942995bf" have entirely different histories.
0d8c0352f6 ... c002b728e4

8 changed files with 72 additions and 105 deletions
Show stats Expand all files Collapse all files

84
flake.lock generated
View file

@ -76,11 +76,11 @@
"stable": "stable"
},
"locked": {
"lastModified": 1711386353,
"narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=",
"lastModified": 1706509311,
"narHash": "sha256-QQKQ6r3CID8aXn2ZXZ79ZJxdCOeVP+JTnOctDALErOw=",
"owner": "zhaofengli",
"repo": "colmena",
"rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db",
"rev": "c84ccd0a7a712475e861c2b111574472b1a8d0cd",
"type": "github"
},
"original": {
@ -147,11 +147,11 @@
]
},
"locked": {
"lastModified": 1711462743,
"narHash": "sha256-3wKGpHy9Kyh98DrziqC/s//60Q0pE17NgbY93L0uWng=",
"lastModified": 1711006105,
"narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=",
"owner": "nix-community",
"repo": "disko",
"rev": "a6717b1afee7ae955c61eefdf0ce8f864ef78115",
"rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6",
"type": "github"
},
"original": {
@ -171,11 +171,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1711443855,
"narHash": "sha256-jPEUYELo7ACEiFU7jKDdQ+yC5OkqG2UcHk1/N+N7f3E=",
"lastModified": 1711071818,
"narHash": "sha256-9SmpbzwNL5m3pIqWrT+7PnQDfYBQAp8EoKcJCFyRITI=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "81d4eb044fac45daf51281a046d413a40f05d103",
"rev": "cad98a253dc7b22fb12db42ccac3d04402e63dd0",
"type": "github"
},
"original": {
@ -396,11 +396,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@ -468,11 +468,11 @@
]
},
"locked": {
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"lastModified": 1710974515,
"narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
"type": "github"
},
"original": {
@ -492,11 +492,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1711159783,
"narHash": "sha256-nwl2Cygq7NrV9QcebJE/T/vXv7w+zLERD7ygHz0F5g8=",
"lastModified": 1711058497,
"narHash": "sha256-4Uya0uqALYubEvHcqYY/3x+MaM+op0x0djGhj+Th6Mk=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "d31f7c7d3194c51372134832a3a2a256773c161a",
"rev": "d5283b0c83df3475ca967aa1ca9496d3e387084a",
"type": "github"
},
"original": {
@ -560,11 +560,11 @@
]
},
"locked": {
"lastModified": 1711333167,
"narHash": "sha256-j0yUDFX7cyoM5r9afQ45tfu8wqUk0dRicOb79+K81JI=",
"lastModified": 1699781621,
"narHash": "sha256-l8OMloSbDyjIb9yVeD10M7aK7qDCVMt3huBztihrbwM=",
"owner": "nix-community",
"repo": "nix-ld-rs",
"rev": "76999cac5abefc7862b19daeef0ef91d4270fb17",
"rev": "5806f307048a9ae9e3e88cc48006d4d0b2df4410",
"type": "github"
},
"original": {
@ -575,11 +575,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1711352745,
"narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"lastModified": 1710783728,
"narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
"type": "github"
},
"original": {
@ -640,11 +640,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1711124224,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
"lastModified": 1710951922,
"narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
"rev": "f091af045dff8347d66d186a62d42aceff159456",
"type": "github"
},
"original": {
@ -672,11 +672,11 @@
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1711233294,
"narHash": "sha256-eEu5y4J145BYDw9o/YEmeJyqh8blgnZwuz9k234zuWc=",
"lastModified": 1710628718,
"narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ac6bdf6181666ebb4f90dd20f31e2fa66ede6b68",
"rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
"type": "github"
},
"original": {
@ -688,11 +688,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"lastModified": 1710806803,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
"type": "github"
},
"original": {
@ -743,11 +743,11 @@
"nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1711409088,
"narHash": "sha256-+rTCra8TY4vuSNTtQ0tcex1syCRPoKyb8vyHmoxkga4=",
"lastModified": 1710923068,
"narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "db656fc3e34907000df26e8bc5cc3c94fb27f353",
"rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
"type": "github"
},
"original": {
@ -817,11 +817,11 @@
]
},
"locked": {
"lastModified": 1711419061,
"narHash": "sha256-+5M/czgYGqs/jKmi8bvYC+JUYboUKNTfkRiesXopeXQ=",
"lastModified": 1711073443,
"narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "4c11d2f698ff1149f76b69e72852d5d75f492d0c",
"rev": "eec55ba9fcde6be4c63942827247e42afef7fafe",
"type": "github"
},
"original": {
@ -838,11 +838,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1711249319,
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
"lastModified": 1710644594,
"narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "405987a66cce9a4a82f321f11b205982a7127c88",
"rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
"type": "github"
},
"original": {

23
home-manager/modules/sway/default.nix
View file

@ -19,7 +19,6 @@ in
options.eboskma.programs.sway = {
enable = mkEnableOption "sway";
wayvnc = mkEnableOption "wayvnc";
package = mkPackageOption pkgs "sway" { };
lock-wallpaper = mkOption {
description = "Wallpaper to use for the lockscreen";
@ -86,8 +85,6 @@ in
config = mkIf cfg.enable {
wayland.windowManager.sway = {
enable = true;
package = cfg.package;
config = {
modifier = mod;
@ -163,7 +160,7 @@ in
gaps = {
inner = 10;
# outer = 5;
outer = 5;
smartBorders = "on";
};
@ -247,8 +244,8 @@ in
"${mod}+c" = mkIf config.eboskma.programs.emacs.enable "exec ${config.programs.emacs.package}/bin/emacsclient -c";
"${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${cfg.package}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name')";
"${mod}+Shift+Print" = ''exec ${pkgs.grim}/bin/grim -o $(${cfg.package}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t "image/png" -f'';
"${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name')";
"${mod}+Shift+Print" = ''exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t "image/png" -f'';
"${mod}+Shift+Ctrl+Print" = ''exec ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.wl-clipboard}/bin/wl-copy -t "image/png" -f'';
"${mod}+Shift+Alt+Print" = ''exec ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"'';
@ -291,16 +288,6 @@ in
for_window [shell="xwayland"] title_format "%title [XWayland]"
for_window [app_id="^.*iwgtk$"] floating enable
blur enable
blur_xray disable
shadows enable
default_dim_inactive 0.2
corner_radius 10
include /etc/sway/config.d/*
'';
# exec --no-startup-id ${pkgs.swaynotificationcenter}/bin/swaync
@ -358,8 +345,8 @@ in
}
{
timeout = 1200;
command = "${cfg.package}/bin/swaymsg 'output * power off'";
resumeCommand = "${cfg.package}/bin/swaymsg '${resumeMessages}'";
command = "${pkgs.sway}/bin/swaymsg 'output * power off'";
resumeCommand = "${pkgs.sway}/bin/swaymsg '${resumeMessages}'";
}
];
};

22
machines/loki/configuration.nix
View file

@ -121,7 +121,7 @@
kernelParams = [ "amd_pstate.shared_mem=1" ];
extraModulePackages = with config.boot.kernelPackages; [
cpupower
# rtl88x2bu
rtl88x2bu
zenpower
];
@ -226,14 +226,6 @@
enable = true;
};
sudo.enable = false;
pam.services.swaylock = {
unixAuth = true;
setLoginUid = true;
enableGnomeKeyring = true;
allowNullPassword = true;
updateWtmp = true;
startSession = true;
};
};
systemd = {
@ -392,18 +384,6 @@
};
programs = {
sway = {
enable = true;
package = pkgs.swayfx;
wrapperFeatures = {
gtk = true;
base = true;
};
extraPackages = with pkgs; [
swaylock
swayidle
];
};
gnome-disks.enable = true;
# ssh.startAgent = true;

19
machines/mimir/configuration.nix
View file

@ -230,14 +230,6 @@
apparmor = {
enable = true;
};
pam.services.swaylock = {
unixAuth = true;
setLoginUid = true;
enableGnomeKeyring = true;
allowNullPassword = true;
updateWtmp = true;
startSession = true;
};
};
systemd.network = {
@ -316,17 +308,6 @@
# programs.ssh.startAgent = true;
programs = {
sway = {
enable = true;
wrapperFeatures = {
gtk = true;
base = true;
};
extraPackages = with pkgs; [
swaylock
swayidle
];
};
gnome-disks.enable = true;
nix-ld = {
enable = true;

20
modules/desktop/default.nix
View file

@ -25,6 +25,18 @@ in
fuse.userAllowOther = true;
seahorse.enable = true;
sway = mkIf cfg.wayland {
enable = true;
wrapperFeatures = {
gtk = true;
base = true;
};
extraPackages = with pkgs; [
swaylock
swayidle
];
};
};
xdg = {
@ -49,6 +61,14 @@ in
};
security = {
pam.services.swaylock = {
unixAuth = true;
setLoginUid = true;
enableGnomeKeyring = true;
allowNullPassword = true;
updateWtmp = true;
startSession = true;
};
pki.certificates = [ (builtins.readFile ./horus-ca.pem) ];
wrappers = {
fusermount.source = "${pkgs.fuse}/bin/fusermount";

2
modules/greetd/default.nix
View file

@ -12,7 +12,7 @@ let
style = builtins.readFile ./greetd.css;
swaySession = pkgs.writeShellScript "sway-session" ''
${config.programs.sway.package}/bin/sway --unsupported-gpu
${pkgs.sway}/bin/sway --unsupported-gpu
'';
steam-gamescope =

6
modules/keycloak/phasetwo-admin-ui.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub }:
let
version = "24.0.0.1711026409";
jarVersion = "24.0.0";
version = "23.0.7.1709589021";
jarVersion = "23.0.1";
in
stdenv.mkDerivation {
inherit version;
@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "p2-inc";
repo = "phasetwo-containers";
rev = "v${version}";
sha256 = "gwD/wHd/zmDKtie7PfCvDJi+QjeQqDlgOj7DGV531go=";
sha256 = "nsyFSD7uRm4X6n+4601HatnGzmV46FUIlc7ZPYXalJo=";
# sha256 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
};

1
users/erwin/home.nix
View file

@ -118,7 +118,6 @@ in
starship.enable = true;
sway = {
enable = true;
package = pkgs.swayfx;
lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-2560.png";
output = {
"DP-2" = {