Compare commits

..

7 commits

Author SHA1 Message Date
a61e739ec7
Home: fix hyprland keybinds 2024-11-13 21:50:57 +02:00
84d27406ad
stuff 2024-11-13 21:10:09 +02:00
ad5067cf13
Home: hyprland keybinds 2024-11-13 21:09:31 +02:00
1decad1cee
Home: fish 2024-11-13 21:09:11 +02:00
bd8c46cd26
Global: finally figured out how sops works but cloudflared is a bitch 2024-11-13 21:08:46 +02:00
f62fda8150
Flake: more stuff I forgor 2024-11-13 21:07:51 +02:00
4fddc56e19
Epimethus: stuff 2024-11-13 21:07:26 +02:00
10 changed files with 158 additions and 96 deletions

View file

@ -56,11 +56,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1731088327,
"narHash": "sha256-Oizjf0wXBTqALipX4fQdGjq9IBSCXz8wwcfCGRK73bI=",
"lastModified": 1731232837,
"narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
"owner": "catppuccin",
"repo": "nix",
"rev": "7bebd062df3239c005c0d600f5dfd8514f5915f8",
"rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
"type": "github"
},
"original": {
@ -77,11 +77,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1731000594,
"narHash": "sha256-Fl0SrKBg1aH1d/z4hflP54Htdw8P8KHfgXzipUnAVhQ=",
"lastModified": 1731286286,
"narHash": "sha256-7jpkIFzw+dHqtn6/iPHQLnxk6X4RdTwaE03ivRulmaY=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "95b190eebfa073bc748bf52dc874f69a5d22b8ef",
"rev": "363a6f38bc9a634e7431a5623194757b3f8c68a1",
"type": "github"
},
"original": {
@ -98,11 +98,11 @@
]
},
"locked": {
"lastModified": 1731060864,
"narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
"lastModified": 1731274291,
"narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=",
"owner": "nix-community",
"repo": "disko",
"rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
"rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc",
"type": "github"
},
"original": {
@ -273,11 +273,11 @@
]
},
"locked": {
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"lastModified": 1731235328,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github"
},
"original": {
@ -293,11 +293,11 @@
]
},
"locked": {
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"lastModified": 1731235328,
"narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"rev": "60bb110917844d354f3c18e05450606a435d2d10",
"type": "github"
},
"original": {
@ -349,11 +349,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1731086737,
"narHash": "sha256-J/SA5nriNVTzSfjaxBbjUnuRCKOzxnW71yK3fBU5iTs=",
"lastModified": 1731340175,
"narHash": "sha256-qhkP+XRa1AuKkVrxKDLdK4gby363vH6wEie5tb6rz2E=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "3b66351eeb76e802bac37cc892529549efc49905",
"rev": "f5fa84554ffe55e29a397014964238be89ffa54d",
"type": "github"
},
"original": {
@ -428,11 +428,11 @@
]
},
"locked": {
"lastModified": 1730968903,
"narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=",
"lastModified": 1731163338,
"narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9",
"rev": "60d3dece30f98e8ad85131829c8529950630d6bc",
"type": "github"
},
"original": {
@ -475,11 +475,11 @@
]
},
"locked": {
"lastModified": 1730962714,
"narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=",
"lastModified": 1731227601,
"narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "93b525229c99fec0016db72a174f43b9d6237714",
"rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0",
"type": "github"
},
"original": {
@ -546,11 +546,11 @@
"systems": "systems_4"
},
"locked": {
"lastModified": 1731002840,
"narHash": "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=",
"lastModified": 1731152446,
"narHash": "sha256-RVqH/LZYFdjtM5z6n+FzEYhubd2zzXg5pzyEpC8xiyg=",
"owner": "InioX",
"repo": "matugen",
"rev": "ab0a12f826c194003c69ee2e3d700245fb54f875",
"rev": "bc520c597cfc26a683c1e7330958e35b01e6130e",
"type": "github"
},
"original": {
@ -584,11 +584,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@ -664,11 +664,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@ -712,11 +712,11 @@
},
"nur": {
"locked": {
"lastModified": 1731101445,
"narHash": "sha256-xQv6BQamIAcw10i0dytZeQkfgAyNmdU1I3cuebul1ZQ=",
"lastModified": 1731354313,
"narHash": "sha256-AEzoXzAJx09S7ADEaV9dFlPGgYedzua9DjANAC8qAxk=",
"owner": "nix-community",
"repo": "NUR",
"rev": "aa67e54e73d5f45c5f9533065ebe3b1adbc53585",
"rev": "9ed42d53fa81cc19986de870927e2760b37dfc8c",
"type": "github"
},
"original": {
@ -796,11 +796,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1731047660,
"narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=",
"lastModified": 1731213149,
"narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f",
"rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7",
"type": "github"
},
"original": {
@ -817,11 +817,11 @@
]
},
"locked": {
"lastModified": 1731039348,
"narHash": "sha256-dOfJAal/YoibiyFvW8QKGy5w5YGVlJp0to98GPMLcaM=",
"lastModified": 1731298576,
"narHash": "sha256-l2m0LcSohbU7FXhdlJC/jbxt9PEvFfIcdEXQdSzbvL4=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "26b8b1dbcd22c452c1b52828eb0e283b37da2974",
"rev": "c503d1e7521af93013b6253a5f4899ea62a3c5a3",
"type": "github"
},
"original": {
@ -977,11 +977,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1730444716,
"narHash": "sha256-WtqSpYQyG5ad+GK7B0ViDSl0NolHp7yM24TacUslBXE=",
"lastModified": 1731281366,
"narHash": "sha256-GALaKG3LyiYw4EdFxSwJidgLHgaDsTuic5uiJlkpdrc=",
"owner": "ch4og",
"repo": "zen-browser-flake",
"rev": "d3c639ee7bff20f799f443e18fffa6331a71cd3a",
"rev": "d7c020d6b192bfa040a58efaf62be74f9155d1a0",
"type": "github"
},
"original": {

View file

@ -33,6 +33,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
ags = {
url = "github:Aylur/ags";
inputs.nixpkgs.follows = "nixpkgs";
@ -99,7 +104,7 @@
};
epimetheus = nixpkgs.lib.nixosSystem {
modules = [ ./hosts/epimetheus/configuration.nix ];
modules = [ ./hosts/epimetheus/configuration.nix disko.nixosModules.disko ];
};
};
};

