rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2024-11-15 05:13:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

nextcloud updates and hyprland cache

Browse source
This commit is contained in:
Rouven Seifert 2023-03-26 14:27:15 +02:00
parent 5e53086882
commit c5ec676f38
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
5 changed files with 93 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
flake.lock
View file

@ -117,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679480702, "lastModified": 1679786039,
"narHash": "sha256-npuRD61YmxUPitI1TqKwlxLrU6iGl5E+BPT196LgUDo=", "narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "363c46b2480f1b73ec37cf68caac61f5daa82a2e", "rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,23 +132,19 @@
}, },
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": "hyprland-protocols",
"hyprland-protocols" "nixpkgs": "nixpkgs",
],
"nixpkgs": [
"nixpkgs"
],
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": [ "xdph": [
"xdph" "xdph"
] ]
}, },
"locked": { "locked": {
"lastModified": 1679576723, "lastModified": 1679792424,
"narHash": "sha256-1DS+XC2pggl430sP+7FunrF9CPldjAxbsHJg0ZfxRqo=", "narHash": "sha256-EFXGWV13DcTO/6jaLf/zoAFOsQMCMPE8YMeXpSeUjNY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "463690a27ac9c921d34dad7169a3d2c8cea5b46f", "rev": "3343aac6bf6aa601cb882859edf63a6cb59bb774",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,15 +156,37 @@
"hyprland-protocols": { "hyprland-protocols": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1673631087, "lastModified": 1671839510,
"narHash": "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=", "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90", "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-protocols_2": {
"inputs": {
"nixpkgs": [
"xdph",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671839510,
"narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,11 +256,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1679224149, "lastModified": 1679765008,
"narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=", "narHash": "sha256-VCkg/wC2e882suYDS5PDAemaMLYSOdFm4fsx2gowMR0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a4bc66709604ab78abc575b60baa6d23ae027a59", "rev": "f38f9a4c9b2b6f89a5778465e0afd166a8300680",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,15 +271,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679437018, "lastModified": 1679172431,
"narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -300,11 +318,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1679163677, "lastModified": 1679748960,
"narHash": "sha256-VC0tc3EjJZFPXgucFQAYMIHce5nJWYR0kVCk4TVg6gg=", "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3912035d00ef755ab19394488b41feab95d2e40", "rev": "da26ae9f6ce2c9ab380c0f394488892616fc5a6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,6 +332,38 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1679705136,
"narHash": "sha256-MDlZUR7wJ3PlPtqwwoGQr3euNOe0vdSSteVVOef7tBY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8f40f2f90b9c9032d1b824442cfbbe0dbabd0dbd",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1669969257,
"narHash": "sha256-mOS13sK3v+kfgP+1Mh56ohiG8uVhLHAo7m/q9kqAehc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b72b8b94cf0c012b0252a9100a636cad69696666",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"beautysh": "beautysh", "beautysh": "beautysh",
@ -326,11 +376,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1679493650, "lastModified": 1679821431,
"narHash": "sha256-9wVDJ8rF/vdCwps6q+tLe7vxe5WSmCsCsG3ylHwdvmw=", "narHash": "sha256-gc0f+fd3qi3iaZrFaCykk3idULqXLkYz4ZnWJJZNSUo=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "2550c919a5acac86ccf79972273a9193c6c77869", "rev": "7f50b54bfb999671778f17192d75b8c23c6d75b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,12 +446,11 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-protocols": "hyprland-protocols",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixvim": "nixvim", "nixvim": "nixvim",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"xdph": "xdph" "xdph": "xdph"
@ -415,11 +464,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1679377997, "lastModified": 1679799335,
"narHash": "sha256-O8rmc/b/qgNgoHj2tL5+3Ovkj7A+Sok7gazRoWbpnqg=", "narHash": "sha256-YrnDyftm0Mk4JLuw3sDBPNfSjk054N0dqQx8FW4JqDM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d8827a8368c307fbc6ed594c9a31d619e7360bed", "rev": "4740f80ca6e756915aaaa0a9c5fbb61ba09cc145",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,12 +512,8 @@
}, },
"xdph": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": [ "hyprland-protocols": "hyprland-protocols_2",
"hyprland-protocols" "nixpkgs": "nixpkgs_3"
],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1679254736, "lastModified": 1679254736,

14
flake.nix
View file

@ -33,24 +33,14 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland-protocols = {
url = github:hyprwm/hyprland-protocols;
inputs.nixpkgs.follows = "nixpkgs";
};
xdph = { xdph = {
url = github:hyprwm/xdg-desktop-portal-hyprland; url = github:hyprwm/xdg-desktop-portal-hyprland;
inputs = {
nixpkgs.follows = "nixpkgs";
hyprland-protocols.follows = "hyprland-protocols";
};
}; };
hyprland = { hyprland = {
url = github:hyprwm/Hyprland; url = github:hyprwm/Hyprland;
inputs = { inputs = {
nixpkgs.follows = "nixpkgs";
hyprland-protocols.follows = "hyprland-protocols";
xdph.follows = "xdph"; xdph.follows = "xdph";
}; };
}; };
@ -93,6 +83,10 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
{ {
nix.settings = {
substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
};
home-manager.extraSpecialArgs = attrs; home-manager.extraSpecialArgs = attrs;
home-manager.users.rouven = { home-manager.users.rouven = {
imports = [ imports = [

2
hosts/nuc/modules/nextcloud/default.nix
View file

@ -26,7 +26,7 @@ in
nextcloud = { nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud25; # Use current latest nextcloud package package = pkgs.nextcloud26; # Use current latest nextcloud package
hostName = "${domain}"; hostName = "${domain}";
https = true; # Use https for all urls https = true; # Use https for all urls
config = { config = {

2
users/rouven/modules/git/default.nix
View file

@ -4,7 +4,7 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Rouven Seifert"; userName = "Rouven Seifert";
userEmail = config.accounts.email.accounts."TU-Dresden".address; userEmail = "rouven@rfive.de";
extraConfig = { extraConfig = {
core.pager = "delta"; core.pager = "delta";
interactive.diffFilter = "delta --color-only"; interactive.diffFilter = "delta --color-only";

4
users/rouven/modules/zsh/default.nix
View file

@ -54,9 +54,9 @@
'' ''
function c() { function c() {
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
cd $(find -maxdepth 4 -not -path '*[cC]ache*' -not -path '*[tT]rash*' -type d | fzf --preview 'tree -C {}') cd $(find -maxdepth 4 -not -path '*[cC]ache*' -not -path '*[tT]rash*' -type d | fzf --preview '${pkgs.tree}/bin/tree -C {}')
else else
$1 $(find -maxdepth 5 -not -path '*[cC]ache*' -not -path '*[tT]rash*' | fzf --preview 'tree -C {}') $1 $(find -maxdepth 5 -not -path '*[cC]ache*' -not -path '*[tT]rash*' | fzf --preview '${pkgs.tree}/bin/tree -C {}')
fi fi
} }