diff --git a/flake.lock b/flake.lock index d0d27d7..a1ca42a 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1706473964, - "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "lastModified": 1707685877, + "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", "owner": "ipetkov", "repo": "crane", - "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1704875591, - "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", + "lastModified": 1708091384, + "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", + "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1706665628, - "narHash": "sha256-I/VEC6k+4l4paKYqCgzkjrP6a1moxxWJQ8V26xS/Doo=", + "lastModified": 1708738984, + "narHash": "sha256-DtqxEAqjcyw8ppJCBbfxt6xsw6L123sQGIOJd403kzM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6ed1948db6bf8b21ba2d25b3e2d9a45c0176b166", + "rev": "a34163aecd2197823601eadeca2d4f0f2ef1eeb6", "type": "github" }, "original": { @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1706473109, - "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "lastModified": 1708591310, + "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", "owner": "nix-community", "repo": "home-manager", - "rev": "d634c3abafa454551f2083b054cd95c3f287be61", + "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", "type": "github" }, "original": { @@ -381,11 +381,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1706522979, - "narHash": "sha256-2wP2qEFVoZ9q8C9MZdAwXPKDkIIQiEwUzuzCxVKafDc=", + "lastModified": 1708388174, + "narHash": "sha256-mLROAGNyOykYwWOLga24BX05GnRE+acms0Ru10tye2o=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "c42edac7eb881315bb2a8dfd5190c8c87b91e084", + "rev": "73fec69386e8005911e15f3abe6bb6cee7fd9711", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1706667828, - "narHash": "sha256-fevDymcngsNuphl1ImDkuyt4uYNv2r9e6uZQBK1pehE=", + "lastModified": 1708741242, + "narHash": "sha256-CEH6i87u1rsIXqmbWrsoFFObXQI4vTiucSUE8IQqQnI=", "owner": "fortuneteller2k", "repo": "nixpkgs-f2k", - "rev": "7dfe02c1d678826d64e8a3f67b908634456f784a", + "rev": "9a265188c7f20c76660f50cb494d3e08980403a1", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { @@ -594,11 +594,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1706515015, - "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=", + "lastModified": 1708566995, + "narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", + "rev": "3cb4ae6689d2aa3f363516234572613b31212b78", "type": "github" }, "original": { @@ -610,11 +610,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1706515015, - "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=", + "lastModified": 1708702655, + "narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", + "rev": "c5101e457206dd437330d283d6626944e28794b3", "type": "github" }, "original": { @@ -626,27 +626,27 @@ }, "nixpkgs-stable_5": { "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "lastModified": 1708210246, + "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -658,11 +658,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706370590, - "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=", + "lastModified": 1708232726, + "narHash": "sha256-DYuEHWQSBwaJkS2rjLUsKvGgDK8QIVojC3klAUw6uyk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376", + "rev": "35c5863c29ce81199ded8a3384f4979b7793f5dc", "type": "github" }, "original": { @@ -674,11 +674,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1708655239, + "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706371002, - "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", + "lastModified": 1708655239, + "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", + "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a", "type": "github" }, "original": { @@ -706,11 +706,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1706173671, - "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", + "lastModified": 1708151420, + "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", + "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1706737483, - "narHash": "sha256-5Zth6Dtl/7S6dt2nBbPPlHh0PSlFJZQg8Ljqy0FUpIM=", + "lastModified": 1708779111, + "narHash": "sha256-2CD3RFLqKGcRPRmdVQWc8yRPoUrHg+OpNlCjZq2ZewM=", "owner": "nix-community", "repo": "NUR", - "rev": "ae03b5f3fe8cb99cfa26b31c61a3a96fb8e4ad33", + "rev": "d24540b60bc7f22d530d4f68bc53fab227180b16", "type": "github" }, "original": { @@ -740,11 +740,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706569497, - "narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "60c614008eed1d0383d21daac177a3e036192ed8", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -799,11 +799,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1706424699, - "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -857,11 +857,11 @@ ] }, "locked": { - "lastModified": 1706494265, - "narHash": "sha256-4ilEUJEwNaY9r/8BpL3VmZiaGber0j09lvvx0e/bosA=", + "lastModified": 1708241671, + "narHash": "sha256-zSulX9tP4R35Y8A842dGSzaHMVP91W2Ry0SXvQKD2BQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "246ba7102553851af60e0382f558f6bc5f63fa13", + "rev": "d500e370b26f9b14303cb39bf1509df0a920c8b0", "type": "github" }, "original": { @@ -879,11 +879,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1706647585, - "narHash": "sha256-HwAWgXIUn0a2FIS5Mye0sAZj1BZ4++YKWzIPM7coFjs=", + "lastModified": 1708747444, + "narHash": "sha256-7w2FH772WJ2rqQg3JPntd2W/7pVVn8N8sI0kkwZhtV4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9343a32ef3fc2d3be2f3c5266a09c63cc5019438", + "rev": "3c88f5a9c63d5acf889377a7b0ec4da033611c5b", "type": "gitlab" }, "original": { @@ -905,11 +905,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1706219574, - "narHash": "sha256-qO+8UErk+bXCq2ybHU4GzXG4Ejk4Tk0rnnTPNyypW4g=", + "lastModified": 1706742486, + "narHash": "sha256-sv/MISTeD0rqeVivpZJpynboMWJp6i62OmrZX1rGl38=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "e47f3719f1db3e0961a4358d4cb234a0acaa7baf", + "rev": "9e36323ae3dde787f761420465c3ae560f3dbf29", "type": "gitlab" }, "original": { @@ -925,11 +925,11 @@ "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { - "lastModified": 1706410821, - "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", + "lastModified": 1708500294, + "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", + "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11", "type": "github" }, "original": { diff --git a/nixos/framework/configuration.nix b/nixos/framework/configuration.nix index 165ae82..3d61aab 100644 --- a/nixos/framework/configuration.nix +++ b/nixos/framework/configuration.nix @@ -15,6 +15,8 @@ boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_6_6; + nixpkgs.config.allowUnfree = true; + system.stateVersion = "23.11"; # Did you read the comment? networking = { hostName = "framework"; @@ -29,6 +31,7 @@ enable = true; driSupport = true; driSupport32Bit = true; + extraPackages = [pkgs.vaapiVdpau]; }; security.pam.services.swaylock = {}; @@ -64,7 +67,8 @@ xserver = { enable = true; - layout = "us"; + xkb.layout = "us"; + videoDrivers = ["amdgpu"]; libinput.enable = true; @@ -90,8 +94,12 @@ }; }; - sound.enable = true; - hardware.pulseaudio.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; users.users.patrick = { isNormalUser = true; @@ -115,25 +123,4 @@ hyprland.enable = true; gnupg.agent.enable = true; }; - - # nix = { - # gc = { - # automatic = true; - # dates = "weekly"; - # options = "--delete-older-than 7d"; - # }; - - # package = pkgs.nixVersions.stable; - # # registry.nixpkgs.flake = inputs.nixpkgs; - - # settings = { - # auto-optimise-store = true; - - # experimental-features = ["nix-command" "flakes"]; - - # # Avoid unwanted garbage collection when using nix-direnv - # # keep-outputs = true; - # # keep-derivations = true; - # }; - # }; } diff --git a/nixos/framework/hardware-configuration.nix b/nixos/framework/hardware-configuration.nix index c813658..149cd48 100644 --- a/nixos/framework/hardware-configuration.nix +++ b/nixos/framework/hardware-configuration.nix @@ -13,7 +13,7 @@ ]; boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod"]; - boot.initrd.kernelModules = []; + boot.initrd.kernelModules = ["amdgpu"]; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; diff --git a/nixos/framework/home.nix b/nixos/framework/home.nix index d8eb29d..a98deea 100644 --- a/nixos/framework/home.nix +++ b/nixos/framework/home.nix @@ -3,17 +3,113 @@ helix firefox-devedition git - alacritty eww-wayland pinentry - rofi-wayland acpi sops + moonlight-qt + discord + telegram-desktop + obs-studio ]; programs.bash.enable = true; programs.swaylock.enable = true; + wayland.windowManager.hyprland = { + enable = true; + settings = { + "$mod" = "SUPER"; + + monitor = [ + "eDP-1,2256x1504,0x0,1.566667" + "DP-9,2560x1080,2256x0,1" + "DP-11,1680x1050,4816x0,1" + ",preferred,auto,1.5" + ]; + + exec-once = ["waybar"]; + + input = { + kb_layout = "us,de"; + follow_mouse = 1; + }; + + general = { + gaps_in = 5; + gaps_out = 5; + border_size = 1; + layout = "dwindle"; + allow_tearing = false; + "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; + "col.inactive_border" = "rgba(595959aa)"; + }; + + decoration = { + rounding = 5; + drop_shadow = true; + shadow_range = 4; + shadow_render_power = 3; + "col.shadow" = "rgba(1a1a1aee)"; + + blur = { + enabled = true; + size = 3; + passes = 1; + }; + }; + + animations = { + enabled = true; + bezier = "myBezier, 0.05, 0.9, 0.1, 1.05"; + + animation = [ + "windows, 1, 3, myBezier" + "windowsOut, 1, 3, default, popin 80%" + "border, 1, 3, default" + "borderangle, 1, 3, default" + "fade, 1, 3, default" + "workspaces, 1, 3, default" + ]; + }; + + bind = + [ + "$mod, return, exec, ${pkgs.alacritty.outPath}/bin/alacritty" + "$mod SHIFT, Q, killactive, " + "$mod, L, exec, swaylock" + "$mod, V, togglefloating, " + "$mod, D, exec, ${pkgs.rofi-wayland.outPath}/bin/rofi -show drun" + "$mod, P, pseudo, # dwindle" + "$mod, J, togglesplit, # dwindle" + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + "$mod, S, togglespecialworkspace, magic" + "$mod SHIFT, S, movetoworkspace, special:magic" + ] + ++ builtins.concatLists (builtins.genList ( + x: let + num = builtins.toString (x + 1); + in [ + "$mod, ${num}, workspace, ${num}" + "$mod SHIFT, ${num}, movetoworkspace, ${num}" + ] + ) + 9); + + bindm = [ + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" + ]; + + "device:razer-razer-blackwidow-chroma" = { + kb_layout = "de"; + }; + }; + }; + programs.waybar = { enable = true; diff --git a/outputs.nix b/outputs.nix index ce1878e..2a714a6 100644 --- a/outputs.nix +++ b/outputs.nix @@ -12,7 +12,7 @@ in { packages = import ./pkgs {inherit pkgs;}; devShell = pkgs.callPackage ./shell.nix { - inherit (deploy.packages.${pkgs.system}) deploy-rs; + # inherit (deploy.packages.${pkgs.system}) deploy-rs; }; formatter = pkgs.alejandra; diff --git a/shell.nix b/shell.nix index 1aecb62..6015198 100644 --- a/shell.nix +++ b/shell.nix @@ -2,7 +2,7 @@ mkShell, sops, colmena, - deploy-rs, + # deploy-rs, nixpkgs-fmt, nil, alejandra, @@ -11,7 +11,7 @@ mkShell { nativeBuildInputs = [ sops colmena - deploy-rs + # deploy-rs nixpkgs-fmt nil alejandra