varris
/
nixos-dotfiles
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
Varris 2024-03-01 23:46:54 +01:00
parent 142d1f864b
commit 08aae036b0
14 changed files with 123 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
flake.lock
View File

@ -380,41 +380,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"freetype2": {
"flake": false,
"locked": {
"lastModified": 1675923892,
"narHash": "sha256-dOm8VKYdclTLLkqWMLv7DQI0Qyjit7S4SOCszKEkG3o=",
"owner": "wez",
"repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
"type": "github"
},
"original": {
"owner": "wez",
"repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
"type": "github"
}
},
"grub2-themes": { "grub2-themes": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -467,23 +432,6 @@
"type": "github" "type": "github"
} }
}, },
"harfbuzz": {
"flake": false,
"locked": {
"lastModified": 1677798343,
"narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=",
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc",
"type": "github"
},
"original": {
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc",
"type": "github"
}
},
"helix": { "helix": {
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane_2",
@ -713,23 +661,6 @@
"type": "github" "type": "github"
} }
}, },
"libpng": {
"flake": false,
"locked": {
"lastModified": 1549245649,
"narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
},
"original": {
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
}
},
"mygui-git": { "mygui-git": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -960,8 +891,7 @@
"nix-ld-rs": "nix-ld-rs", "nix-ld-rs": "nix-ld-rs",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur", "nur": "nur",
"openmw-git": "openmw-git", "openmw-git": "openmw-git"
"wezterm": "wezterm"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -1055,31 +985,6 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_4": {
"inputs": {
"flake-utils": [
"wezterm",
"flake-utils"
],
"nixpkgs": [
"wezterm",
"nixpkgs"
]
},
"locked": {
"lastModified": 1705457855,
"narHash": "sha256-5cCHQtP/PEHK1YNTQyZN9v8ehpLTjc723ZSKAP3Tva8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a854609265af0e9f48c92e497679edf8fab9e690",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
@ -1170,50 +1075,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"wezterm": {
"inputs": {
"flake-utils": "flake-utils_5",
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_4",
"zlib": "zlib"
},
"locked": {
"dir": "nix",
"lastModified": 1705510373,
"narHash": "sha256-DAcXL/XQGDwCFNR+tAKs+wRGQkz1vs7JrUasbOnDa1k=",
"owner": "happenslol",
"repo": "wezterm",
"rev": "77201b2f5966c369d4109063c434b708725f8291",
"type": "github"
},
"original": {
"dir": "nix",
"owner": "happenslol",
"ref": "add-nix-flake",
"repo": "wezterm",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1289,23 +1150,6 @@
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz" "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz"
} }
},
"zlib": {
"flake": false,
"locked": {
"lastModified": 1484501380,
"narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
},
"original": {
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

20
flake.nix
View File

@ -17,6 +17,7 @@
}; };
eww-systray = { eww-systray = {
# url = "github:ralismark/eww/5b507c813c79be42b174f477b7acd2c95d58f09f";
url = "github:ralismark/eww/tray-3"; url = "github:ralismark/eww/tray-3";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -36,20 +37,29 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprlock = {
url = "github:hyprwm/hyprlock";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database = { nix-index-database = {
url = "github:Mic92/nix-index-database"; url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur = { nix-flatpak = {
url = "github:nix-community/NUR"; url = "github:gmodena/nix-flatpak";
}; };
wezterm = { nix-ld-rs = {
url = "github:happenslol/wezterm/add-nix-flake?dir=nix"; url = "github:nix-community/nix-ld-rs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur = {
url = "github:nix-community/NUR";
};
#--- non-flakes #--- non-flakes
fish-plugin-bobthefish = { fish-plugin-bobthefish = {
@ -142,7 +152,9 @@
}; };
modules = [ modules = [
./user/home.nix ./user/home.nix
inputs.hyprlock.homeManagerModules.hyprlock
inputs.nix-index-database.hmModules.nix-index inputs.nix-index-database.hmModules.nix-index
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.nur.hmModules.nur inputs.nur.hmModules.nur
]; ];
}; };

14
system/configuration.nix
View File

@ -40,14 +40,15 @@
loader = { loader = {
efi = { efi = {
efiSysMountPoint = "/boot"; efiSysMountPoint = "/boot/efi";
canTouchEfiVariables = true; canTouchEfiVariables = true;
}; };
systemd-boot = { grub = {
enable = true; enable = true;
consoleMode = "auto"; efiSupport = true;
}; device = "nodev";
};
timeout = 0; timeout = 0;
}; };
@ -63,6 +64,7 @@
192.168.0.18 steam.deck 192.168.0.18 steam.deck
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com 127.0.0.1 modules-cdn.eac-prod.on.epicgames.com
''; '';
nameservers = ["94.16.114.254" "94.247.43.254"]; #OpenNIC
}; };
# Set your time zone. # Set your time zone.
@ -208,5 +210,5 @@
}; };
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.05";
} }

