Compare commits
3 commits
2c4a7921ac
...
5e80ec5741
| Author | SHA1 | Date | |
|---|---|---|---|
5e80ec5741
|
|||
|
1863240cd6
|
|||
|
e4d058e47a
|
13 changed files with 30 additions and 229 deletions
|
|
@ -7,7 +7,7 @@ repos:
|
|||
rev: v8.18.2
|
||||
hooks:
|
||||
- id: gitleaks
|
||||
stages: [commit]
|
||||
stages: [pre-commit]
|
||||
|
||||
- repo: local
|
||||
hooks:
|
||||
|
|
@ -17,7 +17,7 @@ repos:
|
|||
language: system
|
||||
files: .*\.nix$
|
||||
args: [-c]
|
||||
stages: [commit]
|
||||
stages: [pre-commit]
|
||||
|
||||
- id: prettier
|
||||
name: Check css, scss, js, ts and yaml formatting
|
||||
|
|
@ -25,7 +25,7 @@ repos:
|
|||
language: system
|
||||
files: .*\.(css|scss|js|ts|yaml)$
|
||||
args: [-c]
|
||||
stages: [commit]
|
||||
stages: [pre-commit]
|
||||
|
||||
- id: typos
|
||||
name: Check for typos
|
||||
|
|
@ -33,4 +33,4 @@ repos:
|
|||
language: system
|
||||
files: .*
|
||||
exclude: .*\.(png|jpg|jpeg|age)
|
||||
stages: [commit]
|
||||
stages: [pre-commit]
|
||||
|
|
|
|||
191
flake.lock
generated
191
flake.lock
generated
|
|
@ -83,24 +83,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -142,59 +124,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprland": {
|
||||
"inputs": {
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728135019,
|
||||
"narHash": "sha256-OCUyEfD9g5232OILgW+BpjFVPM8AHl2WM59yRabJvSE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlock",
|
||||
"rev": "eb63207ef051c62fa2ab010b3f89da263a397329",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlock",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprlang": {
|
||||
"inputs": {
|
||||
"hyprutils": [
|
||||
"hyprland",
|
||||
"hyprutils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721324361,
|
||||
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprlang_2": {
|
||||
"inputs": {
|
||||
"hyprutils": [
|
||||
"hyprlock",
|
||||
|
|
@ -225,12 +155,12 @@
|
|||
},
|
||||
"hyprlock": {
|
||||
"inputs": {
|
||||
"hyprlang": "hyprlang_2",
|
||||
"hyprutils": "hyprutils_2",
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728135019,
|
||||
|
|
@ -247,31 +177,6 @@
|
|||
}
|
||||
},
|
||||
"hyprutils": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721324102,
|
||||
"narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "962582a090bc233c4de9d9897f46794280288989",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprutils_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprlock",
|
||||
|
|
@ -298,7 +203,7 @@
|
|||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721727458,
|
||||
|
|
@ -363,22 +268,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1718428119,
|
||||
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
|
||||
|
|
@ -432,61 +321,19 @@
|
|||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
}
|
||||
},
|
||||
"rofi-obsidian": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720405179,
|
||||
"narHash": "sha256-GccZ3CxmS3MDzkCfFNWb/F3eGoVxaoAiHcmWzbq5Z1o=",
|
||||
"owner": "nydragon",
|
||||
"repo": "rofi-obsidian",
|
||||
"rev": "898cb1cb5b52e9b6ab13650ef48b873eebc9581f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nydragon",
|
||||
"repo": "rofi-obsidian",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"disko": "disko",
|
||||
"flake-parts": "flake-parts",
|
||||
"home-manager": "home-manager_2",
|
||||
"hyprland": "hyprland",
|
||||
"hyprlock": "hyprlock",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nysh": "nysh",
|
||||
"rofi-obsidian": "rofi-obsidian",
|
||||
"rustypaste": "rustypaste"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720318855,
|
||||
"narHash": "sha256-w3CCVK9LJ5aznXGkO1IyAlbvMNJfyA+dBF7Z1Zwx1LA=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "3eed08a074cd2000884a69d448d70da2843f7103",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rustypaste": {
|
||||
"inputs": {
|
||||
"naersk": "naersk",
|
||||
|
|
@ -554,36 +401,6 @@
|
|||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -23,21 +23,11 @@
|
|||
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
|
||||
rofi-obsidian = {
|
||||
url = "github:nydragon/rofi-obsidian";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nysh = {
|
||||
url = "git+https://codeberg.org/nydragon/nysh";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
hyprland = {
|
||||
url = "github:hyprwm/hyprlock";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
hyprlock = {
|
||||
url = "github:hyprwm/hyprlock";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
Service = {
|
||||
Type = "oneshot";
|
||||
ExecStart = "${pkgs.swww}/bin/swww img ${self + "/assets/landscape-pink-pastel.jpg"}";
|
||||
ExecStart = "${pkgs.swww}/bin/swww img ${self + "/assets/landscape-pink-pastel.jpg"} -t wipe";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
|
|||
|
||||
exec-once = [
|
||||
"${pkgs.nextcloud-client}/bin/nextcloud --background"
|
||||
"${pkgs.kdeconnect}/bin/kdeconnect-indicator"
|
||||
"${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator"
|
||||
"${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"
|
||||
|
||||
# keepassxc ignores themeing and doesnt show up in system tray otherwise
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ lib.mkIf config.programs.rofi.enable {
|
|||
# WARNING: ABI version mismatch
|
||||
# "calc"
|
||||
"clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}"
|
||||
"obsidian:${lib.my.checkPath pkgs.rofi-obsidian "rofi-obsidian"}"
|
||||
];
|
||||
matching = "fuzzy";
|
||||
sort = true;
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ lib.mkIf osConfig.programs.sway.enable {
|
|||
#: Startup {{{
|
||||
startup = [
|
||||
{ command = "${pkgs.nextcloud-client}/bin/nextcloud --background"; }
|
||||
{ command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
|
||||
{ command = "${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnect-indicator"; }
|
||||
{ command = "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
|
||||
{
|
||||
command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}";
|
||||
|
|
|
|||
|
|
@ -77,7 +77,6 @@
|
|||
firefox.enable = true;
|
||||
thunderbird.enable = true;
|
||||
sway.enable = true;
|
||||
hyprland.enable = true;
|
||||
};
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
packages = with pkgs; [
|
||||
keepassxc
|
||||
kdeconnect
|
||||
kdePackages.kdeconnect-kde
|
||||
nextcloud-client
|
||||
digikam
|
||||
fragments
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
shared-mime-info
|
||||
nextcloud-client
|
||||
kdeconnect
|
||||
kdePackages.kdeconnect-kde
|
||||
glib
|
||||
wireguard-tools
|
||||
dconf
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@
|
|||
./adguard.nix
|
||||
];
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/cc568199-7a9b-4aa2-83f8-2a63982ff4f1"; }
|
||||
];
|
||||
|
||||
age.secrets = {
|
||||
navidrome.file = ../../secrets/navidrome.age;
|
||||
adguard-dns-list = {
|
||||
|
|
@ -139,6 +143,17 @@
|
|||
};
|
||||
};
|
||||
|
||||
# security.acme = {
|
||||
#certs = {
|
||||
#"ccnlc.eu" = {
|
||||
#dnsProvider = "ovh";
|
||||
#dnsResolver = "9.9.9.9";
|
||||
#extraDomainNames = [ "*.ccnlc.eu" ];
|
||||
#environmentFile = "/var/secrets/ovh-ccnlc";
|
||||
#};
|
||||
#};
|
||||
#};
|
||||
|
||||
fileSystems = {
|
||||
"/mnt/shows" = {
|
||||
device = "192.168.178.21:/mnt/Fort/data/shows";
|
||||
|
|
|
|||
|
|
@ -28,14 +28,8 @@
|
|||
pkgs = prev.pkgs;
|
||||
};
|
||||
|
||||
rofi-obsidian = inputs'.rofi-obsidian.packages.rofi-obsidian;
|
||||
|
||||
nysh = inputs'.nysh.packages.nysh;
|
||||
|
||||
#hyprland = inputs'.hyprland.packages.hyprland;
|
||||
|
||||
#xdg-desktop-portal-hyprland = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
|
||||
|
||||
hyprlock = inputs'.hyprlock.packages.hyprlock;
|
||||
})
|
||||
inputs.rustypaste.overlays.default
|
||||
|
|
|
|||
|
|
@ -1,20 +1,7 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, lib, ... }:
|
||||
lib.mkIf config.programs.sway.enable {
|
||||
programs.sway = {
|
||||
wrapperFeatures.gtk = true;
|
||||
extraPackages = with pkgs; [
|
||||
waybar
|
||||
grim
|
||||
slurp
|
||||
wl-clipboard
|
||||
swaybg
|
||||
swaylock
|
||||
swayidle
|
||||
];
|
||||
extraPackages = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue