Daholli/nixos-config
1
0
Fork 0
Code Issues 3 Pull requests Releases Packages Activity Actions

improvement: git, hyprland, steam

Browse source 
added gitbutler, introduced maintenance for nixpkgs, cleaned up some files, keyring should now unlock ad login
This commit is contained in:
Christoph Hollizeck 2024-10-08 00:43:56 +02:00
parent d15768ff74
commit 23e93efbf8
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
12 changed files with 175 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

180
flake.lock generated
View file

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725753098, "lastModified": 1727261104,
"narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=", "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52", "rev": "b82fdaff917582a9d568969e15e61b398c71e990",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1726357397, "lastModified": 1728282832,
"narHash": "sha256-W68/drb51fBhOl/BMOoRlI+7qxeoNWGmCZwAyuXVlQY=", "narHash": "sha256-I7AbcwGggf+CHqpyd/9PiAjpIBGTGx5woYHqtwxaV7I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "8f14b37d4ad9eafd33315ba67faded5c1e1a1044", "rev": "1ec71be1f4b8f3105c5d38da339cb061fefc43f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +286,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726357542, "lastModified": 1728306985,
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,11 +307,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725825817, "lastModified": 1727932681,
"narHash": "sha256-hBvwaMlgBuR2cB1Kx6cA1z7x38HXUujNcHtBsKhaEZs=", "narHash": "sha256-zCFWQb6COHRSXlRj7Jln2cKEUxg8PjHoa1Unuu0XHzM=",
"owner": "outfoxxed", "owner": "outfoxxed",
"repo": "hy3", "repo": "hy3",
"rev": "4b194eb5486b89102726ad5f4492bb3440c46031", "rev": "4bc32709c7b8f831e39ec2a7921030c08dbdf500",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722623071, "lastModified": 1727532803,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,6 +353,7 @@
"inputs": { "inputs": {
"aquamarine": "aquamarine", "aquamarine": "aquamarine",
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
@ -361,11 +362,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1726353438, "lastModified": 1728303775,
"narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=", "narHash": "sha256-+DykzTwUrLGOLHQdnWB1Wp0WIfBGhpqXoyTXdwIOoiY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb", "rev": "97444ed7a8a83406970fcc05907db1110435b59b",
"revCount": 5221, "revCount": 5302,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -393,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723143591, "lastModified": 1727705521,
"narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=", "narHash": "sha256-tR4bc6zONkxore1F7CRrwHs9NITht8NY0JTidPSmMXY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-plugins", "repo": "hyprland-plugins",
"rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77", "rev": "9215288eb2ded9d0c08d468ea90ba68f43162c67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,6 +408,31 @@
} }
}, },
"hyprland-protocols": { "hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1727451107,
"narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-protocols_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
@ -474,11 +500,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724966483, "lastModified": 1727300645,
"narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +525,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324119, "lastModified": 1726874836,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -541,11 +567,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726227680, "lastModified": 1728031945,
"narHash": "sha256-pcqHXle7uHQTUESc40Yu0k05cFMRVpm3D8ZHPH6scOY=", "narHash": "sha256-NRkLjdMtVfC6dD1gEbYZWFEtbmC2xfD6ft1IP7l76Vw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "5ee22be69d8bd66da100157fab54d8dde37c775b", "rev": "4524c512e8729ccb5a1b9239d01e1474cbf074a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -556,11 +582,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725885300, "lastModified": 1728269138,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +604,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725882169, "lastModified": 1728299182,
"narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=", "narHash": "sha256-wzxKH5DyG+uyhnGtP8YmN3LCYtEyYR/4fhjKVY2Rtxg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180", "rev": "830b6a752d0097c2043985ff4c1203aba07b268d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -593,11 +619,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725983898, "lastModified": 1727348695,
"narHash": "sha256-4b3A9zPpxAxLnkF9MawJNHDtOOl6ruL0r6Og1TEDGCE=", "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1355a0cbfeac61d785b7183c0caaec1f97361b43", "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -621,11 +647,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1725762081, "lastModified": 1728156290,
"narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", "rev": "17ae88b569bb15590549ff478bab6494dde4a907",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +679,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1726062873, "lastModified": 1728018373,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,11 +695,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1725534445, "lastModified": 1728093190,
"narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -685,11 +711,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1727634051,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -722,11 +748,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726220668, "lastModified": 1728249780,
"narHash": "sha256-0Cb2bK2eyZ1njSX3593USMlcrj94VZprNN1/HllIfgw=", "narHash": "sha256-J269DvCI5dzBmPrXhAAtj566qt0b22TJtF3TIK+tMsI=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "4221354a8fe90ea8218d3757d14735eac08d3e81", "rev": "2b750da1a1a2c1d2c70896108d7096089842d877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -810,11 +836,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1726218807, "lastModified": 1728230538,
"narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", "narHash": "sha256-sbsMJOZgykaSdFbxLKghc0QMtolzl4P5nqpttBA3d5M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", "rev": "2750ed784e93e745a33fb55be7c2657adfb57c00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -885,11 +911,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1726062873, "lastModified": 1728018373,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -901,11 +927,19 @@
}, },
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols_2",
"hyprlang": [ "hyprlang": [
"hyprland", "hyprland",
"hyprlang" "hyprlang"
], ],
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"nixpkgs" "nixpkgs"
@ -916,11 +950,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726046979, "lastModified": 1727524473,
"narHash": "sha256-6SEsjurq9cdTkITA6d49ncAJe4O/8CgRG5/F//s6Xh8=", "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "e695669fd8e1d1be9eaae40f35e00f8bd8b64c18", "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -934,15 +968,15 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1726001766, "lastModified": 1727727601,
"narHash": "sha256-ADvEWfo0AuHR06ah1nnzOyhsG05/b5QpUc7vFNbiEfM=", "narHash": "sha256-YWOGgiqRCOAjHrXbCukCvg9alB9mLMXvrqaUmoFqt+o=",
"owner": "MarceColl", "owner": "ch4og",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "06505a088396e2c0b9ad100302502783a6bcdb40", "rev": "18dac9cd4633bf14d9e96be4d97cd9b358d1bca8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "MarceColl", "owner": "ch4og",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -64,7 +64,7 @@
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
## temporary ## temporary
zen-browser.url = "github:MarceColl/zen-browser-flake"; zen-browser.url = "github:ch4og/zen-browser-flake";
################ ################
## inputs for dev shells ## inputs for dev shells