18
system/hardware-configuration.nix
View File

@ -18,22 +18,24 @@
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/7009c691-ca34-4106-b959-0d625aefb30b"; device = "/dev/disk/by-uuid/d580b740-a571-4e34-820f-6a641bc0dd65";
fsType = "xfs"; fsType = "btrfs";
options = ["compress=zstd" "discard=async"];
}; };
fileSystems."/boot" = { fileSystems."/boot/efi" = {
device = "/dev/disk/by-uuid/3A8C-A960"; device = "/dev/disk/by-uuid/3A8C-A960";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/hdd" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/ecbbfb05-ada8-4044-81a6-9a280f93802f"; device = "/dev/disk/by-uuid/1e5d64ef-acc9-45cd-b9b6-8706cfac04b8";
fsType = "xfs"; fsType = "btrfs";
options = ["compress=zstd" "discard=async"];
}; };
fileSystems."/home" = { fileSystems."/mnt/hdd" = {
device = "/dev/disk/by-uuid/9d1be271-ca41-43cc-a334-016103bfde1a"; device = "/dev/disk/by-uuid/ecbbfb05-ada8-4044-81a6-9a280f93802f";
fsType = "xfs"; fsType = "xfs";
}; };

2
system/hardware/default.nix
View File

@ -4,7 +4,7 @@
extraPackages = [pkgs.libvdpau-va-gl]; extraPackages = [pkgs.libvdpau-va-gl];
driSupport32Bit = true; driSupport32Bit = true;
}; };
chaotic.mesa-git.enable = true; # chaotic.mesa-git.enable = true;
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;

6
system/programs/default.nix
View File

@ -1,4 +1,8 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [
./nix-ld
];
programs = { programs = {
adb.enable = true; adb.enable = true;
ccache = { ccache = {
@ -12,5 +16,5 @@
ssh.startAgent = true; ssh.startAgent = true;
steam.enable = true; steam.enable = true;
}; };
chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda]; chaotic.steam.extraCompatPackages = with pkgs; [luxtorpeda proton-ge-custom];
} }

22
system/programs/nix-ld/default.nix Normal file
View File

@ -0,0 +1,22 @@
{
config,
pkgs,
inputs,
...
}: {
programs.nix-ld = {
enable = true;
package = inputs.nix-ld-rs.packages.${pkgs.system}.nix-ld-rs;
libraries = with pkgs; [
stdenv.cc.cc
fuse
libpulseaudio
vulkan-loader
mesa
libGL
curl
zlib
libpulseaudio
];
};
}

25
user/configs/kitty/default.nix Normal file
View File

@ -0,0 +1,25 @@
{
config,
pkgs,
inputs,
...
}: {
programs.kitty = {
enable = true;
font = {
name = "JetBrainsMono Nerd Font";
size = 10;
};
shellIntegration.enableFishIntegration = true;
theme = "Gruvbox Dark";
settings = {
background_opacity = "0.9";
modify_font = "cell_height 2px";
shell_integration = "no-cursor";
tab_bar_style = "powerline";
window_padding_width = "14";
};
};
}

2
user/configs/rofi/default.nix
View File

@ -2,7 +2,7 @@
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
terminal = "wezterm"; terminal = "kitty";
extraConfig = { extraConfig = {
modi = "drun,run"; modi = "drun,run";
}; };

20
user/configs/wayland/eww/config/eww.yuck
View File

