nydragon/nix-da
1
Fork 0
Code Issues Pull requests Activity Actions 1

Compare commits

base: nydragon:2c4a7921ac4277aa9954f45203eb5041bbd130dc
Branches Tags
nydragon:main
nydragon:hjemify
..
compare: nydragon:5e80ec5741a6931d9bb4509cdeab99fd88b589d9
Branches Tags
nydragon:main
nydragon:hjemify

3 commits
2c4a7921ac ... 5e80ec5741

Author SHA1 Message Date
Nydragon
5e80ec5741
feat: swww has a nicer animation 2024-10-26 01:58:27 +02:00
Nydragon
1863240cd6
chore: various stuff 2024-10-26 01:51:22 +02:00
Nydragon
e4d058e47a
chore: remove unneeded inputs 2024-10-25 20:19:39 +02:00
13 changed files with 30 additions and 229 deletions
Show stats Expand all files Collapse all files

8
.pre-commit-config.yaml
View file

@ -7,7 +7,7 @@ repos:
rev: v8.18.2 rev: v8.18.2
hooks: hooks:
- id: gitleaks - id: gitleaks
stages: [commit] stages: [pre-commit]
- repo: local - repo: local
hooks: hooks:
@ -17,7 +17,7 @@ repos:
language: system language: system
files: .*\.nix$ files: .*\.nix$
args: [-c] args: [-c]
stages: [commit] stages: [pre-commit]
- id: prettier - id: prettier
name: Check css, scss, js, ts and yaml formatting name: Check css, scss, js, ts and yaml formatting
@ -25,7 +25,7 @@ repos:
language: system language: system
files: .*\.(css|scss|js|ts|yaml)$ files: .*\.(css|scss|js|ts|yaml)$
args: [-c] args: [-c]
stages: [commit] stages: [pre-commit]
- id: typos - id: typos
name: Check for typos name: Check for typos
@ -33,4 +33,4 @@ repos:
language: system language: system
files: .* files: .*
exclude: .*\.(png|jpg|jpeg|age) exclude: .*\.(png|jpg|jpeg|age)
stages: [commit] stages: [pre-commit]

191
flake.lock generated
View file