View file

@ -1,10 +1,12 @@
{ pkgs, modulesPath, ... }: {
{ pkgs, lib, modulesPath, config, ... }: {
imports = [
"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
];
imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
boot.kernelPackages = pkgs.linuxPackages_6_11;
boot = {
kernelPackages = pkgs.linuxPackages_6_6;
kernelParams = lib.mkAfter [ "noquiet" "toram" ];
enableContainers = false;
};
nixpkgs.hostPlatform = "x86_64-linux";
@ -14,15 +16,46 @@
parted
git
nixd
pciutils
];
documentation = {
enable = lib.mkDefault false;
doc.enable = lib.mkDefault false;
info.enable = lib.mkDefault false;
};
networking = {
networkmanager.enable = true;
wireless.enable = true;
wireless.enable = lib.mkForce false;
};
services = {
logrotate.enable = false;
udisks2.enable = false;
};
programs = {
less.lessopen = null;
command-not-found.enable = false;
};
environment = {
stub-ld.enable = lib.mkForce false;
defaultPackages = [ ];
};
xdg = {
autostart.enable = false;
icons.enable = false;
mime.enable = false;
sounds.enable = false;
};
nix = {
package = pkgs.lix;
nixPath = [ "nixpkgs=${config.nix.registry.nixpkgs.to.path}" ];
channel.enable = false;
settings = {
experimental-features = [ "nix-command" "flakes" "auto-allocate-uids" ];
max-jobs = "auto";
@ -31,7 +64,26 @@
keep-going = true;
warn-dirty = false;
use-xdg-base-directories = true;
substituters = [
"https://nix-community.cachix.org"
"https://nixpkgs-unfree.cachix.org"
"https://hyprland.cachix.org/"
"https://anyrun.cachix.org"
"https://wezterm.cachix.org"
"https://hydra.nixos.org/"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
"hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
];
};
};
hardware.enableRedistributableFirmware = true;
}

