ugehgrhegh

This commit is contained in:
Mars 2024-12-18 01:12:10 -05:00
parent 00ef021927
commit 18d09c7d7c
Signed by: pupbrained
GPG key ID: 0FF5B8826803F895
18 changed files with 1548 additions and 1317 deletions

View file

@ -1,182 +1,182 @@
{ {
"bang-bang": { "bang-bang": {
"cargoLocks": null, "cargoLocks": null,
"date": "2023-07-23", "date": "2023-07-23",
"extract": null, "extract": null,
"name": "bang-bang", "name": "bang-bang",
"passthru": null, "passthru": null,
"pinned": false, "pinned": false,
"src": { "src": {
"deepClone": false, "deepClone": false,
"fetchSubmodules": false, "fetchSubmodules": false,
"leaveDotGit": false, "leaveDotGit": false,
"name": null, "name": null,
"owner": "oh-my-fish", "owner": "oh-my-fish",
"repo": "plugin-bang-bang", "repo": "plugin-bang-bang",
"rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419", "rev": "ec991b80ba7d4dda7a962167b036efc5c2d79419",
"sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=", "sha256": "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=",
"type": "github" "type": "github"
},
"version": "ec991b80ba7d4dda7a962167b036efc5c2d79419"
}, },
"version": "ec991b80ba7d4dda7a962167b036efc5c2d79419" "fix-window-role": {
}, "cargoLocks": null,
"fix-window-role": { "date": null,
"cargoLocks": null, "extract": null,
"date": null, "name": "fix-window-role",
"extract": null, "passthru": null,
"name": "fix-window-role", "pinned": false,
"passthru": null, "src": {
"pinned": false, "name": null,
"src": { "sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=",
"name": null, "type": "url",
"sha256": "sha256-H4Qj6n5uZsmsbdjjexGZctqhJk3gAXKiSnmnEO/LgTA=", "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch"
"type": "url", },
"url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch" "version": "latest"
}, },
"version": "latest" "git-abbr": {
}, "cargoLocks": null,
"git-abbr": { "date": "2023-06-19",
"cargoLocks": null, "extract": null,
"date": "2023-06-19", "name": "git-abbr",
"extract": null, "passthru": null,
"name": "git-abbr", "pinned": false,
"passthru": null, "src": {
"pinned": false, "deepClone": false,
"src": { "fetchSubmodules": false,
"deepClone": false, "leaveDotGit": false,
"fetchSubmodules": false, "name": null,
"leaveDotGit": false, "owner": "pupbrained",
"name": null, "repo": "fish-git-abbr",
"owner": "pupbrained", "rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e",
"repo": "fish-git-abbr", "sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=",
"rev": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e", "type": "github"
"sha256": "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=", },
"type": "github" "version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e"
}, },
"version": "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e" "gityaw": {
}, "cargoLocks": null,
"gityaw": { "date": "2019-01-07",
"cargoLocks": null, "extract": null,
"date": "2019-01-07", "name": "gityaw",
"extract": null, "passthru": null,
"name": "gityaw", "pinned": false,
"passthru": null, "src": {
"pinned": false, "deepClone": false,
"src": { "fetchSubmodules": false,
"deepClone": false, "leaveDotGit": false,
"fetchSubmodules": false, "name": null,
"leaveDotGit": false, "owner": "oh-my-fish",
"name": null, "repo": "plugin-gityaw",
"owner": "oh-my-fish", "rev": "59196560e0f4520db63fb8cab645510377bb8b13",
"repo": "plugin-gityaw", "sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=",
"rev": "59196560e0f4520db63fb8cab645510377bb8b13", "type": "github"
"sha256": "sha256-STXNxSsjSopB+lbB4hEYdhJifRfsImRwbZ1SxwEhkuM=", },
"type": "github" "version": "59196560e0f4520db63fb8cab645510377bb8b13"
}, },
"version": "59196560e0f4520db63fb8cab645510377bb8b13" "license": {
}, "cargoLocks": null,
"license": { "date": "2018-10-22",
"cargoLocks": null, "extract": null,
"date": "2018-10-22", "name": "license",
"extract": null, "passthru": null,
"name": "license", "pinned": false,
"passthru": null, "src": {
"pinned": false, "deepClone": false,
"src": { "fetchSubmodules": false,
"deepClone": false, "leaveDotGit": false,
"fetchSubmodules": false, "name": null,
"leaveDotGit": false, "owner": "oh-my-fish",
"name": null, "repo": "plugin-license",
"owner": "oh-my-fish", "rev": "0155b16f102957ec0c734a90979245dc1073f979",
"repo": "plugin-license", "sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=",
"rev": "0155b16f102957ec0c734a90979245dc1073f979", "type": "github"
"sha256": "sha256-Bi9Q5rekZoyXYbRV+U4SmwCdqCl0pFupzm5si7SxFns=", },
"type": "github" "version": "0155b16f102957ec0c734a90979245dc1073f979"
}, },
"version": "0155b16f102957ec0c734a90979245dc1073f979" "poll": {
}, "cargoLocks": null,
"poll": { "date": null,
"cargoLocks": null, "extract": null,
"date": null, "name": "poll",
"extract": null, "passthru": null,
"name": "poll", "pinned": false,
"passthru": null, "src": {
"pinned": false, "name": null,
"src": { "sha256": "sha256-Weh2+C5v2ORYO8JFYzntpPmJyGseFqArByZwLpX2CCU=",
"name": null, "type": "url",
"sha256": "sha256-Weh2+C5v2ORYO8JFYzntpPmJyGseFqArByZwLpX2CCU=", "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/poll.patch"
"type": "url", },
"url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/poll.patch" "version": "latest"
}, },
"version": "latest" "replay-fish": {
}, "cargoLocks": null,
"replay-fish": { "date": "2024-07-01",
"cargoLocks": null, "extract": null,
"date": "2024-07-01", "name": "replay-fish",
"extract": null, "passthru": null,
"name": "replay-fish", "pinned": false,
"passthru": null, "src": {
"pinned": false, "deepClone": false,
"src": { "fetchSubmodules": false,
"deepClone": false, "leaveDotGit": false,
"fetchSubmodules": false, "name": null,
"leaveDotGit": false, "owner": "jorgebucaran",
"name": null, "repo": "replay.fish",
"owner": "jorgebucaran", "rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c",
"repo": "replay.fish", "sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=",
"rev": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c", "type": "github"
"sha256": "sha256-TzQ97h9tBRUg+A7DSKeTBWLQuThicbu19DHMwkmUXdg=", },
"type": "github" "version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c"
}, },
"version": "d2ecacd3fe7126e822ce8918389f3ad93b14c86c" "round-undecorated-frame": {
}, "cargoLocks": null,
"round-undecorated-frame": { "date": null,
"cargoLocks": null, "extract": null,
"date": null, "name": "round-undecorated-frame",
"extract": null, "passthru": null,
"name": "round-undecorated-frame", "pinned": false,
"passthru": null, "src": {
"pinned": false, "name": null,
"src": { "sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=",
"name": null, "type": "url",
"sha256": "sha256-dFH4D1WYQOVOagUuVdEQB3irxV+Y8dDAOKJOJXc/KHQ=", "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch"
"type": "url", },
"url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/round-undecorated-frame.patch" "version": "latest"
}, },
"version": "latest" "system-appearance": {
}, "cargoLocks": null,
"system-appearance": { "date": null,
"cargoLocks": null, "extract": null,
"date": null, "name": "system-appearance",
"extract": null, "passthru": null,
"name": "system-appearance", "pinned": false,
"passthru": null, "src": {
"pinned": false, "name": null,
"src": { "sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=",
"name": null, "type": "url",
"sha256": "sha256-nrPOgGQAJb/5brrrWJNDARY2jWNJ9OsMtO+LPVhHfbY=", "url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch"
"type": "url", },
"url": "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-30/system-appearance.patch" "version": "latest"
}, },
"version": "latest" "wttr": {
}, "cargoLocks": null,
"wttr": { "date": "2016-05-23",
"cargoLocks": null, "extract": null,
"date": "2016-05-23", "name": "wttr",
"extract": null, "passthru": null,
"name": "wttr", "pinned": false,
"passthru": null, "src": {
"pinned": false, "deepClone": false,
"src": { "fetchSubmodules": false,
"deepClone": false, "leaveDotGit": false,
"fetchSubmodules": false, "name": null,
"leaveDotGit": false, "owner": "oh-my-fish",
"name": null, "repo": "plugin-wttr",
"owner": "oh-my-fish", "rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c",
"repo": "plugin-wttr", "sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=",
"rev": "7500e382e6b29a463edc57598217ce0cfaf8c90c", "type": "github"
"sha256": "sha256-k3FrRPxKCiObO6HgtDx8ORbcLmfSYQsQeq5SAoNfZbE=", },
"type": "github" "version": "7500e382e6b29a463edc57598217ce0cfaf8c90c"
}, }
"version": "7500e382e6b29a463edc57598217ce0cfaf8c90c" }
}
}

View file

@ -1,8 +1,6 @@
# This file was generated by nvfetcher, please do not modify it manually. # This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{ {
fetchurl,
fetchFromGitHub,
}: {
bang-bang = { bang-bang = {
pname = "bang-bang"; pname = "bang-bang";
version = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; version = "ec991b80ba7d4dda7a962167b036efc5c2d79419";

View file

@ -27,6 +27,7 @@
emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git"; emacs = mkCustomUrl "git+https://git.pupbrained.xyz/pupbrained/nixmacs.git";
hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland"; hyprland = mkWithSubmodules "https://github.com/hyprwm/Hyprland";
hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland"; hyprland-plugins = mkFollowing "hyprwm/hyprland-plugins" "hyprland";
hyprpanel = mkInput "Jas-SinghFSU/HyprPanel";
impermanence = mkInput "nix-community/impermanence"; impermanence = mkInput "nix-community/impermanence";
nix-colors = mkInput "Misterio77/nix-colors"; nix-colors = mkInput "Misterio77/nix-colors";
nixos-facter-modules = mkInput "numtide/nixos-facter-modules"; nixos-facter-modules = mkInput "numtide/nixos-facter-modules";
@ -34,8 +35,10 @@
nixvim = mkInput "pupbrained/nvim-config"; nixvim = mkInput "pupbrained/nvim-config";
treefmt-nix = mkInput "numtide/treefmt-nix"; treefmt-nix = mkInput "numtide/treefmt-nix";
xmonad-contrib = mkInput "xmonad/xmonad-contrib"; xmonad-contrib = mkInput "xmonad/xmonad-contrib";
zen-browser = mkInput "fufexan/zen-browser-flake"; wezterm = mkInput "wez/wezterm?dir=nix";
zen-browser = mkInput "qlexqndru/zen-browser-flake";
niri = mkFollowingNixpkgs "sodiboo/niri-flake";
cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic"; cosmic = mkFollowingNixpkgs "lilyinstarlight/nixos-cosmic";
darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master"; darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master";
home-manager = mkFollowingNixpkgs "nix-community/home-manager"; home-manager = mkFollowingNixpkgs "nix-community/home-manager";
@ -51,6 +54,7 @@
src = ./.; src = ./.;
overlays = [ overlays = [
hyprpanel.overlay
snowfall-flake.overlays.default snowfall-flake.overlays.default
]; ];

File diff suppressed because it is too large Load diff

View file

@ -28,7 +28,12 @@
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
url = "github:hyprwm/hyprland-plugins"; url = "github:hyprwm/hyprland-plugins";
}; };
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
niri = {
inputs.nixpkgs.follows = "nixpkgs";
url = "github:sodiboo/niri-flake";
};
nix-colors.url = "github:Misterio77/nix-colors"; nix-colors.url = "github:Misterio77/nix-colors";
nix-index-database = { nix-index-database = {
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -46,8 +51,9 @@
url = "github:snowfallorg/lib/dev"; url = "github:snowfallorg/lib/dev";
}; };
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
wezterm.url = "github:wez/wezterm?dir=nix";
xmonad-contrib.url = "github:xmonad/xmonad-contrib"; xmonad-contrib.url = "github:xmonad/xmonad-contrib";
zen-browser.url = "github:fufexan/zen-browser-flake"; zen-browser.url = "github:qlexqndru/zen-browser-flake";
}; };
outputs = inputs: inputs.flakegen ./flake.in.nix inputs; outputs = inputs: inputs.flakegen ./flake.in.nix inputs;
} }

