Compare commits

..

1 Commits

Author SHA1 Message Date
aad01c1271 Add nixos-unstable-small to temporarily override pyside6
All checks were successful
Run nix flake check / flake-check (push) Successful in 4m42s
2024-11-20 15:36:48 +01:00
12 changed files with 242 additions and 284 deletions

272
flake.lock generated
View File

@@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1710146030,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -22,6 +22,42 @@
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
}, },
"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"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
@@ -64,11 +100,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733133928, "lastModified": 1732025103,
"narHash": "sha256-gU40r9AfpIr4eq+0noM8yH1Hxf+EA3dqfIpFtQl8Y1E=", "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011", "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -79,19 +115,18 @@
}, },
"huecli": { "huecli": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pyproject-build-systems": "pyproject-build-systems", "poetry2nix": "poetry2nix"
"pyproject-nix": "pyproject-nix",
"uv2nix": "uv2nix"
}, },
"locked": { "locked": {
"lastModified": 1732927393, "lastModified": 1728336978,
"narHash": "sha256-S/StGXd2t8VvvnZ81uPyggc0dHfgHyrFMmXWkGhsJqg=", "narHash": "sha256-7FX4K8QBH/9jiYyCMs2JyCTzlx1/D5Cw6upaFThSVg4=",
"ref": "master", "ref": "master",
"rev": "c2ff98ce55605e57370ea216300d0e58df602c26", "rev": "700ece0bada9833fcfd3b6ce698cd74bc00e4493",
"revCount": 31, "revCount": 22,
"type": "git", "type": "git",
"url": "https://git.t-juice.club/torjus/huecli" "url": "https://git.t-juice.club/torjus/huecli"
}, },
@@ -102,6 +137,28 @@
} }
}, },
"nix-github-actions": { "nix-github-actions": {
"inputs": {
"nixpkgs": [
"huecli",
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703863825,
"narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-github-actions_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixprstatus", "nixprstatus",
@@ -110,11 +167,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729742964, "lastModified": 1720066371,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-github-actions", "repo": "nix-github-actions",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -146,11 +203,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733015953, "lastModified": 1731676054,
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -160,13 +217,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-small": {
"locked": { "locked": {
"lastModified": 1732981179, "lastModified": 1732007104,
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "narHash": "sha256-qaWPxgLAvtIHTDcm0qJuc+WNYjcy4ZKigOyn2ag4ihM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "rev": "0705964c881cea8896474610188905ba41b59b08",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1731755305,
"narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -178,18 +251,18 @@
}, },
"nixprstatus": { "nixprstatus": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix_2"
}, },
"locked": { "locked": {
"lastModified": 1732753900, "lastModified": 1729118937,
"narHash": "sha256-pW6i/d6JD9Vt6+csN1vf8QC/VVotQLPYAtzj1UO2AQI=", "narHash": "sha256-7xYCJXTh92OpKwfshYYnxrWmfNjqaH9SzQ0stuBARVM=",
"ref": "master", "ref": "master",
"rev": "b7e8383abbb8dbe34fe8f59d6306d870be1c437e", "rev": "58b113d934f5d62f27dc50439b89fece4eb621f5",
"revCount": 38, "revCount": 37,
"type": "git", "type": "git",
"url": "https://git.t-juice.club/torjus/nixprstatus" "url": "https://git.t-juice.club/torjus/nixprstatus"
}, },
@@ -204,18 +277,18 @@
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
"nixpkgs": [ "nixpkgs": [
"nixprstatus", "huecli",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3", "systems": "systems_3",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1731205797, "lastModified": 1724208502,
"narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", "narHash": "sha256-TCRcEPSfgAw/t7kClmlr23s591N06mQCrhzlAO7cyFw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "poetry2nix",
"rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", "rev": "884b66152b0c625b8220b570a31dc7acc36749a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -224,53 +297,28 @@
"type": "github" "type": "github"
} }
}, },
"pyproject-build-systems": { "poetry2nix_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4",
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": [ "nixpkgs": [
"huecli", "nixprstatus",
"nixpkgs" "nixpkgs"
], ],
"pyproject-nix": [ "systems": "systems_6",
"huecli", "treefmt-nix": "treefmt-nix_2"
"pyproject-nix"
],
"uv2nix": [
"huecli",
"uv2nix"
]
}, },
"locked": { "locked": {
"lastModified": 1732506638, "lastModified": 1729073785,
"narHash": "sha256-aIjGCa8Lvhb8QnbHPOtkZ6yTrb8KURRlYzlo7UaBeac=", "narHash": "sha256-KaDC7emuamQblDdka+gkBUUdEjQf3YGYozMb+zomgSM=",
"owner": "pyproject-nix", "owner": "nix-community",
"repo": "build-system-pkgs", "repo": "poetry2nix",
"rev": "70c271e7a64199c71c9dbcbe513c7b2402573789", "rev": "795fddefc9f910671c1cf0752c29802ce27322d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "pyproject-nix", "owner": "nix-community",
"repo": "build-system-pkgs", "repo": "poetry2nix",
"type": "github"
}
},
"pyproject-nix": {
"inputs": {
"nixpkgs": [
"huecli",
"nixpkgs"
]
},
"locked": {
"lastModified": 1732502826,
"narHash": "sha256-tgInDnNOGd5haarL7i94TZ/TqOR1UHvYliw+Db0lk6U=",
"owner": "pyproject-nix",
"repo": "pyproject.nix",
"rev": "fb87b3bad09fbd71b448e2f71f0337087430dbc7",
"type": "github"
},
"original": {
"owner": "pyproject-nix",
"repo": "pyproject.nix",
"type": "github" "type": "github"
} }
}, },
@@ -281,6 +329,7 @@
"huecli": "huecli", "huecli": "huecli",
"nix-packages": "nix-packages", "nix-packages": "nix-packages",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-small": "nixpkgs-small",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixprstatus": "nixprstatus", "nixprstatus": "nixprstatus",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@@ -293,11 +342,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733128155, "lastModified": 1731954233,
"narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -350,20 +399,64 @@
"type": "indirect" "type": "indirect"
} }
}, },
"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"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixprstatus", "huecli",
"poetry2nix", "poetry2nix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1730120726, "lastModified": 1719749022,
"narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -372,28 +465,25 @@
"type": "github" "type": "github"
} }
}, },
"uv2nix": { "treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"huecli", "nixprstatus",
"poetry2nix",
"nixpkgs" "nixpkgs"
],
"pyproject-nix": [
"huecli",
"pyproject-nix"
] ]
}, },
"locked": { "locked": {
"lastModified": 1732759365, "lastModified": 1727984844,
"narHash": "sha256-kOOlzfAsFpfiLltRbqFysVhT86erXVe4TZCNIq5zv0o=", "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"owner": "pyproject-nix", "owner": "numtide",
"repo": "uv2nix", "repo": "treefmt-nix",
"rev": "f932943b62a0b4fade224f18df13558f8015dd99", "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "pyproject-nix", "owner": "numtide",
"repo": "uv2nix", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
} }

