From 92af49fe2fb622a1a9ca4f6bb88820484a887374 Mon Sep 17 00:00:00 2001 From: oomfie Date: Sun, 8 Dec 2024 19:24:40 +0300 Subject: [PATCH] save progress --- Hosts/rose/hardware-configuration.nix | 8 +- Modules/Home/Core/Network/DNS/default.nix | 2 + Modules/Home/Core/Network/VPN/default.nix | 6 + Modules/Home/Core/Network/VPN/tailscale.nix | 38 +++++ Modules/Home/Core/Network/default.nix | 3 +- Modules/Home/Core/Shell/nushell.nix | 2 +- Modules/Home/Core/Shell/ssh.nix | 2 + Modules/Home/Core/Video/mpv/default.nix | 4 +- Modules/Home/Desktop/KDE/default.nix | 2 +- Modules/Home/Users/oomfie/users.nix | 2 +- .../NixOS/Core/Bootloader/systemd-boot.nix | 22 +-- Modules/NixOS/Core/Kernel/default.nix | 14 +- flake.lock | 140 +++++++++--------- flake.nix | 7 +- home.nix | 57 ++++--- 15 files changed, 187 insertions(+), 122 deletions(-) create mode 100644 Modules/Home/Core/Network/VPN/default.nix create mode 100644 Modules/Home/Core/Network/VPN/tailscale.nix diff --git a/Hosts/rose/hardware-configuration.nix b/Hosts/rose/hardware-configuration.nix index 39093a9..d34c415 100644 --- a/Hosts/rose/hardware-configuration.nix +++ b/Hosts/rose/hardware-configuration.nix @@ -14,15 +14,15 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/00876bfb-3f34-4607-a08d-d8a4f87cc53e"; + { device = "/dev/disk/by-uuid/0d45bdbe-5542-4f60-878e-5d9cae9be310"; fsType = "btrfs"; - options = [ "subvol=@" ]; + options = [ "subvol=@" "compress=zstd" ]; }; - boot.initrd.luks.devices."luks-9940ab6a-25a5-4789-b292-acd49816f0f9".device = "/dev/disk/by-uuid/9940ab6a-25a5-4789-b292-acd49816f0f9"; + boot.initrd.luks.devices."luks-735556dc-f934-4c07-a75e-6287448a4d1b".device = "/dev/disk/by-uuid/735556dc-f934-4c07-a75e-6287448a4d1b"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/45BD-631C"; + { device = "/dev/disk/by-uuid/CCD3-4946"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; diff --git a/Modules/Home/Core/Network/DNS/default.nix b/Modules/Home/Core/Network/DNS/default.nix index e423741..579c825 100644 --- a/Modules/Home/Core/Network/DNS/default.nix +++ b/Modules/Home/Core/Network/DNS/default.nix @@ -9,6 +9,8 @@ networking = { services.resolved.extraConfig = '' DNSOverTLS=yes ''; + + # # services.adguardhome = { # enable = true; diff --git a/Modules/Home/Core/Network/VPN/default.nix b/Modules/Home/Core/Network/VPN/default.nix new file mode 100644 index 0000000..7f97ce2 --- /dev/null +++ b/Modules/Home/Core/Network/VPN/default.nix @@ -0,0 +1,6 @@ +{ pkgs, config, lib, ... }: +{ + imports = [ + ./tailscale.nix + ]; +} diff --git a/Modules/Home/Core/Network/VPN/tailscale.nix b/Modules/Home/Core/Network/VPN/tailscale.nix new file mode 100644 index 0000000..2d5a55c --- /dev/null +++ b/Modules/Home/Core/Network/VPN/tailscale.nix @@ -0,0 +1,38 @@ +{ pkgs, config, lib, ... }: +{ + + # Enable Tailscale service. + services.tailscale = { + enable = true; + useRoutingFeatures = "both"; +}; + + environment.systemPackages = with pkgs; [ + #ethtool + networkd-dispatcher + tailscale +]; + +# services = { +# networkd-dispatcher = { +# enable = true; +# rules."50-tailscale" = { +# onState = ["routable"]; +# script = '' +# ${lib.getExe ethtool} -K eth0 rx-udp-gro-forwarding on rx-gro-list off +# ''; +# }; +# }; +# }; + + networking.firewall = { + # always allow traffic from your Tailscale network + trustedInterfaces = [ "tailscale0" ]; + + # allow the Tailscale UDP port through the firewall + allowedUDPPorts = [ config.services.tailscale.port ]; + + # let you SSH in over the public internet + # allowedTCPPorts = [ 22 ]; + }; +} diff --git a/Modules/Home/Core/Network/default.nix b/Modules/Home/Core/Network/default.nix index 7b4d95c..29948a2 100644 --- a/Modules/Home/Core/Network/default.nix +++ b/Modules/Home/Core/Network/default.nix @@ -4,7 +4,6 @@ ./DNS ./Firewall ./Wireless/nm.nix + ./VPN ]; - - services.tailscale.enable = true; } diff --git a/Modules/Home/Core/Shell/nushell.nix b/Modules/Home/Core/Shell/nushell.nix index 69ccb27..2884d70 100755 --- a/Modules/Home/Core/Shell/nushell.nix +++ b/Modules/Home/Core/Shell/nushell.nix @@ -54,7 +54,7 @@ shellAliases = { apply = "sudo nixos-rebuild switch --flake .#"; fhome = "sudo rm ~/.gtkrc-2.0"; rhome = "sudo systemctl restart home-manager-oomfie.service"; - ani = "~/.local/bin/animdl"; + #ani = "~/.local/bin/animdl"; }; }; } diff --git a/Modules/Home/Core/Shell/ssh.nix b/Modules/Home/Core/Shell/ssh.nix index aef754f..00624a4 100755 --- a/Modules/Home/Core/Shell/ssh.nix +++ b/Modules/Home/Core/Shell/ssh.nix @@ -23,4 +23,6 @@ }; systemd.services.autofs.path = [ pkgs.sshfs ]; + + environment.systemPackages = [ pkgs.sshfs ]; } diff --git a/Modules/Home/Core/Video/mpv/default.nix b/Modules/Home/Core/Video/mpv/default.nix index 3338e70..7500885 100644 --- a/Modules/Home/Core/Video/mpv/default.nix +++ b/Modules/Home/Core/Video/mpv/default.nix @@ -33,7 +33,7 @@ config = { cache = "yes"; cache-on-disk = "yes"; demuxer-max-back-bytes = "512M"; - demuxer-max-bytes = "512M"; + demuxer-max-bytes = "1GB"; ytdl-raw-options = "ignore-config=,sub-lang=\"en,ar\",write-sub=,write-auto-sub=,force-ipv4="; script-opts = "ytdl_hook-ytdl_path=yt-dlp"; deband = "no"; @@ -81,7 +81,7 @@ scriptOpts = { fetch_on_start = "no"; auto_add = "no"; }; - smart-copy-paste-2 = { + SmartCopyPaste_II = { linux_copy = "wl-copy"; #xclip -silent -selection clipboard -in linux_paste = "wl-paste"; #xclip -selection clipboard -o }; diff --git a/Modules/Home/Desktop/KDE/default.nix b/Modules/Home/Desktop/KDE/default.nix index 5934a34..e889f91 100644 --- a/Modules/Home/Desktop/KDE/default.nix +++ b/Modules/Home/Desktop/KDE/default.nix @@ -7,7 +7,7 @@ services = { desktopManager.plasma6.enable = true; displayManager.sddm = { enable = true; - wayland.enable = false; + wayland.enable = true; }; displayManager.sddm.settings = { # Set sddm settings Theme = { diff --git a/Modules/Home/Users/oomfie/users.nix b/Modules/Home/Users/oomfie/users.nix index 019165a..ef4d45b 100755 --- a/Modules/Home/Users/oomfie/users.nix +++ b/Modules/Home/Users/oomfie/users.nix @@ -8,5 +8,5 @@ shell = pkgs.${userSettings.sh}; }; - programs.fish.enable = true; + #programs.fish.enable = true; } diff --git a/Modules/NixOS/Core/Bootloader/systemd-boot.nix b/Modules/NixOS/Core/Bootloader/systemd-boot.nix index 4994a01..c63e552 100644 --- a/Modules/NixOS/Core/Bootloader/systemd-boot.nix +++ b/Modules/NixOS/Core/Bootloader/systemd-boot.nix @@ -3,18 +3,18 @@ boot = { loader = { - systemd-boot.enable = lib.mkForce false; + systemd-boot.enable = lib.mkForce true; efi.canTouchEfiVariables = true; systemd-boot.configurationLimit = 10; }; -lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; -}; - bootspec.enable = true; - initrd.systemd = { - enable = true; - tpm2.enable = true; - }; - }; +# lanzaboote = { +# enable = true; +# pkiBundle = "/etc/secureboot"; +# }; +# bootspec.enable = true; +# initrd.systemd = { +# enable = true; +# tpm2.enable = true; +# }; + }; } diff --git a/Modules/NixOS/Core/Kernel/default.nix b/Modules/NixOS/Core/Kernel/default.nix index a916596..6a09165 100755 --- a/Modules/NixOS/Core/Kernel/default.nix +++ b/Modules/NixOS/Core/Kernel/default.nix @@ -29,14 +29,12 @@ security = { }; }; -# boot.extraModprobeConfig = '' -# options iwlwifi 11n_disable=1 swcrypto=0 bt_coex_active=0 power_save=0 -# options iwlmvm power_scheme=1 -# options iwlwifi d0i3_disable=1 -# options iwlwifi uapsd_disable=1 -# options iwlwifi lar_disable=1 -# ''; -# +boot.extraModprobeConfig = '' + options iwlmvm power_scheme=1 + options iwlwifi power_save=0 + options iwlwifi swcrypto=1 +''; + boot.kernelParams = [ "pcie_aspm=off" # "pcie_aspm.policy=performance" diff --git a/flake.lock b/flake.lock index 4da2197..9f52d92 100755 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732248209, - "narHash": "sha256-Mv8k0VuGdb6YhhKt+8SIvhMdmI4xZhw/3ycSvlAq19Q=", + "lastModified": 1733630610, + "narHash": "sha256-ygrT4DEeQ4fFpDXIT53ZTsr6cA3pvQTAwQp1GMMq3dI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4a8ba00d1be3f3745428ed56efbb32155c548192", + "rev": "8a0b6c1bb922a406f3ce4debe5823d7b4850b6dc", "type": "gitlab" }, "original": { @@ -228,11 +228,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -446,16 +446,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "46.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -489,11 +489,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -586,11 +586,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732139495, - "narHash": "sha256-bsL1CZWp5fMDXP6U0Ipwi/XA1YigK9ON+pC7Cxurgec=", + "lastModified": 1733444216, + "narHash": "sha256-Xs+HcLsnMy6Z1FpHr0ULsGMc1mI6ESq1dTBAYwlpuVY=", "owner": "musnix", "repo": "musnix", - "rev": "996b38613a282299c852eca204a10914c6b0074d", + "rev": "a38011b5b96624b7f6527c0bc6df530a263297ad", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1732240312, - "narHash": "sha256-rvGBe5f74OLBW1sJ4Q3UGkNUbZcgSbMGWcAvWzklbZU=", + "lastModified": 1733623390, + "narHash": "sha256-2NcNHpofUCVam1gLhj71nbszEzki7Q/PtjH1X0MqCso=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "9c2f601b2cdfe2c06ce79fed04edd6c28fae2cc0", + "rev": "d63629179143d079d6e4975f8c68bb71a5d3ea08", "type": "github" }, "original": { @@ -637,11 +637,11 @@ }, "nixlib": { "locked": { - "lastModified": 1731805462, - "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", + "lastModified": 1733015484, + "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", + "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1732239366, - "narHash": "sha256-dY2Umwn/UzKT8K56zrAqb0JC9uCKxnDJxnf+5NwcqDQ=", + "lastModified": 1733621779, + "narHash": "sha256-oeBPiHmg8T/Qsf4qMkUqOrn6/xkJwREGo1jA+4xDssk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "7201d315fc068bed90f78e8e4493d30162711458", + "rev": "b9ec66ed4e1430061ca044e938bb10f3ab629ba3", "type": "github" }, "original": { @@ -679,11 +679,11 @@ ] }, "locked": { - "lastModified": 1732151224, - "narHash": "sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos=", + "lastModified": 1733360821, + "narHash": "sha256-bNXO+OGxrOjAxv/Lnyj84tNDicJ/FdLyLJHzOKSzYU8=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c", + "rev": "8cdaf8885c9c85d9d27b594dbe882406aadfe00e", "type": "github" }, "original": { @@ -742,43 +742,43 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -806,11 +806,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -838,11 +838,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -854,11 +854,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1731531548, - "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24f0d4acd634792badd6470134c387a3b039dace", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -968,11 +968,11 @@ ] }, "locked": { - "lastModified": 1732156292, - "narHash": "sha256-XuTCME5ZausokOJ28AsIoayBVD1soscdoiKweT4VY50=", + "lastModified": 1733538766, + "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2d484c7a0db32f2700e253160bcd2aaa6cdca3ba", + "rev": "66526479b295ad238843a8a7367d2da7ec102757", "type": "github" }, "original": { @@ -998,11 +998,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732261424, - "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", + "lastModified": 1733510476, + "narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=", "owner": "danth", "repo": "stylix", - "rev": "b667a340730dd3d0596083aa7c949eef01367c62", + "rev": "e309d64fe7f203274a7913e1d2b74307d15ba122", "type": "github" }, "original": { @@ -1123,11 +1123,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "type": "github" }, "original": { @@ -1144,11 +1144,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1731893168, - "narHash": "sha256-nijDZdYKT9UWF+kMgM3lq1OkbFKvDs6JXKRXI8cpprE=", + "lastModified": 1733509971, + "narHash": "sha256-LZIrb7HNWyLMU+dSI4fhbo2dMzJbbKKFWwYOpJwVXKE=", "ref": "refs/heads/main", - "rev": "9f580b251ca66950bb436c09afd2b9585eed74ba", - "revCount": 840, + "rev": "562e3900eebde0fb276dd2f425c097c8b44ccb92", + "revCount": 865, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/flake.nix b/flake.nix index ce4745b..17f03e9 100755 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs = { nixpkgs.follows = "nixpkgs-unstable"; # Nix packages - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Secureboot for nixos (EXPERMENTAL) @@ -87,11 +87,9 @@ inputs = { extra-substituters = [ "https://nix-community.cachix.org" "https://cache.nixos.org/" - "https://cosmic.cachix.org/" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; }; @@ -127,7 +125,7 @@ outputs = { self, nixpkgs, nixpkgs-stable, home-manager, arkenfox, lobster, styl de = "KDE"; video = "mpv"; prompt = "starship"; - sh = "fish"; + sh = "nushell"; term = "wezterm"; font = "Jetbrains Mono"; fontpkg = pkgs.jetbrains-mono; @@ -169,7 +167,6 @@ outputs = { self, nixpkgs, nixpkgs-stable, home-manager, arkenfox, lobster, styl lanzaboote.nixosModules.lanzaboote home-manager.nixosModules.home-manager nix-flatpak.nixosModules.nix-flatpak - nixos-cosmic.nixosModules.default #stylix.nixosModules.stylix #lix-module.nixosModules.default { diff --git a/home.nix b/home.nix index 9ac0a31..054fda7 100755 --- a/home.nix +++ b/home.nix @@ -8,7 +8,7 @@ ( ./. + "/Modules/Home/" + "/Core/Video"+("/"+userSettings.video)) ( ./. + "/Modules/Home/" + "/Core/Shell"+("/"+userSettings.prompt)+".nix") ( ./. + "/Modules/Home/" + "/Core/Shell"+("/"+userSettings.sh)+".nix") - #( ./. + "/Modules/Home/" + "/Core/Term"+("/"+userSettings.term)+".nix") # Broken on Nvidia GPUs + ( ./. + "/Modules/Home/" + "/Core/Term"+("/"+userSettings.term)+".nix") # Broken on Nvidia GPUs ( ./. + "/Modules/Home/Core/Network/Email"+("/"+userSettings.email)+".nix") ./Modules/Home/Core/CLI/git.nix ./Modules/Home/Core/CLI/fastfetch.nix @@ -35,6 +35,16 @@ stateHome = "${config.home.homeDirectory}/.local/state"; portal.extraPortals = with pkgs; [ xdg-desktop-portal-kde ]; portal.config.common.default = "kde"; + mimeApps = { + enable = true; + defaultApplications = { + "text/html" = "firefox.desktop"; + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + "x-scheme-handler/about" = "firefox.desktop"; + "x-scheme-handler/unknown" = "firefox.desktop"; + }; + }; userDirs = { enable = true; createDirectories = true; @@ -50,7 +60,6 @@ home = { sessionVariables = { #MOZ_ENABLE_WAYLAND = "0"; - BROWSER = lib.mkForce "firefox"; }; stateVersion = "24.11"; # Specificify release version username = userSettings.username; # FIXME: Change 'USERNAME/oomfie' to your username @@ -58,8 +67,9 @@ packages = with pkgs; # List all of your packages here [ onlyoffice-bin - simplex-chat-desktop - sshfs + #simplex-chat-desktop + #sshfs + #filezilla ripgrep ani-cli distrobox @@ -74,7 +84,6 @@ kdePackages.kdeconnect-kde (inputs.umu.packages.${pkgs.system}.umu.override {version = "${inputs.umu.shortRev}";}) inputs.lobster.packages.x86_64-linux.lobster - tailscale kdePackages.kate android-tools wget @@ -92,9 +101,20 @@ #qpwgraph keepassxc nheko - kdePackages.neochat + #kdePackages.neochat #thunderbird - prismlauncher + (prismlauncher.override { + #additionalPrograms = [ + # glfw + #]; + + jdks = [ + graalvm-ce + zulu8 + zulu17 + zulu + ]; + }) yt-dlp wl-clipboard #vscodium @@ -103,16 +123,18 @@ #gamescope #stremio #kdePackages.konversation + heroic + #minigalaxy #(discord.override { - # withVencord = true; - # withOpenASAR = false; + #withVencord = true; + #withOpenASAR = false; #}) legcord #arrpc zola #libsForQt5.lightly #gparted - #tor-browser-bundle-bin + tor-browser-bundle-bin (pkgs.uutils-coreutils.override { prefix = ""; }) #protonvpn-gui #ruffle @@ -137,8 +159,9 @@ protonup-qt inkscape #protontricks - wine64Packages.stable - inconsolata-nerdfont + #wine64Packages.stable + wineWowPackages.waylandFull + nerd-fonts.symbols-only #wezterm ]; }; @@ -151,11 +174,11 @@ home.file."${config.xdg.cacheHome}/flatpak/override/global".text = '' fonts.fontconfig.enable = true; -home.extraProfileCommands = '' - if [[ -d "$out/share/applications" ]] ; then - ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications - fi -''; +# home.extraProfileCommands = '' +# if [[ -d "$out/share/applications" ]] ; then +# ${pkgs.desktop-file-utils}/bin/update-desktop-database $out/share/applications +# fi +# ''; systemd.user.startServices = "sd-switch";