@ -41,7 +41,7 @@
:halign "end" :halign "end"
:space-evenly false :space-evenly false
(widget_systray :monitor monitor) ; (widget_systray :monitor monitor)
(widget_time :monitor monitor) (widget_time :monitor monitor)
) )
) )
@ -78,15 +78,15 @@
) )
) )
(defwidget widget_systray [monitor] ; (defwidget widget_systray [monitor]
(box ; (box
:class "widget-systray" ; :class "widget-systray"
(systray ; (systray
:pack-direction "rtl" ; :pack-direction "rtl"
:icon-size 26 ; :icon-size 26
) ; )
) ; )
) ; )
(defwidget widget_time [monitor] (defwidget widget_time [monitor]
(box (box

2
user/configs/wayland/eww/default.nix
View File

@ -5,7 +5,7 @@
}: { }: {
programs.eww = { programs.eww = {
enable = true; enable = true;
package = inputs.eww-systray.packages.${pkgs.system}.eww-wayland; # package = inputs.eww-systray.packages.${pkgs.system}.eww-wayland;
configDir = ./config; configDir = ./config;
}; };

4
user/configs/wayland/hyprland/settings.nix
View File

@ -142,7 +142,7 @@
"${modKey}, Q, exec, ${pkgs.firefox}/bin/firefox" "${modKey}, Q, exec, ${pkgs.firefox}/bin/firefox"
"${modKey}, Return, exec, wezterm" "${modKey}, Return, exec, kitty"
", XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5 --get-volume" ", XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 5 --get-volume"
", XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5 --get-volume" ", XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 5 --get-volume"
@ -174,7 +174,7 @@
windowrulev2 = [ windowrulev2 = [
"fullscreen, class:^(hl2_linux)$" "fullscreen, class:^(hl2_linux)$"
"float, class:^(org.kde.dolphin)$" "float, class:^(org.kde.dolphin)$"
"nomaximizerequest, class:.*" # "nomaximizerequest, class:.*"
]; ];
}; };
}; };

43
user/configs/wezterm/default.nix
View File

@ -1,43 +0,0 @@
{
config,
pkgs,
inputs,
...
}: {
programs.wezterm = {
enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default;
extraConfig =
/*
lua
*/
''
local wezterm = require("wezterm")
local config = {}
if wezterm.config_builder then
config = wezterm.config_builder()
end
config = {
font = wezterm.font "JetBrainsMono Nerd Font",
font_size = 10,
color_scheme = "Gruvbox Dark (Gogh)",
hide_tab_bar_if_only_one_tab = true,
line_height = 1.1,
window_background_opacity = 0.9,
window_close_confirmation = "NeverPrompt",
window_padding = {
left = "20",
right = "20",
top = "20",
bottom = "20",
},
}
return config
'';
};
}

24
user/home.nix
View File

@ -13,7 +13,7 @@
./configs/dircolors.nix ./configs/dircolors.nix
./configs/firefox ./configs/firefox
./configs/fish ./configs/fish
./configs/wezterm ./configs/kitty
./configs/kvantum ./configs/kvantum
./configs/lf ./configs/lf
./configs/mpd ./configs/mpd
@ -28,6 +28,7 @@
home.username = "${userName}"; home.username = "${userName}";
home.homeDirectory = "/home/${userName}"; home.homeDirectory = "/home/${userName}";
home.packages = with pkgs; [ home.packages = with pkgs; [
alacritty
appimage-run appimage-run
armcord armcord
bc bc
@ -44,11 +45,12 @@
gnome.gvfs gnome.gvfs
gnome.seahorse gnome.seahorse
gnome.simple-scan gnome.simple-scan
imv # imv
jq jq
libsForQt5.ark libsForQt5.ark
libsForQt5.dolphin libsForQt5.dolphin
libsForQt5.dolphin-plugins libsForQt5.dolphin-plugins
libnotify
lutris lutris
mangohud mangohud
mesa-demos mesa-demos
@ -99,6 +101,22 @@
enableFishIntegration = true; enableFishIntegration = true;
}; };
services.arrpc = {
enable = true;
};
services.flatpak = {
enable = true;
packages = [
];
update.auto = {
enable = true;
onCalendar = "weekly";
};
};
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
pinentryFlavor = "qt"; pinentryFlavor = "qt";
@ -196,5 +214,5 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
home.stateVersion = "23.11"; home.stateVersion = "23.05";
} }