Compare commits

..

No commits in common. "469b1f78b437e41a7a94fe5737454459f013b712" and "bea3cd2b9ed9ba0710fccbc0c7e39811b373c041" have entirely different histories.

10 changed files with 65 additions and 57 deletions

98
flake.lock generated
View file

@ -71,11 +71,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1775176642, "lastModified": 1764873433,
"narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "179704030c5286c729b5b0522037d1d51341022c", "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1767609335,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,18 +210,20 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.gnome.org",
"lastModified": 1767737596, "lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab"
"type": "github"
} }
}, },
"home-manager": { "home-manager": {
@ -231,11 +233,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776046499, "lastModified": 1774991950,
"narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,11 +429,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1774709303,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +455,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775228139, "lastModified": 1767810917,
"narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,11 +480,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1775892726, "lastModified": 1774852850,
"narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=", "narHash": "sha256-7VK4v7ZbQw5apfgc+FvgRi8BUC45ERlcp8VTTTQ3tko=",
"owner": "NotAShelf", "owner": "NotAShelf",
"repo": "nvf", "repo": "nvf",
"rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436", "rev": "b4d6539e7e9948aaba5efd7a67a63672d1fa80ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -513,11 +515,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775971308, "lastModified": 1774910634,
"narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=", "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4", "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -561,17 +563,18 @@
], ],
"nur": "nur", "nur": "nur",
"systems": "systems_3", "systems": "systems_3",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1775936757, "lastModified": 1774897726,
"narHash": "sha256-KJO/7qoxJ+hlsb3WlFSl6IGrExBIf1GvKdrhOlnGdKY=", "narHash": "sha256-k/H2/oyex6GEC6uYXYetrboFQeTmX1Ouwv/zaW7b/Z0=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "d3e447786b74d62c75f665e17cb3e681c66e90c7", "rev": "9b4a5eb409ceac2dd6ad495c7988e189a418cd30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -625,6 +628,23 @@
"type": "github" "type": "github"
} }
}, },
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -644,11 +664,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772661346, "lastModified": 1767710407,
"narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "13b5b0c299982bb361039601e2d72587d6846294", "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -660,11 +680,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772934010, "lastModified": 1767489635,
"narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -676,11 +696,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1772909925, "lastModified": 1767488740,
"narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -718,11 +738,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775961625, "lastModified": 1775021133,
"narHash": "sha256-8SjilptVv9dSTvn0Z5j65vHHu+flmPXeyrGaSyRJm7U=", "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "0eaab249f5ca1c55921e99cfe07187410758c9fa", "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -35,6 +35,7 @@
valheim-server.inputs.nixpkgs.follows = "nixpkgs"; valheim-server.inputs.nixpkgs.follows = "nixpkgs";
nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
nix-flatpak.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs @ { outputs = inputs @ {

View file

@ -102,10 +102,8 @@ in {
''; '';
# Proprietary </3 # Proprietary </3
mods.unfree.nvidia.enable = true;
mods.unfree.nvidia.driver = "legacy_580";
mods.unfree.steam.enable = true; mods.unfree.steam.enable = true;
mods.unfree.nvidia.enable = true;
mods.unfree.minecraft.enable = true; mods.unfree.minecraft.enable = true;
mods.flatpak.enable = true; mods.flatpak.enable = true;

View file

@ -73,7 +73,6 @@ in {
# SSH: auto-add work key to gpg-agent on first use # SSH: auto-add work key to gpg-agent on first use
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false;
matchBlocks."*" = { matchBlocks."*" = {
identityFile = "~/.ssh/work_ed25519"; identityFile = "~/.ssh/work_ed25519";
addKeysToAgent = "yes"; addKeysToAgent = "yes";

View file

@ -89,7 +89,7 @@ in {
graphics = { graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ libva-vdpau-driver libvdpau-va-gl ]; extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
}; };
nvidia = { nvidia = {
@ -110,10 +110,9 @@ in {
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
}; };
}; };
pulseaudio.support32Bit = true;
}; };
services.pulseaudio.support32Bit = true;
## Mouse ## Mouse
services.libinput.mouse.accelProfile = "flat"; services.libinput.mouse.accelProfile = "flat";

View file

@ -1,7 +1,6 @@
{ {
pkgs, pkgs,
lib, lib,
config,
osConfig, osConfig,
... ...
}: let }: let
@ -20,7 +19,4 @@ in {
mods.hyprland.enable = lib.mkIf cfg.wayland.enable true; mods.hyprland.enable = lib.mkIf cfg.wayland.enable true;
mods.i3.enable = lib.mkIf osConfig.services.xserver.windowManager.i3.enable true; mods.i3.enable = lib.mkIf osConfig.services.xserver.windowManager.i3.enable true;
# Silence stateVersion < 26.05 deprecation warnings by pinning the old defaults.
gtk.gtk4.theme = lib.mkDefault config.gtk.theme;
} }

View file

@ -35,7 +35,6 @@
enable = true; enable = true;
userDirs = { userDirs = {
enable = true; enable = true;
setSessionVariables = true;
documents = "$HOME/documents"; documents = "$HOME/documents";
download = "$HOME/downloads"; download = "$HOME/downloads";
videos = "$HOME/misc/videos"; videos = "$HOME/misc/videos";

View file

@ -8,11 +8,6 @@ in {
config = { config = {
home-manager = { home-manager = {
extraSpecialArgs = { inherit system pkgs inputs sources; }; extraSpecialArgs = { inherit system pkgs inputs sources; };
# When stylix is enabled it injects its own HM module (and followSystem
# copyModules) via homeManagerIntegration.autoImport. Only add it here
# for hosts where stylix is disabled so that stylix options are still
# declared (even if unused) in every home-manager context.
sharedModules = lib.optional (!config.stylix.enable) inputs.stylix.homeModules.stylix;
users."${cfg.user.name}" = { users."${cfg.user.name}" = {
imports = imports =
[ cfg.home.file inputs.self.outputs.homeManagerModules.default ]; [ cfg.home.file inputs.self.outputs.homeManagerModules.default ];

View file

@ -39,6 +39,7 @@ in with lib; {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
openRPCPort = true; openRPCPort = true;
port = arr.torrent.port;
package = pkgs.transmission_4; package = pkgs.transmission_4;
settings = { settings = {
download-dir = "/storage1/download"; download-dir = "/storage1/download";

View file

@ -28,7 +28,7 @@ in {
modules = [ modules = [
homeFile homeFile
inputs.self.outputs.homeManagerModules.default inputs.self.outputs.homeManagerModules.default
inputs.stylix.homeModules.stylix inputs.stylix.homeManagerModules.stylix
({ osConfig, ... }: { ({ osConfig, ... }: {
home.username = username; home.username = username;
home.homeDirectory = "/home/${username}"; home.homeDirectory = "/home/${username}";