@ -83,24 +83,6 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -142,59 +124,7 @@
"type": "github" "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": { "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": { "inputs": {
"hyprutils": [ "hyprutils": [
"hyprlock", "hyprlock",
@ -225,12 +155,12 @@
}, },
"hyprlock": { "hyprlock": {
"inputs": { "inputs": {
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang",
"hyprutils": "hyprutils_2", "hyprutils": "hyprutils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1728135019, "lastModified": 1728135019,
@ -247,31 +177,6 @@
} }
}, },
"hyprutils": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprlock", "hyprlock",
@ -298,7 +203,7 @@
}, },
"naersk": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1721727458, "lastModified": 1721727458,
@ -363,22 +268,6 @@
} }
}, },
"nixpkgs_3": { "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": { "locked": {
"lastModified": 0, "lastModified": 0,
"narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
@ -432,61 +321,19 @@
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "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": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland",
"hyprlock": "hyprlock", "hyprlock": "hyprlock",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nysh": "nysh", "nysh": "nysh",
"rofi-obsidian": "rofi-obsidian",
"rustypaste": "rustypaste" "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": { "rustypaste": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
@ -554,36 +401,6 @@
"repo": "default-linux", "repo": "default-linux",
"type": "github" "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", "root": "root",

10
flake.nix
View file

@ -23,21 +23,11 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
rofi-obsidian = {
url = "github:nydragon/rofi-obsidian";
inputs.nixpkgs.follows = "nixpkgs";
};
nysh = { nysh = {
url = "git+https://codeberg.org/nydragon/nysh"; url = "git+https://codeberg.org/nydragon/nysh";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = {
url = "github:hyprwm/hyprlock";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprlock = { hyprlock = {
url = "github:hyprwm/hyprlock"; url = "github:hyprwm/hyprlock";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

2
home/graphical/swww.nix
View file

@ -24,7 +24,7 @@
Service = { Service = {
Type = "oneshot"; 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";
}; };
}; };

2
home/hyprland/default.nix
View file

@ -21,7 +21,7 @@ lib.mkIf osConfig.programs.hyprland.enable {
exec-once = [ exec-once = [
"${pkgs.nextcloud-client}/bin/nextcloud --background" "${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" "${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"
# keepassxc ignores themeing and doesnt show up in system tray otherwise # keepassxc ignores themeing and doesnt show up in system tray otherwise

1
home/rofi/default.nix
View file

@ -24,7 +24,6 @@ lib.mkIf config.programs.rofi.enable {
# WARNING: ABI version mismatch # WARNING: ABI version mismatch
# "calc" # "calc"
"clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}" "clipboard:${lib.my.checkPath pkgs.cliphist "cliphist-rofi-img"}"
"obsidian:${lib.my.checkPath pkgs.rofi-obsidian "rofi-obsidian"}"
]; ];
matching = "fuzzy"; matching = "fuzzy";
sort = true; sort = true;

2
home/sway/default.nix
View file

@ -117,7 +117,7 @@ lib.mkIf osConfig.programs.sway.enable {
#: Startup {{{ #: Startup {{{
startup = [ startup = [
{ command = "${pkgs.nextcloud-client}/bin/nextcloud --background"; } { 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.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"; }
{ {
command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}"; command = "${pkgs.scripts.set-background}/bin/set-background -f ${wallpaper}";

1
hosts/brontes/default.nix
View file

@ -77,7 +77,6 @@
firefox.enable = true; firefox.enable = true;
thunderbird.enable = true; thunderbird.enable = true;
sway.enable = true; sway.enable = true;
hyprland.enable = true;
}; };
security.polkit.enable = true; security.polkit.enable = true;

2
hosts/brontes/home.nix
View file

@ -40,7 +40,7 @@
packages = with pkgs; [ packages = with pkgs; [
keepassxc keepassxc
kdeconnect kdePackages.kdeconnect-kde
nextcloud-client nextcloud-client
digikam digikam
fragments fragments

2
hosts/marr/default.nix
View file

@ -159,7 +159,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
shared-mime-info shared-mime-info
nextcloud-client nextcloud-client
kdeconnect kdePackages.kdeconnect-kde
glib glib
wireguard-tools wireguard-tools
dconf dconf

15
hosts/shan/default.nix
View file

@ -10,6 +10,10 @@
./adguard.nix ./adguard.nix
]; ];
swapDevices = [
{ device = "/dev/disk/by-uuid/cc568199-7a9b-4aa2-83f8-2a63982ff4f1"; }
];
age.secrets = { age.secrets = {
navidrome.file = ../../secrets/navidrome.age; navidrome.file = ../../secrets/navidrome.age;
adguard-dns-list = { 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 = { fileSystems = {
"/mnt/shows" = { "/mnt/shows" = {
device = "192.168.178.21:/mnt/Fort/data/shows"; device = "192.168.178.21:/mnt/Fort/data/shows";

6
modules/nix/overlays.nix
View file

@ -28,14 +28,8 @@
pkgs = prev.pkgs; pkgs = prev.pkgs;
}; };
rofi-obsidian = inputs'.rofi-obsidian.packages.rofi-obsidian;
nysh = inputs'.nysh.packages.nysh; 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; hyprlock = inputs'.hyprlock.packages.hyprlock;
}) })
inputs.rustypaste.overlays.default inputs.rustypaste.overlays.default

17
modules/programs/sway.nix
View file

@ -1,20 +1,7 @@
{ { config, lib, ... }:
pkgs,
config,
lib,
...
}:
lib.mkIf config.programs.sway.enable { lib.mkIf config.programs.sway.enable {
programs.sway = { programs.sway = {
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
extraPackages = with pkgs; [ extraPackages = [ ];
waybar
grim
slurp
wl-clipboard
swaybg
swaylock
swayidle
];
}; };
} }