View file

@ -21,6 +21,7 @@
}; };
colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha; colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
wayland.windowManager.river = { wayland.windowManager.river = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
@ -30,8 +31,12 @@
home = { home = {
packages = with pkgs; packages = with pkgs;
[ [
alacritty
fuzzel
alejandra alejandra
beeper beeper
bitwarden-cli
bitwarden-desktop
duf duf
eternal-terminal eternal-terminal
((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs: ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs:
@ -72,6 +77,7 @@
libnotify libnotify
lm_sensors lm_sensors
loupe loupe
mullvad-vpn
nodejs nodejs
playerctl playerctl
prismlauncher prismlauncher
@ -136,6 +142,7 @@
catppuccin = { catppuccin = {
enable = true; enable = true;
pointerCursor.enable = true;
flavor = "mocha"; flavor = "mocha";
accent = "green"; accent = "green";
}; };

View file

@ -7,6 +7,8 @@ with pkgs; {
]; ];
home.packages = [ home.packages = [
hyprpanel
swww
wl-clipboard wl-clipboard
]; ];
@ -15,7 +17,7 @@ with pkgs; {
systemd.variables = ["--all"]; systemd.variables = ["--all"];
settings = let settings = let
rofi-clipboard = pkgs.writeScriptBin "rofi-clipboard" '' rofi-clipboard = pkgs.writeScript "rofi-clipboard" ''
tmp_dir="/tmp/cliphist" tmp_dir="/tmp/cliphist"
rm -rf "$tmp_dir" rm -rf "$tmp_dir"
@ -39,7 +41,7 @@ with pkgs; {
cliphist list | gawk "$prog" cliphist list | gawk "$prog"
''; '';
scratchpad = pkgs.writeScriptBin "hyprscratchpad" '' scratchpad = pkgs.writeScript "hyprscratchpad" ''
COMMAND=$1 COMMAND=$1
CLASS=$2 CLASS=$2
WORKSPACE=$3 WORKSPACE=$3
@ -55,19 +57,20 @@ with pkgs; {
modC = "SUPER CTRL"; modC = "SUPER CTRL";
modS = "SUPER SHIFT"; modS = "SUPER SHIFT";
browser = "firefox-nightly"; browser = "zen-bin";
colorPicker = "notify-send -i gtk-color-picker $(${hyprpicker}/bin/hyprpicker -a) 'Copied to clipboard.'"; colorPicker = "notify-send -i gtk-color-picker $(${lib.getExe hyprpicker} -a) 'Copied to clipboard.'";
fileManager = "nautilus"; fileManager = "nautilus";
launcher = "rofi -show drun"; launcher = "rofi -show drun";
clipboard = "rofi -modi '':${rofi-clipboard}/bin/rofi-clipboard -show '' -show-icons"; clipboard = "rofi -modi '':${rofi-clipboard} -show '' -show-icons";
terminal = "wezterm"; terminal = "wezterm";
screenshot = mode: "${hyprshot}/bin/hyprshot --clipboard-only -m ${mode}"; screenshot = mode: "${lib.getExe hyprshot} --clipboard-only -m ${mode}";
in { in {
cursor.no_hardware_cursors = true; cursor.no_hardware_cursors = true;
decoration.rounding = 10; decoration.rounding = 5;
dwindle.preserve_split = true; dwindle.preserve_split = true;
gestures.workspace_swipe = true; gestures.workspace_swipe = true;
input.touchpad = { input.touchpad = {
clickfinger_behavior = true; clickfinger_behavior = true;
natural_scroll = true; natural_scroll = true;
@ -75,13 +78,13 @@ with pkgs; {
device = [ device = [
{ {
name = "logitech-g502-x-plus"; name = "logitech-usb-receiver";
sensitivity = -0.5; sensitivity = -0.5;
} }
]; ];
windowrule = [ windowrule = [
"float, ^(vesktop)$" "float, ^(equibop)$"
"float, ^(org.telegram.desktop)$" "float, ^(org.telegram.desktop)$"
]; ];
@ -110,21 +113,21 @@ with pkgs; {
gaps_in = 10; gaps_in = 10;
resize_on_border = true; resize_on_border = true;
"col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; "col.active_border" = "rgba(a6e3a1ee) rgba(cba6f7ee) 45deg";
"col.inactive_border" = "rgba(595959aa)"; "col.inactive_border" = "rgba(595959aa)";
}; };
exec-once = [ exec-once = [
"${mpvpaper.overrideAttrs { "hyprpanel"
version = "unstable-2024-07-05"; "swww-daemon"
src = fetchFromGitHub { "${writeScript "wallpaper" ''
owner = "GhostNaN"; while : ; do
repo = "mpvpaper"; for file in $(${uutils-coreutils}/bin/uutils-ls ${./walls}/*.jpg | sort -R | tail -1); do
rev = "a445391ff7491053fef78e3645eeed934f0c8fae"; swww img "$file" --transition-fps 165
sha256 = "sha256-3wHsUtIkh765EiMnx3BPzztvffIDf1NCqF0I/OATTZ4="; sleep 5m
}; done
}}/bin/mpvpaper -vp -o 'no-audio loop' DP-1 ${builtins.toString ./wall.mp4}" done
"waybar" ''}"
]; ];
misc = { misc = {
@ -133,8 +136,6 @@ with pkgs; {
}; };
monitor = [ monitor = [
"eDP-1, disable"
"Unknown-1, disable"
"DP-1, 2560x1440@165, auto, auto" "DP-1, 2560x1440@165, auto, auto"
]; ];
@ -165,8 +166,8 @@ with pkgs; {
"${mod}, Return, exec, ${terminal}" "${mod}, Return, exec, ${terminal}"
# Scratchpads # Scratchpads
"${mod}, d, exec, ${scratchpad}/bin/hyprscratchpad vesktop vesktop vesktop" "${mod}, d, exec, ${scratchpad} equibop equibop equibop"
"${mod}, t, exec, ${scratchpad}/bin/hyprscratchpad telegram-desktop org.telegram.desktop telegram" "${mod}, t, exec, ${scratchpad} telegram-desktop org.telegram.desktop telegram"
# Screenshots # Screenshots
"${modS}, s, exec, ${screenshot "window"}" "${modS}, s, exec, ${screenshot "window"}"

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 864 KiB

View file

@ -115,15 +115,15 @@ local config = {
enable_kitty_graphics = true, enable_kitty_graphics = true,
enable_scroll_bar = false, enable_scroll_bar = false,
enable_wayland = true, enable_wayland = true,
font_size = 12, font_size = 10,
font = wezterm.font('Iosevka Comfy Motion'), font = wezterm.font('Maple Mono NF'),
front_end = 'WebGpu', front_end = 'WebGpu',
keys = keybinds, keys = keybinds,
underline_position = -4, underline_position = -4,
use_fancy_tab_bar = false, use_fancy_tab_bar = false,
window_background_opacity = 0.8,
window_decorations = 'NONE', window_decorations = 'NONE',
warn_about_missing_glyphs = false, warn_about_missing_glyphs = false,
window_background_opacity = 0.8,
window_padding = { left = 0, right = 0, top = 0, bottom = 0 }, window_padding = { left = 0, right = 0, top = 0, bottom = 0 },
} }

View file

@ -1,3 +1,10 @@
{...}: { {
programs.wezterm.enable = true; inputs,
pkgs,
...
}: {
programs.wezterm = {
enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default;
};
} }

View file

@ -184,34 +184,6 @@
systemd = { systemd = {
tpm2.enable = true; tpm2.enable = true;
network.networks = {
"10-lan1" = {
DHCP = "yes";
matchConfig.MACAddress = "04:42:1a:02:fe:f5";
dhcpV4Config.RouteMetric = 10;
dhcpV6Config.RouteMetric = 10;
networkConfig = {
IPv6PrivacyExtensions = "yes";
MulticastDNS = true;
};
};
"10-wlan1" = {
DHCP = "yes";
matchConfig.MACAddress = "64:49:7d:c1:01:10";
dhcpV4Config.RouteMetric = 40;
dhcpV6Config.RouteMetric = 40;
networkConfig = {
IPv6PrivacyExtensions = "yes";
MulticastDNS = true;
};
};
};
user.extraConfig = let user.extraConfig = let
path = lib.concatStringsSep ":" [ path = lib.concatStringsSep ":" [
"/run/wrappers/bin" "/run/wrappers/bin"
@ -243,7 +215,7 @@
environment = { environment = {
sessionVariables = { sessionVariables = {
COSMIC_DATA_CONTROL_ENABLED = 1; COSMIC_DATA_CONTROL_ENABLED = 1;
BROWSER = "zen"; BROWSER = "zen-bin";
DIRENV_WARN_TIMEOUT = "100s"; DIRENV_WARN_TIMEOUT = "100s";
EDITOR = "nvim"; EDITOR = "nvim";
NIXOS_OZONE_WL = 1; NIXOS_OZONE_WL = 1;
@ -284,7 +256,7 @@
boot = { boot = {
blacklistedKernelModules = ["nouveau" "i915"]; blacklistedKernelModules = ["nouveau" "i915"];
kernelPackages = pkgs.linuxPackages_xanmod_latest; kernelPackages = pkgs.linuxPackages_cachyos;
supportedFilesystems = ["btrfs" "ntfs"]; supportedFilesystems = ["btrfs" "ntfs"];
tmp.useTmpfs = true; tmp.useTmpfs = true;
@ -297,13 +269,6 @@
emergencyAccess = true; emergencyAccess = true;
dbus.enable = true; dbus.enable = true;
network = {
enable = true;
networks = {
inherit (config.systemd.network.networks) "10-lan1" "10-wlan1";
};
};
initrdBin = with pkgs; [ initrdBin = with pkgs; [
iwd iwd
nix nix
@ -441,8 +406,6 @@
gnupg.agent.enable = true; gnupg.agent.enable = true;
virt-manager.enable = true; virt-manager.enable = true;
river.enable = true;
appimage = { appimage = {
enable = true; enable = true;
binfmt = true; binfmt = true;
@ -466,12 +429,10 @@
networking = { networking = {
firewall.enable = false; firewall.enable = false;
networkmanager.enable = false; networkmanager.enable = true;
hostName = "navis"; hostName = "navis";
nameservers = ["1.1.1.1" "1.0.0.1"]; nameservers = ["1.1.1.1" "1.0.0.1"];
useDHCP = lib.mkForce true; useDHCP = lib.mkForce true;
useNetworkd = true;
wireless.iwd.enable = true;
}; };
time = { time = {
@ -484,6 +445,7 @@
flatpak.enable = true; flatpak.enable = true;
getty.autologinUser = "marshall"; getty.autologinUser = "marshall";
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
mullvad-vpn.enable = true;
openssh.enable = true; openssh.enable = true;
spice-vdagentd.enable = true; spice-vdagentd.enable = true;
udisks2.enable = true; udisks2.enable = true;
@ -541,6 +503,7 @@
"disk" "disk"
"gamemode" "gamemode"
"libvirtd" "libvirtd"
"networkmanager"
"qemu-libvirtd" "qemu-libvirtd"
"tss" "tss"
"wheel" "wheel"
@ -582,13 +545,11 @@
enable = true; enable = true;
xdgOpenUsePortal = true; xdgOpenUsePortal = true;
config.common.default = [ config.common.default = "*";
"cosmic"
"gtk"
];
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-cosmic pkgs.xdg-desktop-portal-cosmic
pkgs.xdg-desktop-portal-gnome
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
]; ];
}; };

File diff suppressed because it is too large Load diff