max/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: max:e0ded22cc5baa2b54f203b28a34e8ed836362576
Branches Tags
max:main
...
compare: max:main
Branches Tags
max:main

11 Commits
e0ded22cc5 ... main

Author SHA1 Message Date
Max Känner
f61a4ee7e3 update 2025-06-23 20:41:42 +02:00
Max Känner
15280d58db 645 current 1970-01-01 01:00:00 25.05.20250525.7c43f08 6.12.30 * 2025-06-23 19:29:22 +02:00
Max Känner
13406ac5a5 643 current 1970-01-01 01:00:00 25.05.20250525.7c43f08 6.12.30 * 2025-06-23 11:30:21 +02:00
Max Känner
e77d36d230 update rclone password 2025-06-23 11:21:46 +02:00
Max Känner
38691b024c 641 current 1970-01-01 01:00:00 25.05.20250525.7c43f08 6.12.30 * 2025-06-03 14:07:47 +02:00
Max Känner
6cb1847ce3 fix greeter 2025-05-27 13:27:10 +02:00
Max Känner
f9d691975d update rclone apppassword 2025-05-26 22:22:03 +02:00
Max Känner
b5ace6ccb9 upgrade to NixOs 25.05 2025-05-26 20:08:04 +02:00
Max Känner
bec9559314 630 current 1970-01-01 01:00:00 24.11.20250519.72841a4 6.6.91 * 2025-05-26 16:39:44 +02:00
Max Känner
b654d36a6f 629 current 1970-01-01 01:00:00 24.11.20250519.72841a4 6.6.91 * 2025-05-21 20:23:33 +02:00
Max Känner
42099e9142 update nixos 2025-05-21 20:23:07 +02:00
12 changed files with 74 additions and 53 deletions
Expand all files Collapse all files

28
flake.lock generated
View File

@ -7,16 +7,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746171682, "lastModified": 1749154018,
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "50eee705bbdbac942074a8c120e8194185633675", "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -43,27 +43,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746557022, "lastModified": 1750400657,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1746663147, "lastModified": 1750506804,
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746485181, "lastModified": 1750119275,
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
"type": "github" "type": "github"
}, },
"original": { "original": {

29
flake.nix
View File

@ -2,10 +2,10 @@
description = "Nixos config flake"; description = "Nixos config flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
@ -36,7 +36,7 @@
allowUnfreePredicate = pkg: allowUnfreePredicate = pkg:
builtins.elem (nixpkgs.lib.getName pkg) [ builtins.elem (nixpkgs.lib.getName pkg) [
"discord" "discord"
"samsung-UnifiedLinuxDriver" "samsung-unified-linux-driver"
"steam" "steam"
"steam-unwrapped" "steam-unwrapped"
"stm32cubemx" "stm32cubemx"
@ -49,7 +49,7 @@
"MaxNixosLaptop" = nixpkgs.lib.nixosSystem { "MaxNixosLaptop" = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit inputs pkgs system; inherit inputs system;
}; };
modules = [ modules = [
./hosts/MaxNixosLaptop/configuration.nix ./hosts/MaxNixosLaptop/configuration.nix
@ -63,6 +63,27 @@
]; ];
} }
musnix.nixosModules.musnix musnix.nixosModules.musnix
{
nixpkgs = {
overlays = [
# make unstable packages available via overlay
(final: prev: {
unstable = nixpkgs-unstable.legacyPackages.${prev.system};
})
];
config = {
allowUnfreePredicate = pkg:
builtins.elem (nixpkgs.lib.getName pkg) [
"discord"
"samsung-unified-linux-driver"
"steam"
"steam-unwrapped"
"stm32cubemx"
"obsidian"
];
};
};
}
]; ];
}; };
ServerIso = nixpkgs.lib.nixosSystem { ServerIso = nixpkgs.lib.nixosSystem {

3
modules/home/programs/default.nix
View File

@ -46,7 +46,7 @@ in {
freecad freecad
wine wine
prusa-slicer prusa-slicer
unstable.kicad kicad
element-desktop element-desktop
chromium chromium
wl-clipboard wl-clipboard
@ -56,6 +56,7 @@ in {
stm32cubemx stm32cubemx
flatpak flatpak
obsidian obsidian
marksman
]; ];
}; };
} }

