torjus/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Compare commits

base: torjus:65c166c4afb489bb45ac3aec9c8e41cd2137b4b5
Branches Tags
torjus:master
torjus:temp-small
..
compare: torjus:a5c3c13c34d462f4d19b4082b2deaf8c2f164ade
Branches Tags
torjus:master
torjus:temp-small

No commits in common. "65c166c4afb489bb45ac3aec9c8e41cd2137b4b5" and "a5c3c13c34d462f4d19b4082b2deaf8c2f164ade" have entirely different histories.
65c166c4af ... a5c3c13c34

11 changed files with 93 additions and 97 deletions
Show Stats Expand all files Collapse all files

45
flake.lock generated
View File

@ -26,15 +26,16 @@
]
},
"locked": {
"lastModified": 1716736760,
"narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=",
"lastModified": 1716729592,
"narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239",
"rev": "2c78a57c544dd19b07442350727ced097e1aa6e6",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
@ -56,22 +57,6 @@
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1716633019,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1716655032,
"narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=",
@ -87,7 +72,7 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1716509168,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
@ -103,6 +88,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716633019,
"narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1713248628,
@ -159,7 +160,7 @@
"ghettoptt": "ghettoptt",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"notlistener": "notlistener",
"sops-nix": "sops-nix"
}
@ -167,7 +168,7 @@
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1716692524,

16
flake.nix
View File

