moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: moritz:a793777d5df09fde7ca8b3950acf92c6cd63370e
Branches Tags
moritz:nixos
..
compare: moritz:a2a2dc8416752e9dfd170456fe47d9464f1bdb51
Branches Tags
moritz:nixos

No commits in common. "a793777d5df09fde7ca8b3950acf92c6cd63370e" and "a2a2dc8416752e9dfd170456fe47d9464f1bdb51" have entirely different histories.
a793777d5d ... a2a2dc8416

8 changed files with 75 additions and 4324 deletions
Show Stats Expand all files Collapse all files

153
flake.lock
View File

@ -43,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729527199, "lastModified": 1728902391,
"narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "rev": "9874e08eec85b5542ca22494e127b0cdce46b786",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1729712798, "lastModified": 1729281548,
"narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=", "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "09a776702b004fdf9c41a024e1299d575ee18a7d", "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +383,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1729829295, "lastModified": 1729372614,
"narHash": "sha256-r9bRVnLdsLPsuFb+iqUiKzxgSHWAOCt9BYxNWKwHy9Y=", "narHash": "sha256-WqbbdfXbayKTGplZ6GntKq1blX3YTI7WzXEPWhqo0fA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "582b8d039a9e36a370c9a60d702e27e06dc2e19d", "rev": "1134a9cbea571a3303df352636b1329753b4d443",
"revCount": 7809, "revCount": 7757,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@ -621,11 +621,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729716953, "lastModified": 1729459288,
"narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -695,11 +695,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1729781453, "lastModified": 1729378105,
"narHash": "sha256-vSZSNXXNEPN5JJcUobCBl6FaDvXjmLHhAJWoX3ZmHUQ=", "narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3cec45d82113051d35e846e5d80719d8ea0f7002", "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5",
"revCount": 5372, "revCount": 5362,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -829,34 +829,6 @@
"type": "github" "type": "github"
} }
}, },
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729544999,
"narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "65c207c92befec93e22086da9456d3906a4e999c",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.5",
"repo": "ixx",
"type": "github"
}
},
"libgit2": { "libgit2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -876,11 +848,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1729839280, "lastModified": 1729502391,
"narHash": "sha256-1sU4rzJow2Fphk3G5IGjudBtI3y9sgNM9a4BN2Us/Qs=", "narHash": "sha256-maI+uLuGbgwkvNp+FzzhLiGvd80+MS0gASpHjU6B0hY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9eca9b6e9828be9ccddf1007f6f30feb9a40e24", "rev": "d3503200cd28f0ecba42a9a4f82988f469932320",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -958,11 +930,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729757100, "lastModified": 1728901530,
"narHash": "sha256-x+8uGaX66V5+fUBHY23Q/OQyibQ38nISzxgj7A7Jqds=", "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "04193f188e4144d7047f83ad1de81d6034d175cd", "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1035,21 +1007,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-facter-modules": {
"locked": {
"lastModified": 1728725827,
"narHash": "sha256-io1UeGaV2HcmK1zCZPnawJu3CxKHhiZ83NBJ+qshWIo=",
"owner": "numtide",
"repo": "nixos-facter-modules",
"rev": "9f2a45b372830d28412160413d1d83f5ee11cc2f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nixos-facter-modules",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1722073938, "lastModified": 1722073938,
@ -1224,11 +1181,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1729413321, "lastModified": 1728888510,
"narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1272,11 +1229,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1729788628, "lastModified": 1729265718,
"narHash": "sha256-3suayUinicnvE/4shMZwp9FHT5izUM8gMpdEO/NHBTo=", "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63487b2f26fa065cfeeaa47dddb08e2856ba53e8", "rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1288,11 +1245,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1729665710, "lastModified": 1729070438,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "rev": "5785b6bb5eaae44e627d541023034e1601455827",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1337,11 +1294,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1729791159, "lastModified": 1729438888,
"narHash": "sha256-i5TKYCs9tJ2qaYTsjQh3WwExmj4O0EU+L1jq6ZBVMfM=", "narHash": "sha256-TGTDOX2/5OIoSzlcRReVn4BbbfL6Ami/eassiPPGqNA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "4726334e4413ff55f1db3768c8d08722abbf09cf", "rev": "47b563d4e1410bff6a9481b3dd8b01b1e5ed70d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1352,11 +1309,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1729839538, "lastModified": 1729491640,
"narHash": "sha256-uS2m5oW/Jhi3UxMfCChj64NndOsE2+4Px+jYDXmpcjM=", "narHash": "sha256-k2mR4w+yvko/JsWaH+1fIqjWRFixEs+jv/lNw8qnfkQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6f557f568d3a16cda792132ad82e9f0c14ba5ef0", "rev": "41ca6cfe238fdfab2831386c5a65f5c0a01e1cfd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1368,18 +1325,17 @@
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1729763753, "lastModified": 1728905062,
"narHash": "sha256-M8WAUgKFBU5TvFt92g/dHBtGJmBP33LHird+solHt0g=", "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "bedc2f2ada220815a98a896e10f5e61bfc329bfc", "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1399,11 +1355,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1729104314, "lastModified": 1728778939,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1436,11 +1392,11 @@
"river": { "river": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729764469, "lastModified": 1727948541,
"narHash": "sha256-uhgvV+GTxeTJNxZ4lUpqPlaonnon7MD/qFi3a6OU5t0=", "narHash": "sha256-pC8D581CMhh3XCVBbwZ/8woAuD58ilGCrBX4ic5G9Zo=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1b5dd21ee610b30d13c9165dfde23989c5e97e8d", "rev": "fd55f51ba1b53af95fe3a24611490d42a895ef98",
"revCount": 1299, "revCount": 1297,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/riverwm/river" "url": "https://github.com/riverwm/river"
@ -1470,7 +1426,6 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-monitored": "nix-monitored", "nix-monitored": "nix-monitored",
"nix-super": "nix-super", "nix-super": "nix-super",
"nixos-facter-modules": "nixos-facter-modules",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
@ -1482,11 +1437,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1729691686, "lastModified": 1729307008,
"narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1614,11 +1569,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729613947, "lastModified": 1729242555,
"narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View File

@ -56,8 +56,6 @@
ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty"; ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty";
# ghostty.url = "/home/moritz/Documents/ghostty"; # ghostty.url = "/home/moritz/Documents/ghostty";
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
}; };
outputs = inputs@{ self, flake-parts, ... }: outputs = inputs@{ self, flake-parts, ... }:
@ -160,7 +158,6 @@
inputs.home-manager.nixosModule inputs.home-manager.nixosModule
inputs.impermanence.nixosModules.impermanence inputs.impermanence.nixosModules.impermanence
inputs.nix-index-database.nixosModules.nix-index inputs.nix-index-database.nixosModules.nix-index
inputs.nixos-facter-modules.nixosModules.facter
path path
]; ];
}) })