2
modules/home/shell/neovim.nix
View File

@ -66,6 +66,8 @@ in {
texliveMedium texliveMedium
biber biber
gcc gcc
just-lsp
marksman
]; ];
}; };

1
modules/home/shell/nvim-lua/community.lua
View File

@ -6,6 +6,7 @@ return {
{ import = "astrocommunity.pack.docker" }, { import = "astrocommunity.pack.docker" },
{ import = "astrocommunity.pack.html-css" }, { import = "astrocommunity.pack.html-css" },
{ import = "astrocommunity.pack.json" }, { import = "astrocommunity.pack.json" },
{ import = "astrocommunity.pack.just" },
{ import = "astrocommunity.pack.lua" }, { import = "astrocommunity.pack.lua" },
{ import = "astrocommunity.pack.markdown" }, { import = "astrocommunity.pack.markdown" },
{ import = "astrocommunity.pack.nix" }, { import = "astrocommunity.pack.nix" },

2
modules/home/shell/zsh.nix
View File

@ -44,7 +44,7 @@ in {
}; };
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
syntaxHighlighting.highlighters = ["main" "brackets"]; syntaxHighlighting.highlighters = ["main" "brackets"];
initExtra = '' initContent = ''
# auto completion # auto completion
bindkey '^I' complete-word bindkey '^I' complete-word
bindkey '^[[Z' autosuggest-accept bindkey '^[[Z' autosuggest-accept

7
modules/home/sway/default.nix
View File

@ -69,7 +69,8 @@ in {
# fonts # fonts
noto-fonts noto-fonts
nerdfonts nerd-fonts.fira-code
nerd-fonts.fira-mono
fira fira
]; ];
@ -162,8 +163,8 @@ in {
"${modifier}+Shift+Print" = ''exec ${pkgs.wf-recorder}/bin/wf-recorder -g "$(${pkgs.slurp}/bin/slurp)" -f "$HOME/Videos/screencapture_$(${pkgs.coreutils}/bin/date +%F-%T).mp4"''; "${modifier}+Shift+Print" = ''exec ${pkgs.wf-recorder}/bin/wf-recorder -g "$(${pkgs.slurp}/bin/slurp)" -f "$HOME/Videos/screencapture_$(${pkgs.coreutils}/bin/date +%F-%T).mp4"'';
# brightness # brightness
"XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 5"; "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -T 0.9";
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 5"; "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -T 1.1";
# volume # volume
"XF86AudioRaiseVolume" = "exec '${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +1%'"; "XF86AudioRaiseVolume" = "exec '${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +1%'";
"XF86AudioLowerVolume" = "exec '${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -1%'"; "XF86AudioLowerVolume" = "exec '${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -1%'";

22
modules/home/sway/mako.nix
View File

@ -12,18 +12,20 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.mako = { services.mako = {
enable = true; enable = true;
actions = true; settings = {
anchor = "top-right"; actions = true;
anchor = "top-right";
borderRadius = 10; border-radius = 10;
borderSize = 2; border-size = 2;
height = 100; height = 100;
width = 400; width = 400;
defaultTimeout = 10000; # ms default-timeout = 10000; # ms
font = "FiraCode Nerd Font 11"; font = "FiraCode Nerd Font 11";
icons = true; icons = true;
markup = true; markup = true;
};
}; };
}; };
} }

17
modules/home/sway/theme.nix
View File