@ -3,10 +3,10 @@
inputs = {
# nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager?ref=release-23.11";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix.url = "github:Mic92/sops-nix";
@ -17,7 +17,7 @@
outputs =
{ self
, nixpkgs
, nixpkgs-stable
, nixpkgs-unstable
, sops-nix
, notlistener
, ghettoptt
@ -26,8 +26,8 @@
let
system = "x86_64-linux";
user = "torjus";
overlay-stable = final: prev: {
stable = import nixpkgs-stable {
overlay-unstable = final: prev: {
unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
@ -46,7 +46,7 @@
modules = [
({ config, pkgs, ... }: {
nixpkgs.overlays = [
overlay-stable
overlay-unstable
ghettoptt.overlays.default
];
})
@ -60,7 +60,7 @@
modules = [
({ config, pkgs, ... }: {
nixpkgs.overlays = [
overlay-stable
overlay-unstable
notlistener.overlays.default
ghettoptt.overlays.default
];

2
home/hyprland/hypridle.nix
View File

@ -1,7 +1,7 @@
{ config, osConfig, pkgs, ... }: {
home.packages = with pkgs; [
hypridle
unstable.hypridle
];
xdg.configFile = {
"hypr/hypridle.conf" = {

2
home/hyprland/hyprland_gunter.nix
View File

@ -24,7 +24,7 @@
wayland.windowManager.hyprland = {
enable = true;
package = pkgs.hyprland;
package = pkgs.unstable.hyprland;
settings = {
"$mainMod" = "SUPER";
"$shiftMainMod" = "SUPER_SHIFT";

2
home/hyprland/hyprlock.nix
View File

@ -1,7 +1,7 @@
{ config, osConfig, pkgs, ... }: {
home.packages = with pkgs; [
hyprlock
unstable.hyprlock
];
xdg.configFile = {
"hypr/hyprlock.conf" = {

12
home/hyprland/waybar/flakestat.sh
View File

@ -5,16 +5,22 @@ NIXPKGS_DIR="/home/torjus/git/nixpkgs"
flake_metadata=$(nix flake metadata --json "$FLAKE_DIR" 2>/dev/null)
unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
stable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs.nixpkgs')
stable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.locked.rev")
stable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$stable_input.original.ref")
unstable_input=$(echo "$flake_metadata" | jq '.locks.nodes.root.inputs."nixpkgs-unstable"')
unstable_rev=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.locked.rev")
unstable_branch=$(echo "$flake_metadata" | jq -r ".locks.nodes.$unstable_input.original.ref")
cd "$NIXPKGS_DIR" || exit 1
git fetch -q --all
stable_commit_count=$(git rev-list --count "$stable_rev..origin/$stable_branch")
unstable_commit_count=$(git rev-list --count "$unstable_rev..origin/$unstable_branch")
text="$unstable_commit_count"
tooltip="${unstable_branch}: ${unstable_commit_count}"
text="$stable_commit_count|$unstable_commit_count"
tooltip="${stable_branch}: ${stable_commit_count}
${unstable_branch}: ${unstable_commit_count}"
output=$(jq -n \
--arg text "$text" \

42
home/packages/default.nix
View File

@ -12,24 +12,22 @@ in
age
alacritty
bat
# btop
(btop.override {
cudaSupport = withCuda;
})
unstable.btop
# (unstable.btop.override {
# cudaSupport = true;
# })
bzip2
croc
distrobox
dust
unstable.dust
easyeffects
eza
fd
ffmpeg
file
fzf
unstable.fzf
go-task
glib
jq
ijq
kitty
kubectl
krita
@ -41,7 +39,7 @@ in
pamixer
pinentry
pre-commit
(prismlauncher.override {
(unstable.prismlauncher.override {
withWaylandGLFW = true;
})
pulseaudio
@ -54,19 +52,19 @@ in
spotify
spicetify-cli
sshfs
tldr
devenv
ventoy
unstable.tldr
unstable.devenv
unstable.ventoy
discord
zoxide
# k8s tools
talosctl
k9s
cilium-cli
kubernetes-helm
cmctl
krew
unstable.talosctl
unstable.k9s
unstable.cilium-cli
unstable.kubernetes-helm
unstable.cmctl
unstable.krew
# steam
# steam-run
@ -75,8 +73,8 @@ in
tokei
unzip
yt-dlp
zoom-us
vmware-horizon-client
unstable.zoom-us
unstable.vmware-horizon-client
# Editors
# vscode
@ -92,7 +90,7 @@ in
typescript
# Py stuff
(python312.withPackages (p: with p; [
(unstable.python312.withPackages (p: with p; [
requests
ipython
]))
@ -105,7 +103,7 @@ in
rust-analyzer
# blender
(blender.override {
(unstable.blender.override {
cudaSupport = withCuda;
})

40
home/programs/obs-studio/default.nix
View File

@ -1,31 +1,25 @@
{ pkgs, lib, osConfig, ... }:
let
withCuda = if (osConfig.system.name == "gunter") then true else false;
onnxruntime-gpu = (pkgs.onnxruntime.override {
cudaSupport = withCuda;
});
obs-backgrounremoval-gpu = ((pkgs.obs-studio-plugins.obs-backgroundremoval.override {
onnxruntime = onnxruntime-gpu;
}).overrideAttrs (old: {
version = "1.1.14-beta";
src = pkgs.fetchFromGitHub {
owner = "occ-ai";
repo = "obs-backgroundremoval";
rev = "94be8c35fe077be93a6f5ef347a802295a36dddd";
hash = "sha256-qnxDNeTWQYiRMqT6jNp8GC8ef6aaAAY+OXAak54dVc8=";
};
cmakeFlags =
if withCuda then
(lib.lists.remove "-DDISABLE_ONNXRUNTIME_GPU=ON" old.cmakeFlags)
else old.cmakeFlags;
}));
in
{ pkgs, ... }:
# let
# obs-backgroundremoval_1_1_10 = (pkgs.obs-studio-plugins.obs-backgroundremoval.overrideAttrs {
# version = "1.1.10";
# src = pkgs.fetchFromGitHub {
# owner = "occ-ai";
# repo = "obs-backgroundremoval";
# rev = "1.1.10";
# hash = "sha256-6OTtmjXS3fiorEPUSjjqrS8u9fVJnnZZoD722W3JQO8=";
# };
# }).override {
# onnxruntime = pkgs.unstable.onnxruntime;
# };
# in
{
programs.obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-backgroundremoval
obs-pipewire-audio-capture
obs-shaderfilter
] ++ [ obs-backgrounremoval-gpu ];
];
#plugins = [ obs-backgroundremoval_1_1_10 ];
};
}

4
home/zsh/default.nix
View File

@ -3,10 +3,10 @@
programs.direnv = {
enable = true;
enableZshIntegration = true;
package = pkgs.direnv;
package = pkgs.unstable.direnv;
nix-direnv = {
enable = true;
package = pkgs.nix-direnv;
package = pkgs.unstable.nix-direnv;
};
};
programs.zsh = {

22
hosts/gunter/configuration.nix
View File

@ -15,7 +15,7 @@
# Bootloader stuff
boot = {
# Kernel stuff
kernelPackages = pkgs.linuxPackages_xanmod_latest;
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [
"quiet"
"splash"
@ -66,15 +66,15 @@
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
# package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
# version = "555.42.02";
# sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
# sha256_aarch64 = lib.fakeSha256;
# openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
# settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
# persistencedSha256 = lib.fakeSha256;
# };
# package = config.boot.kernelPackages.nvidiaPackages.stable;
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.42.02";
sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
sha256_aarch64 = lib.fakeSha256;
openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
persistencedSha256 = lib.fakeSha256;
};
};
# Setup hyprland
@ -94,7 +94,7 @@
programs.hyprland = {
enable = true;
xwayland.enable = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
portalPackage = pkgs.unstable.xdg-desktop-portal-hyprland;
};
# Setup common XDG env vars

3
system/security.nix
View File

@ -5,9 +5,6 @@
wheelNeedsPassword = false;
};
# Enable polkit
security.polkit.enable = true;
# Enable rtkit
security.rtkit.enable = true;
}