View File

@@ -5,6 +5,7 @@
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-24.11";
#nixpkgs-master.url = "github:nixos/nixpkgs?ref=master"; #nixpkgs-master.url = "github:nixos/nixpkgs?ref=master";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-small.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -38,6 +39,7 @@
nixpkgs, nixpkgs,
# nixpkgs-master, # nixpkgs-master,
nixpkgs-stable, nixpkgs-stable,
nixpkgs-small,
nixprstatus, nixprstatus,
sops-nix, sops-nix,
ghettoptt, ghettoptt,
@@ -54,6 +56,17 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
overlay-pyside6 =
final: prev:
let
small = import nixpkgs-small {
inherit system;
config.allowUnfree = true;
};
in
{
python312Packages = small.lib.warn "Using python312Packages from nixos-unstable-small #" small.python312Packages;
};
# overlay-master = final: prev: { # overlay-master = final: prev: {
# master = import nixpkgs-master { # master = import nixpkgs-master {
# inherit system; # inherit system;
@@ -71,6 +84,7 @@
commonOverlays = [ commonOverlays = [
overlay-stable overlay-stable
# overlay-master # overlay-master
overlay-pyside6
ghettoptt.overlays.default ghettoptt.overlays.default
huecli.overlays.default huecli.overlays.default
nix-packages.overlays.default nix-packages.overlays.default

View File

@@ -1,14 +1,21 @@
{ {
inputs,
pkgs, pkgs,
lib, lib,
config, config,
... ...
}: }:
{ {
imports = [
./hyprlock.nix
./hypridle.nix
];
options.hyprland.enable = lib.mkEnableOption "Hyprland"; options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = { config = {
home.packages = with pkgs; [ home.packages = with pkgs; [
dunst dunst
# hyprlock
hyprpaper
rofi-wayland rofi-wayland
slurp slurp
swww swww
@@ -21,130 +28,6 @@
libsForQt5.qt5ct libsForQt5.qt5ct
]; ];
services.hyprpaper = {
enable = true;
settings = {
splash = false;
};
};
services.hypridle = {
enable = true;
settings = {
general = {
lock_cmd = "hyprlock";
before_sleep_cmd = "lockhelper";
ignore_dbus_inhibit = false;
};
listener = {
timeout = 240;
on-timeout = "lockhelper";
};
};
};
programs.hyprlock = {
enable = true;
settings = {
background = [
{
monitor = "DP-5";
path = "/tmp/lockscreen/DP-5.png";
blur_passes = 3;
contrast = 0.8916;
brightness = 0.8172;
vibrancy = 0.1696;
vibrancy_darkness = 0.0;
}
{
monitor = "DP-6";
path = "/tmp/lockscreen/DP-6.png";
blur_passes = 3;
contrast = 0.8916;
brightness = 0.8172;
vibrancy = 0.1696;
vibrancy_darkness = 0.0;
}
{
monitor = "DP-7";
path = "/tmp/lockscreen/DP-7.png";
blur_passes = 3;
contrast = 0.8916;
brightness = 0.8172;
vibrancy = 0.1696;
vibrancy_darkness = 0.0;
}
{
monitor = "DP-8";
path = "/tmp/lockscreen/DP-8.png";
blur_passes = 3;
contrast = 0.8916;
brightness = 0.8172;
vibrancy = 0.1696;
vibrancy_darkness = 0.0;
}
];
general = {
no_fade_in = false;
grace = 0;
disable_loading_bar = true;
};
input-field = [
{
size = "250, 60";
outline_thickness = 2;
dots_size = 0.2;
dots_spacing = 0.2;
dots_center = true;
outer_color = "rgba(0, 0, 0, 0)";
inner_color = "rgba(0, 0, 0, 0.5)";
font_color = "rgb(200, 200, 200)";
fade_on_empty = false;
font_family = "JetBrains Mono Nerd Font Mono";
placeholder_text = "<i><span foreground=\"##cdd6f4\">Input Password...</span></i>";
hide_input = false;
position = "0, -120";
halign = "center";
valign = "center";
}
];
label = [
{
text = "cmd[update:2000] echo \"$(date +\"%b %d %H:%M\")\"";
color = "rgba(255, 255, 255, 0.6)";
font_size = 120;
font_family = "JetBrains Mono Nerd Font Mono ExtraBold";
position = "0, -300";
halign = "center";
valign = "top";
}
];
};
};
# streamcontroller service
systemd.user.services = {
streamcontroller = {
Unit = {
Description = "Streamcontroller service";
PartOf = [ "graphical-session.target" ];
After = [ "graphical-session.target" ];
Requisite = [ "graphical-session.target" ];
};
Service = {
ExecStart = "${pkgs.streamcontroller}/bin/streamcontroller -b";
Restart = "on-failure";
};
Install = {
WantedBy = [ "graphical-session.target" ];
};
};
};
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = pkgs.hyprland; package = pkgs.hyprland;
@@ -188,11 +71,9 @@
decoration = { decoration = {
rounding = 10; rounding = 10;
# shadow = { drop_shadow = true;
# enable = true; shadow_range = 4;
# range = 4; shadow_render_power = 3;
# render_power = 3;
# };
blur = { blur = {
enabled = true; enabled = true;
size = 3; size = 3;
@@ -337,10 +218,10 @@
exec-once = [ exec-once = [
"waybar" "waybar"
# "hyprpaper & sleep 10 && randomwp" "hyprpaper & sleep 10 && randomwp"
# "easyeffects --gapplication-service" "easyeffects --gapplication-service"
# "hypridle" "hypridle"
# "streamcontroller -b" "streamcontroller -b"
# "dunst" # "dunst"
]; ];
}; };

View File

@@ -6,7 +6,6 @@ from datetime import datetime, date, timedelta
SECRET_DIR = "/home/torjus/.config/sops-nix/secrets" SECRET_DIR = "/home/torjus/.config/sops-nix/secrets"
def sonarr_url(): def sonarr_url():
xdg_dir = os.environ["XDG_RUNTIME_DIR"] xdg_dir = os.environ["XDG_RUNTIME_DIR"]
if not xdg_dir: if not xdg_dir:
@@ -14,31 +13,26 @@ def sonarr_url():
with open(f"{SECRET_DIR}/sonarr_base_url") as f: with open(f"{SECRET_DIR}/sonarr_base_url") as f:
return f.read().strip() return f.read().strip()
def radarr_url(): def radarr_url():
with open(f"{SECRET_DIR}/radarr_base_url") as f: with open(f"{SECRET_DIR}/radarr_base_url") as f:
return f.read().strip() return f.read().strip()
def make_header(api_key: str): def make_header(api_key: str):
return {"X-Api-Key": api_key, "Accept": "application/json"} return {"X-Api-Key": api_key, "Accept": "application/json"}
def get_sonarr_key(): def get_sonarr_key():
with open(f"{SECRET_DIR}/sonarr_api_key") as f: with open(f"{SECRET_DIR}/sonarr_api_key") as f:
return f.read().strip() return f.read().strip()
def get_radarr_key(): def get_radarr_key():
with open(f"{SECRET_DIR}/radarr_api_key") as f: with open(f"{SECRET_DIR}/radarr_api_key") as f:
return f.read().strip() return f.read().strip()
def get_sonarr_history(since: datetime|None=None):
def get_sonarr_history(since: datetime | None = None):
api_key = get_sonarr_key() api_key = get_sonarr_key()
if not since: if not since:
since = datetime.combine(date.today() - timedelta(days=1), datetime.min.time()) since = datetime.combine(date.today()-timedelta(days=1),datetime.min.time())
url = f"{sonarr_url()}/api/v3/history/since" url = f"{sonarr_url()}/api/history/since"
url += f"?date={since.isoformat()}" url += f"?date={since.isoformat()}"
response = requests.get(url, headers=make_header(api_key)) response = requests.get(url, headers=make_header(api_key))
response.raise_for_status() response.raise_for_status()
@@ -50,11 +44,10 @@ def get_sonarr_history(since: datetime | None = None):
items.append(item["sourceTitle"]) items.append(item["sourceTitle"])
return items return items
def get_radarr_history(since: datetime|None=None):
def get_radarr_history(since: datetime | None = None):
api_key = get_radarr_key() api_key = get_radarr_key()
if not since: if not since:
since = datetime.combine(date.today() - timedelta(days=7), datetime.min.time()) since = datetime.combine(date.today()-timedelta(days=7),datetime.min.time())
url = f"{radarr_url()}/api/v3/history/since" url = f"{radarr_url()}/api/v3/history/since"
url += f"?date={since.isoformat()}" url += f"?date={since.isoformat()}"
response = requests.get(url, headers=make_header(api_key)) response = requests.get(url, headers=make_header(api_key))
@@ -67,17 +60,12 @@ def get_radarr_history(since: datetime | None = None):
items.append(item["sourceTitle"]) items.append(item["sourceTitle"])
return items return items
if __name__ == "__main__": if __name__ == "__main__":
sonarr_items = get_sonarr_history() sonarr_items = get_sonarr_history()
radarr_items = get_radarr_history() radarr_items = get_radarr_history()
output = { output = {
"text": f"Son: {len(sonarr_items)}|Rad: {len(radarr_items)}", "text": f"Son: {len(sonarr_items)}|Rad: {len(radarr_items)}",
"tooltip": "Radarr: \n" "tooltip": "Radarr: \n" + "\n".join(radarr_items) + "\n" + "Sonarr: \n" + "\n".join(sonarr_items)
+ "\n".join(radarr_items)
+ "\n"
+ "Sonarr: \n"
+ "\n".join(sonarr_items),
} }
print(json.dumps(output)) print(json.dumps(output))

View File

@@ -45,7 +45,6 @@ in
ripgrep ripgrep
sops sops
sshfs sshfs
step-cli
tea tea
tldr tldr
tokei tokei

View File

@@ -1,17 +1,16 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
# let let
# version = "6.2.6.2503"; version = "6.2.6.2503";
# zoom-override = pkgs.zoom-us.overrideAttrs (old: { zoom-override = pkgs.zoom-us.overrideAttrs (old: {
# inherit version; inherit version;
# src = pkgs.fetchurl { src = pkgs.fetchurl {
# url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
# hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc="; hash = "sha256-qhymegXkXSl9fK/5klSi5uRPwFVN88QH/5EVGaBUbfc=";
# }; };
# }); });
# in in
{ {
home.packages = [ home.packages = [
pkgs.zoom-us (lib.warn "Using overridden zoom version" zoom-override)
#(lib.warn "Using overridden zoom version" zoom-override)
]; ];
} }

View File

@@ -26,6 +26,11 @@ if [ -z "$wallpaper_path" ]; then
exit 1 exit 1
fi fi
if ! command -v hyprpaper &> /dev/null; then
echo "Could not find hyprpaper command"
exit 1
fi
echo "setting $wallpaper_path as wallpaper" echo "setting $wallpaper_path as wallpaper"
hyprctl hyprpaper unload all hyprctl hyprpaper unload all
hyprctl hyprpaper preload "$wallpaper_path" hyprctl hyprpaper preload "$wallpaper_path"

View File

@@ -25,8 +25,8 @@
boot = { boot = {
# Kernel stuff # Kernel stuff
# kernelPackages = pkgs.linuxPackages_xanmod_latest; # kernelPackages = pkgs.linuxPackages_xanmod_latest;
# kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = lib.warn "Pinned to kernel 6.11 due to nvidia trouble!" pkgs.linuxPackages_6_11; # kernelPackages = lib.warn "Pinned to kernel 6.10 due to nvidia fbdev trouble!" pkgs.linuxPackages_6_10;
kernelParams = [ kernelParams = [
"quiet" "quiet"
"splash" "splash"
@@ -76,7 +76,7 @@
open = true; open = true;
nvidiaSettings = false; nvidiaSettings = false;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.latest;
# package = config.boot.kernelPackages.nvidiaPackages.mkDriver { # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
# version = "560.28.03"; # version = "560.28.03";
# sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y="; # sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";

View File

@@ -1,7 +1,6 @@
{ {
imports = [ imports = [
./fonts.nix ./fonts.nix
./root-ca.nix
./fwupd.nix ./fwupd.nix
./git.nix ./git.nix
./greetd.nix ./greetd.nix

View File

@@ -5,10 +5,14 @@
fira-code fira-code
fira-code-symbols fira-code-symbols
font-awesome font-awesome
nerd-fonts.jetbrains-mono (nerdfonts.override {
nerd-fonts.fira-code fonts = [
nerd-fonts.droid-sans-mono "JetBrainsMono"
nerd-fonts.dejavu-sans-mono "FiraCode"
"DroidSansMono"
"DejaVuSansMono"
];
})
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji

View File

@@ -1,12 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIBxDCCAWmgAwIBAgIQQCSzuOLIKLj1dGbC+NFttjAKBggqhkjOPQQDAjBAMRow
GAYDVQQKExFob21lLjJyanVzLm5ldCBDQTEiMCAGA1UEAxMZaG9tZS4ycmp1cy5u
ZXQgQ0EgUm9vdCBDQTAeFw0yNDEwMjEwOTEyNDRaFw0zNDEwMTkwOTEyNDRaMEAx
GjAYBgNVBAoTEWhvbWUuMnJqdXMubmV0IENBMSIwIAYDVQQDExlob21lLjJyanVz
Lm5ldCBDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEGDE4ss9y
9msphQ/Sa/tAoEaGoDHQcg5oRcxWL5SZYjUPNl+zbRZzqkvCz2S1XrHJPiPWbyJX
cZAlPxbwZrWDyKNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8C
AQEwHQYDVR0OBBYEFPZx6AahX5diBMChZbv5N4dh+vCTMAoGCCqGSM49BAMCA0kA
MEYCIQC6yqMM9/s1Dct5jlq0NAGsDA68hVTDcO3RP61lxQlfBwIhAL1jlmIwaSJc
TjdIMjPQ3ombBRqDJBDvDr8o6oOUjret
-----END CERTIFICATE-----

View File

@@ -1,9 +0,0 @@
{ pkgs, ... }:
{
security.pki = {
certificateFiles = [
"${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
./root-ca.crt
];
};
}