This commit is contained in:
PapaTutuWawa 2022-07-09 18:18:15 +02:00
parent fe60c609e6
commit df1043ee38
6 changed files with 33 additions and 77 deletions

View File

@ -24,11 +24,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1655439103, "lastModified": 1656413262,
"narHash": "sha256-onKTZs6VViLnedg0AEQferHDKCZJchoLMt0murICkao=", "narHash": "sha256-I8X1LaW/qoSWeBLK0N8GPOshIuXG9zyNyZUtKZYa0h4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e8aa04eaa4cb8664a72191547fc2395dddd3c112", "rev": "8772891c73e2809df5e5469d14535ea77e123d3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,22 +37,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-helper": { "flake-helper": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -76,11 +60,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1656065134,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -91,11 +75,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1656065134,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,18 +150,15 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nmd": "nmd",
"nmt": "nmt",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1655381586, "lastModified": 1656367977,
"narHash": "sha256-2IrSYYjxoT+iOihSiH0Elo9wzjbHjDSH+qPvI5BklCs=", "narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1de492f6f8e9937c822333739c5d5b20d93bf49f", "rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +304,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1654057797, "lastModified": 1656353817,
"narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=", "narHash": "sha256-UJEzMQcft/0Ilu4LWV7UH51mr5UCo28GL06BGO+djv4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af", "rev": "78e7c2c397b0376526e83162b58de921362e3399",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -356,8 +337,8 @@
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=", "narHash": "sha256-nv4FfWWV/dEelByjXJtJkoDPOHIsKfLq50RN3Hqq5Yk=",
"path": "/nix/store/xx16m0bh181qgmfk6lw8h59ri2xv192v-source", "path": "/nix/store/lyv9kw3jv8dwp7lr5ik22k3w01rf24w2-source",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -415,11 +396,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1655306633, "lastModified": 1656461576,
"narHash": "sha256-nv4FfWWV/dEelByjXJtJkoDPOHIsKfLq50RN3Hqq5Yk=", "narHash": "sha256-rlmmw6lIlkMQIiB+NsnO8wQYWTfle8TA41UREPLP5VY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b1957596ff1c7aa8c55c4512b7ad1c9672502e8e", "rev": "cf3ab54b4afe2b7477faa1dd0b65bf74c055d70c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,45 +497,13 @@
"type": "github" "type": "github"
} }
}, },
"nmd": {
"flake": false,
"locked": {
"lastModified": 1653339422,
"narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",
"owner": "rycee",
"repo": "nmd",
"rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmd",
"type": "gitlab"
}
},
"nmt": {
"flake": false,
"locked": {
"lastModified": 1648075362,
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
"owner": "rycee",
"repo": "nmt",
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmt",
"type": "gitlab"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1655438881, "lastModified": 1656611551,
"narHash": "sha256-bbodx1uMbLihOn4LNidNqKLs66xGH6fkZaUz38xHaXI=", "narHash": "sha256-S1GkwCgMimVVU1nrwezTkoOqsoiXvvK1+pu4zplsqwo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "3d02f72e61403bb14e97780e0b1fc160517a8907", "rev": "b58e819d423cc525475b43bd06cf5f999feb5325",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -61,7 +61,7 @@
primaryScreen = "C27F398"; primaryScreen = "C27F398";
enable = true; enable = true;
}; };
sway.enable = true; sway.enable = false;
alacritty.enable = true; alacritty.enable = true;
emacs.enable = true; emacs.enable = true;
firefox.enable = true; firefox.enable = true;
@ -147,6 +147,8 @@
"clocksource=tsc" "clocksource=tsc"
"tsc=reliable" "tsc=reliable"
"pci=noaer" "pci=noaer"
# Enable Apparmor
"lsm=landlock,lockdown,yama,integrity,apparmor,bpf"
]; ];
extraModulePackages = [ kernel.vendor-reset ]; extraModulePackages = [ kernel.vendor-reset ];

View File

@ -116,7 +116,7 @@ in {
# Everyone needs sound # Everyone needs sound
pipewire = { pipewire = {
enable = false; enable = true;
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
alsa.enable = true; alsa.enable = true;
@ -244,7 +244,7 @@ in {
hardware = { hardware = {
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
# This is a Pipewire household! # This is a Pipewire household!
pulseaudio.enable = true; pulseaudio.enable = false;
opengl = { opengl = {
enable = true; enable = true;

View File

@ -18,6 +18,7 @@ in {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
style = builtins.readFile ./style.css; style = builtins.readFile ./style.css;
/*
settings = [ settings = [
{ {
output = [ "${cfg.output}" ]; output = [ "${cfg.output}" ];
@ -62,6 +63,7 @@ in {
}; };
} }
]; ];
*/
}; };
}; };
}; };

View File

@ -19,6 +19,7 @@
# No need to use users."${system.singleUser}" as we already know it # No need to use users."${system.singleUser}" as we already know it
home-manager.users.alexander = { home-manager.users.alexander = {
programs.home-manager.enable = true; programs.home-manager.enable = true;
home.stateVersion = "22.11";
programs.ssh = { programs.ssh = {
enable = true; enable = true;

View File

@ -98,6 +98,7 @@ final: prev:
''; '';
}); });
/*
xwayland = prev.xwayland.overrideAttrs (old: rec { xwayland = prev.xwayland.overrideAttrs (old: rec {
version = "21.1.4"; version = "21.1.4";
src = prev.fetchurl { src = prev.fetchurl {
@ -105,6 +106,7 @@ final: prev:
sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc="; sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc=";
}; };
}); });
*/
# See # See
# https://github.com/NixOS/nixpkgs/commit/2bf8d8c0162507d08f9fc48e36ce7225f4879bd4 # https://github.com/NixOS/nixpkgs/commit/2bf8d8c0162507d08f9fc48e36ce7225f4879bd4