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

Compare commits

base: torjus:446b560ad7f613836ebdea03707d2ed4d2698068
Branches Tags
torjus:master
torjus:temp-small
...
compare: torjus:12946ad4d0ae725da328e022de2ac080501eacb9
Branches Tags
torjus:master
torjus:temp-small

3 Commits
446b560ad7 ... 12946ad4d0

Author SHA1 Message Date
Torjus Håkestad
12946ad4d0 Flake update
Some checks failed
pre-commit / pre-commit (push) Failing after 16s
Details
2024-06-03 03:55:53 +02:00
Torjus Håkestad
60ce3ca2b3 Add libvirt 2024-05-31 14:27:33 +02:00
Torjus Håkestad
565ac6ff9f Hyperland/waybar changes 2024-05-31 12:53:58 +02:00
6 changed files with 66 additions and 42 deletions
Show Stats Expand all files Collapse all files

44
flake.lock
View File

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1715020794, "lastModified": 1717379603,
"narHash": "sha256-5MpYI6ujKIJLzkXoaXHgO6SQWyi76rEBAIF24bF98xw=", "narHash": "sha256-f8NEofUM/2fbjsVlBUhq6usC4fjM9EdrsKT7Sw4v2X8=",
"ref": "master", "ref": "master",
"rev": "1dc02bd21b405ab812313ddfbc5b8ae76a1be9ed", "rev": "e3daec2670586a3835f38b4dfef26af84bc58276",
"revCount": 12, "revCount": 14,
"type": "git", "type": "git",
"url": "https://git.t-juice.club/torjus/ghettoptt" "url": "https://git.t-juice.club/torjus/ghettoptt"
}, },
@ -26,11 +26,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717097707, "lastModified": 1717316182,
"narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -41,11 +41,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1714906307, "lastModified": 1716948383,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +57,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1716991068, "lastModified": 1717159533,
"narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -73,11 +73,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1716655032, "lastModified": 1717265169,
"narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,11 +121,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1716651315, "lastModified": 1717112898,
"narHash": "sha256-iMgzIeedMqf30TXZ439zW3Yvng1Xm9QTGO+ZwG1IWSw=", "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c5187508b11177ef4278edf19616f44f21cc8c69", "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,11 +170,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1716692524, "lastModified": 1717297459,
"narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "962797a8d7f15ed7033031731d0bb77244839960", "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075",
"type": "github" "type": "github"
}, },
"original": { "original": {

33
home/hyprland/hyprland_gunter.nix
View File

@ -42,7 +42,7 @@
# "$mon_left,2560x1440@75,0x1080,1" # left # "$mon_left,2560x1440@75,0x1080,1" # left
"DP-8,2560x1440@75,0x1080,1" # left 75hz "DP-8,2560x1440@75,0x1080,1" # left 75hz
# "$mon_center,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd # "$mon_center,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd
"DP-5,2560x1440@120,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz "DP-5,2560x1440@144,2560x1080,1" # main #ASPVEKfgZ8Dd 120hz
# "$mon_right,2560x1440@75,5120x1080,1" # right # "$mon_right,2560x1440@75,5120x1080,1" # right
"DP-7,2560x1440@75,5120x1080,1" # right 75hz "DP-7,2560x1440@75,5120x1080,1" # right 75hz
]; ];
@ -96,7 +96,10 @@
preserve_split = true; preserve_split = true;
}; };
master.new_is_master = true; master.new_is_master = true;
misc.force_default_wallpaper = -1; misc = {
force_default_wallpaper = 0;
disable_hyprland_logo = true;
};
windowrulev2 = [ windowrulev2 = [
"opacity 0.95 override 0.7 override,class:^(Alacritty)$" "opacity 0.95 override 0.7 override,class:^(Alacritty)$"
@ -104,11 +107,13 @@
]; ];
workspace = [ workspace = [
"name:mumble, monitor:$mon_top, persistent:true, default:true" "name:T, monitor:$mon_top, persistent:true, default:true"
"name:left, monitor:$mon_left, persistent:true, default:true" "name:L, monitor:$mon_left, persistent:true, default:true"
"name:right, monitor:$mon_right, persistent:true, default:true" "name:R, monitor:$mon_right, persistent:true, default:true"
"name:main 1, monitor:$mon_center, persistent:true, default:true" "name:c1, monitor:$mon_center, persistent:true, default:true"
"name:main 2, monitor:$mon_center, persistent:true, default:true" "name:c2, monitor:$mon_center, persistent:true, default:true"
"name:c3, monitor:$mon_center, persistent:true, default:true"
"name:c4, monitor:$mon_center, persistent:true, default:true"
]; ];
bindm = [ bindm = [
@ -161,17 +166,21 @@
",code:202,pass,^discord$" ",code:202,pass,^discord$"
# worspace switching # worspace switching
"$mainMod,1,workspace,name:main 1" "$mainMod,1,workspace,name:c1"
"$mainMod,2,workspace,name:main 2" "$mainMod,2,workspace,name:c2"
"$mainMod,3,workspace,3" "$mainMod,3,workspace,name:c3"
"$mainMod,4,workspace,4" "$mainMod,4,workspace,name:c4"
"$mainMod,5,workspace,5" "$mainMod,5,workspace,5"
"$mainMod,6,workspace,6" "$mainMod,6,workspace,6"
# Special workspace
"$mainMod,c,togglespecialworkspace"
"$shiftMainMod,c,movetoworkspace, special"
]; ];
exec-once = [ exec-once = [
"waybar" "waybar"
"hyprpaper & sleep 2 && randomwp" "hyprpaper & sleep 10 && randomwp"
"easyeffects --gapplication-service" "easyeffects --gapplication-service"
"hypridle" "hypridle"
# "dunst" # "dunst"

20
home/hyprland/waybar/default.nix
View File

@ -48,17 +48,18 @@ in
@import "macchiato.css"; @import "macchiato.css";
* { * {
border: none; border: none;
border-radius: 10px;
min-height: 10px;
font-family: "JetbrainsMono Nerd Font"; font-family: "JetbrainsMono Nerd Font";
font-size: 15px; font-size: 15px;
transition-property: background-color; transition-property: background-color;
transition-duration: 0.5s; transition-duration: 0.5s;
color: @text; color: @text;
border-radius: 10px;
min-height: 10px;
} }
window#waybar { window#waybar {
background: transparent; background-color: @surface2;
border-radius: 0px;
} }
window#waybar.hidden { window#waybar.hidden {
@ -69,10 +70,10 @@ in
margin-top: 6px; margin-top: 6px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
border-radius: 10px; border-radius: 0px;
transition: none; transition: none;
color: transparent; color: transparent;
background: transparent; background-color: @surface2;
} }
@keyframes blink_red { @keyframes blink_red {
@ -99,7 +100,7 @@ in
padding-right: 12px; padding-right: 12px;
} }
#workspaces button.active { #workspaces button.active {
background-color: @surface1; background-color: @surface2;
} }
#workspaces button.urgent { #workspaces button.urgent {
color: alpha(@red, 0.4); color: alpha(@red, 0.4);
@ -121,6 +122,11 @@ in
} }
.modules-right { .modules-right {
background-color: @base; background-color: @base;
border-radius: 10px 0px 0px 10px;
}
.modules-left {
background-color: @base;
border-radius: 0px 10px 10px 0px;
} }
#mode, #mode,
#clock, #clock,
@ -162,9 +168,9 @@ in
"pulseaudio#microphone" "pulseaudio#microphone"
"memory" "memory"
"cpu" "cpu"
"tray"
(lib.mkIf (withBattery) "battery") (lib.mkIf (withBattery) "battery")
"clock" "clock"
"tray"
]; ];
"hyprland/workspaces" = { "hyprland/workspaces" = {
"format" = "{name}"; "format" = "{name}";

1
home/packages/default.nix
View File

@ -57,6 +57,7 @@ in
tldr tldr
devenv devenv
ventoy ventoy
virt-manager
discord discord
zoxide zoxide

1
system/default.nix
View File

@ -4,6 +4,7 @@
./fonts.nix ./fonts.nix
./fwupd.nix ./fwupd.nix
./users.nix ./users.nix
./libvirt.nix
./services.nix ./services.nix
./security.nix ./security.nix
./git.nix ./git.nix

9
system/users.nix
View File

@ -12,7 +12,14 @@
home = "/home/torjus"; home = "/home/torjus";
description = "Torjus"; description = "Torjus";
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ "wheel" "input" "networkmanager" "video" "gamemode" ]; extraGroups = [
"wheel"
"input"
"networkmanager"
"video"
"gamemode"
"libvirtd"
];
# Install some user packages # Install some user packages
packages = with pkgs; [ packages = with pkgs; [
]; ];