View file

@ -7,11 +7,13 @@
interactiveShellInit = ''
function fish_greeting
echo The time is (set_color purple; date +%T; set_color purple)
if test -z $SSH_CLIENT;
fastfetch
else
neofetch
if test -z $DEVSHELL_NIX;
echo The time is (set_color purple; date +%T; set_color purple)
if test -z $SSH_CLIENT;
fastfetch
else
neofetch
end
end
end
'';
@ -56,6 +58,12 @@
};
functions = {
os-age = ''
function os-age
stat / | awk '/Birth: /{print $2 " " substr($3,1,5)}'
end
'';
# Credit for these 3
# https://www.reddit.com/r/linux/comments/1fq0za8/comment/lp1ybdn
disks = ''

View file

@ -1,15 +1,26 @@
{ pkgs, config, inputs, ... }: {
wayland.windowManager.hyprland.settings = {
bindle = [
",XF86AudioMute, exec, playerctl --player=spotify,%any play-pause"
",XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
];
bindm = [ "Super, mouse:272, movewindow" "Super, mouse:273, resizewindow" ];
bindn = [
" , up, pass, JKPS"
bindn = [ " , up, pass, JKPS" ];
binde = [ # Window split ratio
"Super, Semicolon, splitratio, -0.1"
"Super, Apostrophe, splitratio, 0.1"
];
bind = [
"Super, mouse_up, workspace, +1"
"Super, mouse_down, workspace, -1"
"Super, Page_up, workspace, +1"
"Super, Page_down, workspace, +1"
"Super+Shift, S, togglespecialworkspace"
@ -33,7 +44,7 @@
## Hyprland stuff
"Super, Z, movewindow"
# Swap windows
"Super+Shift, left, movewindow, l"
"Super+Shift, right, movewindow, r"

View file

@ -13,7 +13,6 @@
protonup-qt
prismlauncher
osu-lazer-bin
obs-studio
davinci-resolve
nur.repos.reedrw.jkps
];
@ -30,6 +29,14 @@
package = pkgs.alvr;
openFirewall = true;
};
obs-studio = {
enable = true;
plugins = with pkgs.obs-studio-plugins; [
obs-pipewire-audio-capture
obs-vaapi
];
};
};
hardware = {
@ -38,6 +45,14 @@
graphics = {
enable = true;
enable32Bit = true;
extraPackages = with pkgs; [
mesa
egl-wayland
rocmPackages.clr.icd
amdvlk
libva
libva-utils
];
};
};
}

View file

@ -1,28 +0,0 @@
{ lib, config, pkgs, inputs, ... }:
{
imports = [
../../../secrets/secrets.nix
];
services.cloudflared = {
enable = true;
};
users.users.cloudflared = {
group = "cloudflared";
isSystemUser = true;
};
users.groups.cloudflared = { };
systemd.services.my_tunnel = {
wantedBy = [ "multi-user.target" ];
after = [ "network-online.target" "systemd-resolved.service" ];
serviceConfig = {
ExecStart = "${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate run --token=${sops.secrets.cloudflared.nyx.token}";
Restart = "always";
User = "cloudflared";
Group = "cloudflared";
};
};
}

View file

@ -1,7 +1,6 @@
{ ... }:
{
imports = [
# ./cloudflared.nix
./vpn.nix
./pipewire.nix
];

View file

@ -1,5 +1,4 @@
{ inputs, lib, ... }:
{
{ inputs, config, ... }: {
imports = [ inputs.sops-nix.nixosModules.sops ];
sops = {
@ -8,7 +7,7 @@
age.keyFile = "/home/pingu/.config/sops/age/keys.txt";
secrets = {
cloudflared.nyx.token = {};
searx = {};
};
};
}

View file

@ -1,6 +1,7 @@
cloudflared:
nyx:
token: ENC[AES256_GCM,data:WqwknTZwdxjlGbCbbU2S34L8IjX+qVhTbA6NgPcLdEl6bGOlqZSMVCcICiR/X5R5gikz/iJoTJ4T1ECP+clSKuc124VJrCfB9AggB8CXTEgzdCWXyzpP9svcZjmJlkTwc6pHdeM3SgolXS8E05EY535rt4E2mT4xd9PhUfD4CE7Im9ct8aV917iFc68Zg0JhTXsZtxiciDPakHJfe50Ix/GdDSS1d0CJPK9hOop6rB7f9Qwz0lmIKQ==,iv:MySjVlFbj52J0geGlFBL2GAtRZzb0ImtewADTkgtp6w=,tag:hWccRob0R/n8bbNA3PdADg==,type:str]
token: ENC[AES256_GCM,data:UnxScVl7WHLvdiRkcdyaCcIZR04IdIABVni2QY4vf8nfB87L1NP0sswIdKjo8Yt+nSyJKeLDec8iO1R0logISEMnXSTZXnXnTXx73HsPfXN0szzhDeQL1GliqrIUWfGThuL59MDcfTGlP01z2pR55CWOSLyNNYihYCeVstPlNwN5WLDwXRoMFQcciAloWSkK1S7cIotpkTm9nJYz5dEHv8LDTcXaH5LMzblSElMizjFy/1tqyj4kHg==,iv:nHvg9PvnRaDIbVfymz6gzZtXn+y3lG4MpEY3GhJzDyg=,tag:Q1G9DoxeeOlE4ESI7f08sw==,type:str]
searx: ENC[AES256_GCM,data:hiXF//Xz0FEQ8cfaaWTeDWwgqflAFjFd6Mxxj5dQrvLOmWwa5BsAHnPZEhlLtH8r//ZnDZDfpyIx+hvkqOzvuQ==,iv:rIguplTqxLrVikDljLW5wM13+Z4Amn1zTuvUNedI7ck=,tag:RKGmhEo+BYqhhWwxqYgSMA==,type:str]
sops:
kms: []
gcp_kms: []
@ -16,8 +17,8 @@ sops:
dERTMHFTUHBXNkczcVcrb0lTVXdTcDQKcgynRtVEs27vbtstdYj323Jn85U8o5Fd
fxGFj88mpFaipMU9IT9xXjzJhqKOmKqOVVw/M8tD8oEh8Chtj8y3PQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-10-25T12:15:03Z"
mac: ENC[AES256_GCM,data:lZhWh6CUtbCV73Iued+i4HcokDUjFb4NpdG3UH2lzOJ+MigYUX7QiRPavjfI5x7hXm0aNB+kKlZvGyklYJJ7yskYR82MfcWaCsZau0j1y/sIQEGSEK7dPoE39PnttG+m2KbH/ln9Df604NiiB4TUu68x6yhXZK53lGUBF9hk+T4=,iv:GpdU/VY+OZmoWap/s404t6xCug7OXBnqHljljXOE2a4=,tag:Q7lSt+MBANzQa202oIjrMA==,type:str]
lastmodified: "2024-11-12T17:59:51Z"
mac: ENC[AES256_GCM,data:MTFQsm/4srshP8cPD5L2GqXc+1Y8u2IwQH/BS/LVT6buN7iGWhssbZjjDLQ2bmgvYygtzpRwv8F54Fjy0BrcoYL6BET1fi4IG1HcFFk2orV3+A9x6/5NLdfkD9sxW4vZn216jWxqAZGArAN4cd5ELmormHPajO5qdNfCpM2F0mE=,iv:Y6bPgMYeYwfP/4+idlmIpSD7/pJF07AkE5vmqxg1xx8=,tag:rLf+vVAU8vyBIIUjPphijQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.1