10
modules/home/tools/git/default.nix
View file

@ -30,6 +30,9 @@ in
inherit (cfg) signByDefault; inherit (cfg) signByDefault;
}; };
extraConfig = { extraConfig = {
core = {
fsmonitor = true;
};
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
@ -42,6 +45,13 @@ in
safe = { safe = {
directory = "${user.home}/projects/config"; directory = "${user.home}/projects/config";
}; };
maintenance = {
repo = [
"${user.home}/projects/nixpkgs"
"${user.home}/projects/config"
];
strategy = "incremental";
};
}; };
}; };
}; };

13
modules/nixos/apps/steam/default.nix
View file

@ -1,18 +1,18 @@
{ {
options,
config, config,
lib, lib,
namespace,
options,
pkgs, pkgs,
... ...
}: }:
with lib;
with lib.wyrdgard;
let let
cfg = config.wyrdgard.apps.steam; inherit (lib) mkIf mkEnableOption;
cfg = config.${namespace}.apps.steam;
in in
{ {
options.wyrdgard.apps.steam = with types; { options.${namespace}.apps.steam = {
enable = mkBoolOpt false "Whether or not to enable support for Steam."; enable = mkEnableOption "Whether or not to enable support for Steam.";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
@ -24,7 +24,6 @@ in
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
steam
protontricks protontricks
]; ];
}; };

12
modules/nixos/desktop/hyprland/default.nix
View file

@ -101,6 +101,12 @@ in
{ {
"$mod" = "SUPER"; "$mod" = "SUPER";
env = [
"QT_AUTO_SCREEN_SCALE_FACTOR,1"
"QT_QPA_PLATFORM,wayland;xcb"
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
];
exec-once = [ exec-once = [
"waybar" "waybar"
"dunst" "dunst"
@ -108,7 +114,6 @@ in
"[workspace 3 silent] steam" "[workspace 3 silent] steam"
"[workspace 2 silent] discord" "[workspace 2 silent] discord"
"[workspace 2 silent] noisetorch -i"
"[workspace 4 silent] 1password" "[workspace 4 silent] 1password"
"[workspace 1 silent] zen" "[workspace 1 silent] zen"
]; ];
@ -264,6 +269,7 @@ in
# focus change on cursor move # focus change on cursor move
follow_mouse = 2; follow_mouse = 2;
force_no_accel = 1;
accel_profile = "flat"; accel_profile = "flat";
}; };
@ -285,6 +291,8 @@ in
}; };
}; };
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
};
}; };
} }

3
modules/nixos/security/keyring/default.nix
View file

