diff --git a/nixos/conf/GM/DE/dms.nix b/nixos/conf/GM/DE/dms.nix deleted file mode 100644 index e860641..0000000 --- a/nixos/conf/GM/DE/dms.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, lib, inputs, pkgs, ... }: { - - nixpkgs.overlays = [ inputs.niri.overlays.niri ]; - programs.niri = { - enable = true; - package = pkgs.niri-unstable; - }; - - programs.dms-shell = { - enable = true; - package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default; - quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; - - systemd = { - enable = true; # Systemd service for auto-start - restartIfChanged = true; # Auto-restart dms.service when dms-shell changes - }; - - plugins = { - #dankBitwarden.enable = true; - dankKDEConnect.enable = true; - linuxWallpaperEngine.enable = true; - }; - - # Core features - enableSystemMonitoring = true; # System monitoring widgets (dgop) - enableVPN = true; # VPN management widget - enableDynamicTheming = true; # Wallpaper-based theming (matugen) - enableAudioWavelength = true; # Audio visualizer (cava) - enableCalendarEvents = true; # Calendar integration (khal) -}; - - imports = [ - ./thunar.nix - inputs.dms.nixosModules.dank-material-shell - inputs.dms-plugin-registry.modules.default - inputs.dms.nixosModules.greeter - ]; - - xdg.portal = { - enable = true; - extraPortals = [pkgs.kdePackages.xdg-desktop-portal-kde]; - config.common.default = "*"; - }; - - security.polkit.enable = true; - systemd.user.services.niri-flake-polkit.enable = false; - programs.xwayland.enable = true; - programs.kdeconnect.enable = true; - - #services.displayManager.dms-greeter = { - # enable = true; - # compositor.name = "hyprland"; - # package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default; - # quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; - #}; - - services = { - greetd = - let - session = { - #command = "${pkgs.hyprland}/bin/Hyprland"; - command = "${pkgs.niri}/bin/niri-session"; - user = "gui"; - }; - in - { - enable = true; - settings = { - terminal.vt = 1; - default_session = session; - initial_session = session; - }; - }; - }; - - environment.systemPackages = with pkgs; [ - dgop - ]; - - -} \ No newline at end of file diff --git a/nixos/conf/GM/DE/impde.nix b/nixos/conf/GM/DE/impde.nix index 42e7c36..2b36017 100644 --- a/nixos/conf/GM/DE/impde.nix +++ b/nixos/conf/GM/DE/impde.nix @@ -4,7 +4,7 @@ #./cosmic.nix #./gnome.nix #./kde.nix - ./dms.nix + ./niri/niri.nix ]; } diff --git a/nixos/conf/GM/DE/kde.nix b/nixos/conf/GM/DE/kde.nix index 05595f8..4caf7c2 100644 --- a/nixos/conf/GM/DE/kde.nix +++ b/nixos/conf/GM/DE/kde.nix @@ -2,10 +2,11 @@ ## Ativar ambiente gráfico KDE Plasma 6 e gerenciador de login SDDM services = { - displayManager.sddm.enable = true; - displayManager.sddm.wayland.enable = true; desktopManager.plasma6.enable = true; }; + services.displayManager.plasma-login-manager = { + enable = true; + }; programs.kdeconnect.enable = true; @@ -15,6 +16,8 @@ kdePackages.qtmultimedia kdePackages.kcalc kdePackages.sddm-kcm + kdePackages.wallpaper-engine-plugin + kdePackages.krdp ]; environment.plasma6.excludePackages = with pkgs.kdePackages; [ diff --git a/nixos/conf/GM/DE/niri/dms.nix b/nixos/conf/GM/DE/niri/dms.nix new file mode 100644 index 0000000..c0f841c --- /dev/null +++ b/nixos/conf/GM/DE/niri/dms.nix @@ -0,0 +1,40 @@ +{ config, lib, inputs, pkgs, ... }: { + + nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + programs.niri = { + enable = true; + package = pkgs.niri-unstable; + }; + + programs.dms-shell = { + enable = true; + package = inputs.dms.packages.${pkgs.stdenv.hostPlatform.system}.default; + #quickshell.package = inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.quickshell; + + systemd = { + enable = true; # Systemd service for auto-start + restartIfChanged = true; # Auto-restart dms.service when dms-shell changes + }; + + plugins = { + dankBitwarden.enable = true; + dankKDEConnect.enable = true; + linuxWallpaperEngine.enable = true; + }; + + # Core features + enableSystemMonitoring = true; # System monitoring widgets (dgop) + enableVPN = true; # VPN management widget + enableDynamicTheming = true; # Wallpaper-based theming (matugen) + enableAudioWavelength = true; # Audio visualizer (cava) + enableCalendarEvents = false; # Calendar integration (khal) +}; + + imports = [ + inputs.dms.nixosModules.dank-material-shell + inputs.dms-plugin-registry.modules.default + inputs.dms.nixosModules.greeter + ]; + + +} diff --git a/nixos/conf/GM/DE/niri/niri.nix b/nixos/conf/GM/DE/niri/niri.nix new file mode 100644 index 0000000..85e97cf --- /dev/null +++ b/nixos/conf/GM/DE/niri/niri.nix @@ -0,0 +1,83 @@ +{ config, lib, inputs, pkgs, ... }: { + + nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + programs.niri = { + enable = true; + package = pkgs.niri-unstable; + }; + + imports = [ + ./thunar.nix + #./dms.nix + ./noctalia.nix + ]; + + services.dbus.enable = true; + security.polkit.enable = true; + systemd.user.services.niri-flake-polkit.enable = false; + programs.xwayland.enable = true; + programs.kdeconnect.enable = true; + + + services = { + greetd = + let + session = { + #command = "${pkgs.hyprland}/bin/Hyprland"; + command = "${pkgs.niri}/bin/niri-session"; + user = "gui"; + }; + in + { + enable = true; + settings = { + terminal.vt = 1; + default_session = session; + initial_session = session; + }; + }; + }; + + environment.systemPackages = with pkgs; [ + dgop + ]; + + #systemd.user.services.polkit-gnome-authentication-agent-1 = { + #description = "polkit-gnome-authentication-agent-1"; + #wantedBy = [ "graphical-session.target" ]; + #after = [ "graphical-session.target" ]; + #serviceConfig = { + # Type = "simple"; + # ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + # Restart = "on-failure"; + # RestartSec = 1; + # TimeoutStopSec = 10; + #}; + #}; + + xdg.portal = { + enable = true; + config = { + niri."org.freedesktop.impl.portal.FileChooser" = "gtk"; + niri.default = "gnome"; + common.default = "gnome"; + obs.default = "gnome"; + }; + extraPortals = with pkgs; [ + xdg-desktop-portal-gnome + xdg-desktop-portal-gtk + ]; + }; + + + #dg.portal = { + # enable = true; + # extraPortals = [ + # pkgs.xdg-desktop-portal-gnome + # pkgs.xdg-desktop-portal-gtk + # pkgs.xdg-desktop-portal-wlr + # ]; + # config.common.default = "*1"; + #}; + +} diff --git a/nixos/conf/GM/DE/niri/noctalia.nix b/nixos/conf/GM/DE/niri/noctalia.nix new file mode 100644 index 0000000..295cb17 --- /dev/null +++ b/nixos/conf/GM/DE/niri/noctalia.nix @@ -0,0 +1,11 @@ +{ pkgs, inputs, ... }: +{ + environment.systemPackages = with pkgs; [ + inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default + ]; + + nix.settings = { + extra-substituters = [ "https://noctalia.cachix.org" ]; + extra-trusted-public-keys = [ "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" ]; + }; +} diff --git a/nixos/conf/GM/DE/thunar.nix b/nixos/conf/GM/DE/niri/thunar.nix similarity index 100% rename from nixos/conf/GM/DE/thunar.nix rename to nixos/conf/GM/DE/niri/thunar.nix diff --git a/nixos/conf/GM/Pkgs/cloudflared.nix b/nixos/conf/GM/Pkgs/cloudflared.nix new file mode 100644 index 0000000..660f741 --- /dev/null +++ b/nixos/conf/GM/Pkgs/cloudflared.nix @@ -0,0 +1,17 @@ +{ config, lib, inputs, pkgs, ... }: { + + services.cloudflared = { + enable = true; + tunnels = { + "d5615be7-62ce-414c-a2b3-67dcbbbd4ac4" = { + credentialsFile = "/etc/cloudflared/d5615be7-62ce-414c-a2b3-67dcbbbd4ac4.json"; + default = "http_status:404"; + ingress = { + "pass.darkgui.com.br" = "http://localhost:8080"; + }; + }; + }; + }; + +} + diff --git a/nixos/conf/GM/Pkgs/imp_pkgs.nix b/nixos/conf/GM/Pkgs/imp_pkgs.nix index 18ead76..cc36dfc 100644 --- a/nixos/conf/GM/Pkgs/imp_pkgs.nix +++ b/nixos/conf/GM/Pkgs/imp_pkgs.nix @@ -3,5 +3,6 @@ imports = [ ./pkgsconfig.nix ./pkgs.nix + ./cloudflared.nix ]; } diff --git a/nixos/conf/GM/Pkgs/pkgs.nix b/nixos/conf/GM/Pkgs/pkgs.nix index 46d5f54..129895b 100644 --- a/nixos/conf/GM/Pkgs/pkgs.nix +++ b/nixos/conf/GM/Pkgs/pkgs.nix @@ -6,10 +6,12 @@ environment.systemPackages = with pkgs; [ ## Aplicativos sociais bitwarden-desktop + sunshine + tailscale ## inputs inputs.zen-browser.packages.${stdenv.hostPlatform.system}.default - inputs.hayase.packages.${pkgs.stdenv.hostPlatform.system}.default + inputs.shiru.packages.${pkgs.stdenv.hostPlatform.system}.default ## Utilitários do sistema e dev tools nh @@ -20,8 +22,7 @@ gcc ethtool efibootmgr - docker-compose - podman + docker-compose distroshelf distrobox freerdp @@ -32,7 +33,8 @@ usbutils openrgb winetricks - wineWowPackages.staging + #wineWowPackages.staging + wine haguichi logmein-hamachi zerotierone @@ -43,18 +45,25 @@ onlyoffice-desktopeditors adwaita-qt adwaita-qt6 - winboat + #winboat xwayland-satellite linux-wallpaperengine - kdePackages.polkit-qt-1 + #kdePackages.polkit-qt-1 + kdePackages.krdp + cloudflared ## inputs stable #inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system} + inputs.nixpkgs-stable.legacyPackages.${pkgs.stdenv.hostPlatform.system}.winboat ]; programs.gpu-screen-recorder.enable = true; services.logmein-hamachi.enable = true; programs.haguichi.enable = true; + nixpkgs.config.permittedInsecurePackages = [ + "electron-38.8.4" + ]; + } diff --git a/nixos/conf/GM/Pkgs/pkgsconfig.nix b/nixos/conf/GM/Pkgs/pkgsconfig.nix index 3e35e89..2e4c3b4 100644 --- a/nixos/conf/GM/Pkgs/pkgsconfig.nix +++ b/nixos/conf/GM/Pkgs/pkgsconfig.nix @@ -13,12 +13,11 @@ gamemode.enable = true; }; - ## Configuraçoes do obs #programs.obs-studio = { # enable = true; - # # optional Nvidia hardware acceleration + # #optional Nvidia hardware acceleration # package = ( # pkgs.obs-studio.override { # cudaSupport = true; @@ -30,7 +29,7 @@ # obs-gstreamer # obs-vkcapture # ]; - #enableVirtualCamera = true; + # #enableVirtualCamera = true; #}; ## Configuraçoes do LACT @@ -45,18 +44,6 @@ enable = true; }; - ## Configuraçao de Docker - - #virtualisation.podman = { - #enable = true; - #dockerCompat = true; - #}; - - users.users.gui.extraGroups = [ "docker" ]; - users.groups.docker.gid = 131; - virtualisation.docker = { - enable = true; - }; ## Fontes fonts.fontDir.enable = true; diff --git a/nixos/conf/GM/configs/cfsystem.nix b/nixos/conf/GM/configs/cfsystem.nix index c9c3a43..324f316 100644 --- a/nixos/conf/GM/configs/cfsystem.nix +++ b/nixos/conf/GM/configs/cfsystem.nix @@ -4,7 +4,7 @@ networking = { networkmanager.enable = true; interfaces.enp9s0.wakeOnLan.enable = true; - firewall.allowedTCPPorts = [ ]; + firewall.allowedTCPPorts = [ 22 ]; firewall.allowedUDPPorts = [ ]; }; @@ -28,19 +28,23 @@ ## Definir fuso horário time.timeZone = "America/Bahia"; + ## Configurações de idioma e localidade - i18n.defaultLocale = "pt_BR.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "pt_BR.UTF-8"; - LC_IDENTIFICATION = "pt_BR.UTF-8"; - LC_MEASUREMENT = "pt_BR.UTF-8"; - LC_MONETARY = "pt_BR.UTF-8"; - LC_NAME = "pt_BR.UTF-8"; - LC_NUMERIC = "pt_BR.UTF-8"; - LC_PAPER = "pt_BR.UTF-8"; - LC_TELEPHONE = "pt_BR.UTF-8"; - LC_TIME = "pt_BR.UTF-8"; + i18n = { + defaultLocale = "pt_BR.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "pt_BR.UTF-8"; + LC_IDENTIFICATION = "pt_BR.UTF-8"; + LC_MEASUREMENT = "pt_BR.UTF-8"; + LC_MONETARY = "pt_BR.UTF-8"; + LC_NAME = "pt_BR.UTF-8"; + LC_NUMERIC = "pt_BR.UTF-8"; + LC_PAPER = "pt_BR.UTF-8"; + LC_TELEPHONE = "pt_BR.UTF-8"; + LC_TIME = "pt_BR.UTF-8"; + }; }; + ## Configurar layout do teclado no X11 e console services.xserver.xkb = { layout = "br"; diff --git a/nixos/conf/GM/configs/imp.nix b/nixos/conf/GM/configs/imp.nix index de33a69..ebb99a8 100644 --- a/nixos/conf/GM/configs/imp.nix +++ b/nixos/conf/GM/configs/imp.nix @@ -5,5 +5,6 @@ ./nixhelper.nix ./nvidia.nix ./patchs.nix + ./self-host.nix ]; } diff --git a/nixos/conf/GM/configs/nixhelper.nix b/nixos/conf/GM/configs/nixhelper.nix index ceaf27f..1e1d8f8 100644 --- a/nixos/conf/GM/configs/nixhelper.nix +++ b/nixos/conf/GM/configs/nixhelper.nix @@ -30,8 +30,8 @@ auto-optimise-store = true; extra-sandbox-paths = [ "/var/cache/ccache" ]; ## cache kernel - substituters = [ "https://attic.xuyh0120.win/lantian" ]; - trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; + substituters = ["https://attic.xuyh0120.win/lantian"]; + trusted-public-keys = ["lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="]; }; ## Lix diff --git a/nixos/conf/GM/configs/nvidia.nix b/nixos/conf/GM/configs/nvidia.nix index 1f66fbb..d76cff0 100644 --- a/nixos/conf/GM/configs/nvidia.nix +++ b/nixos/conf/GM/configs/nvidia.nix @@ -8,6 +8,16 @@ nvidia.open = false; ## Se sua placa for pascal pra cima troque isso para true }; + hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "580.142"; + sha256_64bit = "sha256-IJFfzz/+icNVDPk7YKBKKFRTFQ2S4kaOGRGkNiBEdWM="; + sha256_aarch64 = lib.fakeSha256; + openSha256 = lib.fakeSha256; + settingsSha256 = "sha256-BnrIlj5AvXTfqg/qcBt2OS9bTDDZd3uhf5jqOtTMTQM="; + persistencedSha256 = lib.fakeSha256; + }; + + ## Teste sobre o nvk nao recomendo usar diff --git a/nixos/conf/GM/configs/self-host.nix b/nixos/conf/GM/configs/self-host.nix new file mode 100644 index 0000000..d5e9a76 --- /dev/null +++ b/nixos/conf/GM/configs/self-host.nix @@ -0,0 +1,51 @@ +{ config, lib, inputs, pkgs, ... }: { + + ## tailscale + services.tailscale = { + enable = true; + extraUpFlags = [ "--advertise-exit-node" "--ssh"]; + }; + networking.nftables.enable = true; + networking.firewall = { + enable = true; + allowedTCPPorts = [ 47984 47989 48910 ]; + allowedUDPPortRanges = [ + { from = 47998; to = 48000; } + { from = 48002; to = 48010; } +]; + trustedInterfaces = [ "tailscale0" ]; + allowedUDPPorts = [ config.services.tailscale.port ]; + }; + + ## Configuraçao de Docker + + + boot.kernel.sysctl = { + "net.ipv4.ip_unprivileged_port_start" = 53; + "net.ipv6.conf.all.forwarding" = true; + }; + + users.users.gui.extraGroups = [ "docker" ]; + users.groups.docker.gid = 131; + virtualisation.docker = { + enable = true; + + #rootless = { + # enable = true; + # setSocketVariable = true; + #}; + }; + + services.openssh = { + enable = true; + }; + + services.sunshine = { + enable = true; + autoStart = true; + capSysAdmin = true; + openFirewall = true; + +}; + +} diff --git a/nixos/conf/HM/pkgs/pkgs.nix b/nixos/conf/HM/pkgs/pkgs.nix index 29d9822..362c0f8 100644 --- a/nixos/conf/HM/pkgs/pkgs.nix +++ b/nixos/conf/HM/pkgs/pkgs.nix @@ -5,8 +5,11 @@ ## aplicativos sociais telegram-desktop pear-desktop - #element-desktop + stoat-desktop + teams-for-linux + #(discord.override {withVencord = true;}) (discord.override {withEquicord = true;}) + jellyfin-desktop ## Jogos lutris @@ -40,7 +43,7 @@ kitty vlc tree - python3 + python314 unrar #droidcam motrix @@ -48,8 +51,16 @@ nodejs lxappearance nwg-look + #rustdesk + anydesk + libargon2 + openssl_oqs + + ## Dev ]; - + nixpkgs.config.permittedInsecurePackages = [ + "electron-38.8.4" + ]; } \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 181acf6..965af3a 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -8,9 +8,9 @@ ## Configuração do bootloader boot = { - #kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; #kernelPackages = pkgs.linuxPackages_cachyos; - kernelPackages = inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; + #kernelPackages = inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; loader.systemd-boot.configurationLimit = 10; @@ -20,8 +20,6 @@ services = { xserver.enable = false; # Ativar sistema gráfico X11 - # displayManager.autoLogin.enable = true; - # displayManager.autoLogin.user = "gui"; printing.enable = false; }; @@ -44,4 +42,18 @@ }; system.stateVersion = "25.11"; # versao do nix + + networking = { + networkmanager.enable = true; + interfaces.enp9s0.wakeOnLan.enable = true; + firewall.allowedTCPPorts = [ ]; + firewall.allowedUDPPorts = [ + ]; + }; + services = { + displayManager.autoLogin.enable = true; + displayManager.autoLogin.user = "gui"; + }; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; } diff --git a/nixos/flake.lock b/nixos/flake.lock index e570df6..966599d 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1770327417, - "narHash": "sha256-WNS+wDUeqfegOXf5emDRnNs2bPiJ7rhdARo4jyd3+Yw=", + "lastModified": 1774186997, + "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "26670347cca9feddb31e075d23b474149d8902e1", + "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1770408132, - "narHash": "sha256-H2J5KHGAfzmr/SBNqWDj52bS76n/IRijOA1A2XerS90=", + "lastModified": 1774451104, + "narHash": "sha256-gYjAjM227djBliD0ovfNZ6fBGhT2lpUOyMTjnaFNZLc=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "94b35b638d970d70a354432d863e5fdf39238e44", + "rev": "de746a9cd1caa808e95805641a9117029e173b34", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1770407844, - "narHash": "sha256-gDCdcoHtoaEuFP+aVvf43NaJW2RclTVIBZix548BdhQ=", + "lastModified": 1774500343, + "narHash": "sha256-8sCdFTHJF0ZES8/Qa6DVbMAzZ1PLGYcZcQJBokoa7Bg=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "c031bd5a91990f7eab3d8fb364836cf4e1960f31", + "rev": "948e9c61779b0fafdf0c3b1ee6281502ff178fcc", "type": "github" }, "original": { @@ -58,11 +58,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1770564094, - "narHash": "sha256-m0iXwkpaF2wHIv1aSZ5fKhqBPp75QPxrx+Qr8K5JYL8=", + "lastModified": 1774634074, + "narHash": "sha256-zWbW8vQiNabBp9kpiUb4L6p/3kgx16zZMfoIqgawwRc=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "5b8b7b04be165f7979bac9a42157ff054f1dcca8", + "rev": "62c60900eb9398eac08f6045a5d8195c4f8af8b4", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1770574456, - "narHash": "sha256-8S8KnG9FLTAm9Q5rqK0st9kjaoxln02z+ttW5pXYp7U=", + "lastModified": 1774747640, + "narHash": "sha256-7B+FWctr14Ywg0387v65Wp1l6QWzSy+BbF7BLPryvf4=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "d89cf3bd0fadc6558c203276c11c8e1df53f6703", + "rev": "23cd4b3fc247283339f0dd1f15b75d3f194cc285", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -164,7 +164,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -180,26 +180,6 @@ "type": "github" } }, - "hayase": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770482456, - "narHash": "sha256-wleMx+emBnNumPpOBtTP24UHByjxegkcSYAlsMVoIU4=", - "owner": "darkguibrine", - "repo": "hayase-nix", - "rev": "162f14b72195eaef426d126a81771e83166cd4ba", - "type": "github" - }, - "original": { - "owner": "darkguibrine", - "repo": "hayase-nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -207,11 +187,11 @@ ] }, "locked": { - "lastModified": 1770491427, - "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=", + "lastModified": 1774738535, + "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860", + "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a", "type": "github" }, "original": { @@ -228,11 +208,11 @@ ] }, "locked": { - "lastModified": 1769872935, - "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -251,11 +231,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770571272, - "narHash": "sha256-IUBQMceKisLf1aqo0OWIuEEJLYCQjpvfAJYNZCqu5wE=", + "lastModified": 1774620721, + "narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "992922f59953b7f55f6b2de7f8bb661e93bc210e", + "rev": "fb83d584532282f585cd02f3aa513e98b843e7e7", "type": "github" }, "original": { @@ -284,11 +264,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770394936, - "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", + "lastModified": 1774616418, + "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "549148d27779d024255a84535b42b947f1c2a113", + "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", "type": "github" }, "original": { @@ -306,27 +286,26 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1770535232, - "narHash": "sha256-hTJEqkAynKtjhGgty0ooDhMNvWxG9Dhdwdfz6EgO3Lw=", + "lastModified": 1774720783, + "narHash": "sha256-Nl8geGkT2NZmq6NKrJmHSLyatQxdx2D4URC02UIPbSI=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "76f7c893e4ce83d3b488dcb512ba374b11e7197b", + "rev": "40bb1e8f8acf76136d7c63f57433e0fecd843c69", "type": "github" }, "original": { "owner": "xddxdd", - "ref": "release", "repo": "nix-cachyos-kernel", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { @@ -338,11 +317,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -353,11 +332,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1770575763, - "narHash": "sha256-2Ke5qHuzqKuGs7NDbVgtciew3MEuCwNXHmWSiGhD8sc=", + "lastModified": 1774796357, + "narHash": "sha256-STBVNdX/PIWlNHXrnOSAsJsPMTaehWGX+X/FVE+OH0s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e04b37b26a7a7f6245155840b8bcb3f20dadbff", + "rev": "8b378f1ae4f71006e76c5881f7b3d2f7071ab93c", "type": "github" }, "original": { @@ -368,11 +347,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { @@ -384,11 +363,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1770464364, - "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { @@ -416,11 +395,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -432,11 +411,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -448,11 +427,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1770441824, - "narHash": "sha256-9iicOOWBXLKD6Yyph7w3+chmRZHJu2bJInh+PZEPu3o=", + "lastModified": 1774700625, + "narHash": "sha256-dBkofLIWlS5LuUaAxkDKPyDquqqRovGXg7hs70oG5xc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06b4256d6169bdc528ca347f1b14044c4e6c4e86", + "rev": "57597ba4391da342b27161d28b5ee99c7dbb48fa", "type": "github" }, "original": { @@ -464,11 +443,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1770537093, - "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", + "lastModified": 1774701658, + "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", + "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe", "type": "github" }, "original": { @@ -480,11 +459,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -494,6 +473,50 @@ "type": "github" } }, + "noctalia": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "noctalia-qs": "noctalia-qs" + }, + "locked": { + "lastModified": 1774796750, + "narHash": "sha256-pZQrP79MFyQpALbdd27grO7nvXVdztFV5JbRiIKKgFY=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "72df0bfe1df9428ff0b87364f8ce65144b2ea76d", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ], + "systems": "systems", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1774734782, + "narHash": "sha256-rq/8sJPI8wD4P3CXSyvW/dPuAa+qXGdqzAKM3eunZ+4=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "8e216ba101d761b8a71f359246941d50e22bad3f", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_2", @@ -502,11 +525,11 @@ ] }, "locked": { - "lastModified": 1770574173, - "narHash": "sha256-ekK2BcDIXbBk1mnm//dv6asyfLiF9Ugfbb8kJRTdzOc=", + "lastModified": 1774796636, + "narHash": "sha256-W8a0d4pKXoHvU532xamsCtnLTKkQEd8/fXJKa7AB0hE=", "owner": "nix-community", "repo": "NUR", - "rev": "f10d820e7884f495b55729c081fef6c9b6046950", + "rev": "bc3f1b7f788f7feaba90858b7a17b9a622e3c298", "type": "github" }, "original": { @@ -563,11 +586,11 @@ ] }, "locked": { - "lastModified": 1770542768, - "narHash": "sha256-XzvFb2305PjC465D+ederTO27puG3S8GmDXcUB79J1w=", + "lastModified": 1774769488, + "narHash": "sha256-xxtoCIonfzlaYUb8B39Mho12TY8PU3Qy1FytCQ6JUCk=", "ref": "refs/heads/master", - "rev": "395a1301a83e98dafc325289630ccacda5d69607", - "revCount": 733, + "rev": "ee1100eb98d5033d8d4b76bf9fb0e720fec4c191", + "revCount": 780, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -581,16 +604,18 @@ "aagl": "aagl", "dms": "dms", "dms-plugin-registry": "dms-plugin-registry", - "hayase": "hayase", "home-manager": "home-manager", "niri": "niri", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_6", "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", + "noctalia": "noctalia", "nur": "nur", "preload-ng": "preload-ng", "quickshell": "quickshell_2", + "shiru": "shiru", + "sops-nix": "sops-nix", "zen-browser": "zen-browser" } }, @@ -599,11 +624,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1770952264, + "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", "type": "github" }, "original": { @@ -612,7 +637,62 @@ "type": "github" } }, + "shiru": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773113169, + "narHash": "sha256-+gsgkIC7wltWwpAh5BimXap7pSBNbBj1vcoicb1IzOg=", + "owner": "darkguibrine", + "repo": "shiru-nix", + "rev": "745f65a9c2292b7ac33e96b71e0654f6d3797d04", + "type": "github" + }, + "original": { + "owner": "darkguibrine", + "repo": "shiru-nix", + "type": "github" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774760784, + "narHash": "sha256-D+tgywBHldTc0klWCIC49+6Zlp57Y4GGwxP1CqfxZrY=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "8adb84861fe70e131d44e1e33c426a51e2e0bfa5", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -627,6 +707,28 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -647,11 +749,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770568598, - "narHash": "sha256-w7XGGbI3cxtJWK/B2n+yuhm1S3Vv21OPtIMFLTwbU20=", + "lastModified": 1773622265, + "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "e6dd3c05c098aef4e6a31fa95c04f129e9b52618", + "rev": "a879e5e0896a326adc79c474bf457b8b99011027", "type": "github" }, "original": { @@ -668,11 +770,11 @@ ] }, "locked": { - "lastModified": 1770568363, - "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", + "lastModified": 1774708879, + "narHash": "sha256-rTYvYkQL69/YkZB+MRA/IaX1qJ1lPx5KXoQS2/9+7Mw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", + "rev": "d01d23c798cceef42307d5789bfbce70515e8800", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index bc4a023..ead20d6 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -7,10 +7,14 @@ nixpkgs-master.url = "github:nixos/nixpkgs"; preload-ng.url = "github:miguel-b-p/preload-ng"; #chaotic.url = "github:lonerOrz/nyx-loner"; - nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; aagl.url = "github:ezKEa/aagl-gtk-on-nix"; dms.url = "github:AvengeMedia/DankMaterialShell"; niri.url = "github:sodiboo/niri-flake"; + sops-nix = { + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; dms-plugin-registry = { url = "github:AvengeMedia/dms-plugin-registry"; inputs.nixpkgs.follows = "nixpkgs"; @@ -31,12 +35,16 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - hayase = { - url = "github:darkguibrine/hayase-nix"; + shiru = { + url = "github:darkguibrine/shiru-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + noctalia = { + url = "github:noctalia-dev/noctalia-shell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,hayase ,preload-ng ,nix-cachyos-kernel ,aagl ,dms ,dms-plugin-registry ,quickshell ,niri , ...} @ inputs: { + outputs = {self ,nixpkgs ,nixpkgs-stable ,nixpkgs-master ,home-manager ,zen-browser ,nur ,shiru ,preload-ng ,nix-cachyos-kernel ,aagl ,sops-nix ,dms ,quickshell ,dms-plugin-registry ,niri ,noctalia , ...} @ inputs: { nixosConfigurations = { "Alfa" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -46,6 +54,7 @@ nur.modules.nixos.default preload-ng.nixosModules.default niri.nixosModules.niri + sops-nix.nixosModules.sops {services.preload-ng.enable = true;} #chaotic.nixosModules.default {imports = [ aagl.nixosModules.default ]; diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index 2ed8386..bfa94d7 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -8,19 +8,19 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/a0af7df2-5241-42c0-b554-365aa29c09dc"; + { device = "/dev/disk/by-uuid/a1eb89b4-3009-4524-af2b-24aeab2226b8"; fsType = "btrfs"; options = [ "subvol=@" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/FEEC-438F"; + { device = "/dev/disk/by-uuid/A038-AF6E"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; diff --git a/nixos/home.nix b/nixos/home.nix index 14a6531..fb37662 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -39,7 +39,7 @@ }; gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; - Settings = '' gtk-cursor-theme-name=Adwaita ''; + Settings = ''gtk-cursor-theme-name=Adwaita''; }; };