@ -116,15 +116,14 @@ in {
}; };
xsession.enable = true; xsession.enable = true;
services.mako = { services.mako.settings = {
backgroundColor = "#313131"; background-color = "#313131";
borderColor = "#00FFEE"; border-color = "#00FFEE";
progressColor = "#338833"; progress-color = "#338833";
textColor = "#e0e0e0"; text-color = "#e0e0e0";
extraConfig = '' "urgency=low" = {
[urgency=low] border-color = "#008877";
border-color=#008877 };
'';
}; };
}; };
} }

2
modules/nixos/greetd.nix
View File

@ -44,8 +44,6 @@ in {
extraGroups = []; extraGroups = [];
}; };
services.greetd.enable = true;
environment.etc."greetd/environments".text = '' environment.etc."greetd/environments".text = ''
sway sway
''; '';

1
modules/nixos/nix.nix
View File

@ -5,6 +5,7 @@
auto-optimise-store = true; auto-optimise-store = true;
max-jobs = "auto"; max-jobs = "auto";
cores = 12; cores = 12;
download-buffer-size = 524288000;
}; };
}; };
} }

13
secrets/rclone.yaml
View File

@ -1,16 +1,12 @@
cloud: cloud:
url: ENC[AES256_GCM,data:BoSdQrtLNKYpaHIWUj5Ak8PGMJz3hj/z88XVBgN6AbyT2K/bC412p3oi+X9MmYATR3A=,iv:wez+v5kEN+niZmZXzaJoygHf4mqKVI6CINktAZe8WTs=,tag:20W87Kcn94smiLtX9mMdOw==,type:str] url: ENC[AES256_GCM,data:BoSdQrtLNKYpaHIWUj5Ak8PGMJz3hj/z88XVBgN6AbyT2K/bC412p3oi+X9MmYATR3A=,iv:wez+v5kEN+niZmZXzaJoygHf4mqKVI6CINktAZe8WTs=,tag:20W87Kcn94smiLtX9mMdOw==,type:str]
user: ENC[AES256_GCM,data:kFza,iv:OrDNF/h+xLuuyq2cpaHnQuRM1lwuXhe8Ue0rm/wRmkY=,tag:9t+hEx38r/yBIzWIFD0GnQ==,type:str] user: ENC[AES256_GCM,data:kFza,iv:OrDNF/h+xLuuyq2cpaHnQuRM1lwuXhe8Ue0rm/wRmkY=,tag:9t+hEx38r/yBIzWIFD0GnQ==,type:str]
pass: ENC[AES256_GCM,data:Jp0Zpzw6NZzvE+N5cehvgW7nV5F1WQteZcPFB8FGZMyvX+uhVfUDvp8/UHU/2Vd/zT+A+NVp/EQDd8Wv,iv:O5rdJ+lgqXF+JqZc9yJVUM7Sy4yGRGLKGuFLxfD5Jpc=,tag:UT/AeIYQDqck2Y+wLTmNUw==,type:str] pass: ENC[AES256_GCM,data:p3c8PeE54fjCIJlwDMLmE9gaYexjcXFa05xExJkKJJTNcLKVhMqQCZxeBZReTKxK18dMbTHd6eaFqPKH,iv:IC2MFF4Aj01a9iE5SVk+Os/0sX+8COsD9p8Jdh98VSs=,tag:e/Z9CjP/iXsnGWtD5jlJlQ==,type:str]
luhbots: luhbots:
url: ENC[AES256_GCM,data:5hnCSyNcr3un83FaNGYaiZdbxCJe87+hzpoRtWozbn0OW31pxONIEQnSikXh59/OlVJN9TEmv+bd3uO210NPoKUL0D2MWw==,iv:fvY7fLbiAVGq0hh4ifs/LRgixlZsIDczw0hpiUvFSw0=,tag:gXNgNWMDXnRMdyhTjnG6oA==,type:str] url: ENC[AES256_GCM,data:5hnCSyNcr3un83FaNGYaiZdbxCJe87+hzpoRtWozbn0OW31pxONIEQnSikXh59/OlVJN9TEmv+bd3uO210NPoKUL0D2MWw==,iv:fvY7fLbiAVGq0hh4ifs/LRgixlZsIDczw0hpiUvFSw0=,tag:gXNgNWMDXnRMdyhTjnG6oA==,type:str]
user: ENC[AES256_GCM,data:ucJ21fRmDKvHtyA=,iv:IYfNwBBWYxVb7ptwhfBiBgXwaoj5oCWg6gCI3WD8sjE=,tag:sB6/PJuquUL/GugpfzNMRw==,type:str] user: ENC[AES256_GCM,data:ucJ21fRmDKvHtyA=,iv:IYfNwBBWYxVb7ptwhfBiBgXwaoj5oCWg6gCI3WD8sjE=,tag:sB6/PJuquUL/GugpfzNMRw==,type:str]
pass: ENC[AES256_GCM,data:3gkyN51YvL/SrtP3kbG4OVhc5KBzu33dYVx4u8pJs9h3GJ9Wh1A5NCaBFJa7VFWfKuysNmr4CQwQEYBX,iv:U5foeasbN/TrrR0mA1mNcqYWZFXHYIAqXLmP/RvC+Os=,tag:x7ck7quJG7npMGwi/ss3ZA==,type:str] pass: ENC[AES256_GCM,data:3gkyN51YvL/SrtP3kbG4OVhc5KBzu33dYVx4u8pJs9h3GJ9Wh1A5NCaBFJa7VFWfKuysNmr4CQwQEYBX,iv:U5foeasbN/TrrR0mA1mNcqYWZFXHYIAqXLmP/RvC+Os=,tag:x7ck7quJG7npMGwi/ss3ZA==,type:str]
sops: sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age: age:
- recipient: age1d6ze98387f0gryqwvrdlcxgz3wgs607ach4duwmnp72dzaa63cxqchc78n - recipient: age1d6ze98387f0gryqwvrdlcxgz3wgs607ach4duwmnp72dzaa63cxqchc78n
enc: | enc: |
@ -21,8 +17,7 @@ sops:
cVV3dFpNbjY1bkZtUlltanpSNDlPd28KQ4FQrC6KyZEzzkmByh07q1RAGnWnCNtr cVV3dFpNbjY1bkZtUlltanpSNDlPd28KQ4FQrC6KyZEzzkmByh07q1RAGnWnCNtr
XTDQhlbSq/LdptpqNbUD2g9H9vC2CAC0av39ExvT55JiK4dEWmrwUA== XTDQhlbSq/LdptpqNbUD2g9H9vC2CAC0av39ExvT55JiK4dEWmrwUA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-04-14T10:40:29Z" lastmodified: "2025-06-12T07:55:51Z"
mac: ENC[AES256_GCM,data:PM6xAylhbEoG17McCCxT9k1cf0rIrORhndSAe8jqiwnezj2rRVkwTsCCWrf678GZpaBwdvYc1sauK0GRxLsk9qoMaeMh0knDMKOYjIxacrlJdYJkOZq8Ze1UWxyAd6PLtR9EQEsbJEnup+AcKGwvjJ5iySD8dWB2kcBnCVeaHdE=,iv:7DhkICFMJ4iRs1BHCGpZo8ZvJwpF5EolgP0egyMUyPY=,tag:SST1xwIwyOfLhfH5oasnjQ==,type:str] mac: ENC[AES256_GCM,data:WXOmWalZiENdsqVQqGfwXrt3OJ0HoMPNTHkk9C7oASv+wl1eX/7yryQ5GWgXe5GGqhBrtnKPIxKNDGABiXqA7zhR31Bp3Kctyztum8ygcv9+7rs2S+8Ya9LxC0/q/mhbsFOiu3UYw9icwig9rRXmx8I41VxaWGLbL/TLryFzWjI=,iv:ygdWjZespGdXVaMqdwbXIr1gD2SengMoAVHuUUswBEw=,tag:5DV6lEmIZvyzoj/JEh9sCw==,type:str]
pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.4 version: 3.10.2