7
hosts/nixos-laptop/default.nix
View File

@ -6,11 +6,11 @@
, ... , ...
}: { }: {
imports = [ imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
./disko.nix ./disko.nix
]; ];
facter.reportPath = ./facter.json;
my = { my = {
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
yubikey.luksSupport.enable = false; yubikey.luksSupport.enable = false;
@ -143,7 +143,6 @@
supportedFilesystems = [ "zfs" ]; supportedFilesystems = [ "zfs" ];
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
initrd.availableKernelModules = [ "rtsx_pci_sdmmc" ];
}; };
# SERVICES # SERVICES
@ -153,6 +152,7 @@
printing.enable = true; printing.enable = true;
logind.lidSwitch = "hybrid-sleep"; logind.lidSwitch = "hybrid-sleep";
}; };
hardware.bluetooth.enable = true;
# NETWORKING # NETWORKING
networking = { networking = {
@ -173,7 +173,6 @@
# Powersaving # Powersaving
services.tlp.enable = true; services.tlp.enable = true;
powerManagement.enable = true; powerManagement.enable = true;
powerManagement.powertop.enable = true;
systemd = { systemd = {
# Hibernare on low battery # Hibernare on low battery

4201
hosts/nixos-laptop/facter.json
View File

File diff suppressed because it is too large Load Diff

17
hosts/nixos-laptop/hardware-configuration.nix Normal file
View File

@ -0,0 +1,17 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ modulesPath
, lib
, ...
}: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "rtsx_pci_sdmmc" ];
initrd.kernelModules = [ ];
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

7
modules/programs/nix.nix
View File

@ -44,17 +44,12 @@ in
nix = config.nix.package; nix = config.nix.package;
}; };
age.secrets.nix-github-token.file = ../../secrets/nix-github-token.age;
nix = { nix = {
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
package = pkgs.nix; package = pkgs.nix;
extraOptions = '' extraOptions = "experimental-features = nix-command flakes";
!include ${config.age.secrets.nix-github-token.path}
experimental-features = nix-command flakes
'';
gc = { gc = {
automatic = cfg.gc.enable; automatic = cfg.gc.enable;

10
secrets/nix-github-token.age
View File

@ -1,10 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 CjuqfA H1gL8k/o7kvJoVEZ0UrbUv1G7Ceb3cUCIVFhch9rDhc
0531muHlievVhT5piGLXC+/zOymCkPM9P9csRxLsnpM
-> ssh-ed25519 wG6LYg Z9cm/TUZbV35tzgHywx1AHmF8jrFFqBl3sCIELEvcH0
OmLY/ThgZ4f8CFFA5YpYFiRK+ro7cBqoFY6UY7/VS8I
-> ssh-ed25519 ZYd7Zg xpjSILAYRyQ4kkbdLAVJQXChX+t/DeL3qWWJae2sczI
wamYh70/AGSh5j4uqsPFTvn36E3TmGoVL8XlxbSfX9g
--- NNsTU7Fsi/WLegSpkuoNaxN0kFQG38mgdhCQ8y+CSQE
vâî"²úÃF
‘=‹‰rûazÜ6h<>ÍQâN÷&DpvðGÄXQ$d7tíˆ݈ElÃIèÀXŠãYrV'‚ç×ï)J¬€Hí<48>ɦ Úƒ?fåœÊWÃH_Ô®Ô±‰ª"

1
secrets/secrets.nix
View File

@ -28,5 +28,4 @@ in
"exercism.age".publicKeys = personal; "exercism.age".publicKeys = personal;
"openai.age".publicKeys = personal; "openai.age".publicKeys = personal;
"anthropic.age".publicKeys = personal; "anthropic.age".publicKeys = personal;
"nix-github-token.age".publicKeys = personal;
} }