@ -6,7 +6,7 @@
... ...
}: }:
let let
inherit (lib) mkIf types; inherit (lib) mkIf;
inherit (lib.wyrdgard) mkBoolOpt; inherit (lib.wyrdgard) mkBoolOpt;
cfg = config.${namespace}.security.keyring; cfg = config.${namespace}.security.keyring;
in in
@ -17,5 +17,6 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
security.pam.services.sddm.enableGnomeKeyring = true;
}; };
} }

2
modules/nixos/system/boot/default.nix
View file

@ -16,7 +16,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_6_10;
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;

1
modules/nixos/system/hardware/audio/default.nix
View file

@ -31,6 +31,7 @@ in
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
wireplumber.configPackages = [ wireplumber.configPackages = [
(pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/11-bluetooth-policy.conf" '' (pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/11-bluetooth-policy.conf" ''
wireplumber.settings = { wireplumber.settings = {

1
modules/nixos/system/hardware/bluetooth/default.nix
View file

@ -25,6 +25,7 @@ in
General = { General = {
Experimental = true; Experimental = true;
KernelExperimental = true; KernelExperimental = true;
Enable = "Source,Sink,Media,Socket";
}; };
}; };
}; };

17
modules/nixos/system/hardware/gpu/nvidia/default.nix
View file

@ -1,15 +1,22 @@
{ lib, config, ... }: {
with lib; lib,
with lib.wyrdgard; config,
pkgs,
namespace,
...
}:
let let
cfg = config.wyrdgard.system.hardware.gpu.nvidia; inherit (lib) mkIf mkEnableOption;
cfg = config.${namespace}.system.hardware.gpu.nvidia;
in in
{ {
options.wyrdgard.system.hardware.gpu.nvidia = with types; { options.${namespace}.system.hardware.gpu.nvidia = {
enable = mkEnableOption "Enable Nvidia GPU"; enable = mkEnableOption "Enable Nvidia GPU";
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.nvidia-vaapi-driver ];
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;

1
modules/nixos/tools/git/default.nix
View file

@ -23,6 +23,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
gitAndTools.gh gitAndTools.gh
gitbutler
]; ];
wyrdgard.home.extraOptions = { wyrdgard.home.extraOptions = {

36
systems/x86_64-linux/yggdrasil/default.nix
View file

@ -11,17 +11,13 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
path-of-building path-of-building
pkgs.most teams-for-linux
pkgs.man-pages
pkgs.man-pages-posix
]; ];
environment.pathsToLink = [ "/libexec" ]; environment.pathsToLink = [ "/libexec" ];
virtualisation.waydroid = enabled; virtualisation.waydroid = enabled;
services.xserver.displayManager.setupCommands = "xrandr --output HDMI-A-1 --off";
wyrdgard = { wyrdgard = {
archetypes = { archetypes = {
gaming.enable = true; gaming.enable = true;
@ -39,24 +35,38 @@ in
#Ultrawide #Ultrawide
"DP-2,3440x1440@144, 0x0, 1" "DP-2,3440x1440@144, 0x0, 1"
#Vertical #Vertical
"HDMI-A-1,1920x1080@144, auto-right, 1, transform, 1" "HDMI-A-1, 1920x1080@144, auto-right, 1, transform, 1"
# nividia kernel issues
"Unknown-1, disable"
]; ];
env = [
"LIBVA_DRIVER_NAME,nvidia"
"XDG_SESSION_TYPE,wayland"
"GBM_BACKEND,nvidia-drm"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
"NVD_BACKEND,direct"
];
cursor = {
no_hardware_cursors = true;
};
exec-once = [ exec-once = [
"xrandr --output DP-2 --primary --output HDMI-A-1 --on"
"hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1" "hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1"
"xrandr --output DP-2 --primary"
]; ];
workspace = [ workspace = [
"1, monitor:DP-2, persistant:true" "1, monitor:DP-2"
"2, monitor:HDMI-A-1, persistant:true" "2, monitor:HDMI-A-1"
"3, monitor:DP-2, persistant:true, defaultName:3 Steam" "3, monitor:DP-2"
"4, monitor:HDMI-A-1: persistant:true, defaultName:4 1Password" "4, monitor:HDMI-A-1"
"5, monitor:DP-2, persistant:true"
]; ];
windowrulev2 = [ windowrulev2 = [
"workspace 2, class:^(steam)$, title:^(Friends List)" "workspace 2 silent, class:^(steam)$, title:^(Friends List)"
"workspace 2 silent, class:^(discord)$, title:^(Discord)"
]; ];
}; };
}; };