diff --git a/flake.lock b/flake.lock index d4e6965..7eed5f9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -21,27 +21,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1748408240, - "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -70,11 +71,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -91,11 +92,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -123,18 +124,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1744584021, - "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.1", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -142,27 +145,27 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1765170903, + "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "20561be440a11ec57a89715480717baf19fe6343", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -174,48 +177,48 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1753489912, - "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -229,15 +232,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1751320053, - "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -273,16 +275,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1753733105, - "narHash": "sha256-zxAiwoYqjesNbV46vGZe9ONvazQDPswnHfhsvvzqkU4=", + "lastModified": 1765065096, + "narHash": "sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0+/DxfAU=", "owner": "danth", "repo": "stylix", - "rev": "8340949b7cba126b6939ae588e6619f8e23bba9d", + "rev": "84d9d55885d463d461234f3aac07b2389a2577d8", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -338,11 +340,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -354,11 +356,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -370,11 +372,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -382,28 +384,6 @@ "repo": "base16-zed", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "stylix", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5a49f66..c03534c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "Nixos config flake"; inputs = { - stylix.url = "github:danth/stylix/release-25.05"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - home-manager.url = "github:nix-community/home-manager/release-25.05"; + stylix.url = "github:danth/stylix/release-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; nixos-hardware.url = "github:nixos/nixos-hardware/master"; }; diff --git a/hosts/home/hyprland.nix b/hosts/home/hyprland.nix index 046c37c..07d1b6c 100644 --- a/hosts/home/hyprland.nix +++ b/hosts/home/hyprland.nix @@ -51,7 +51,9 @@ settings = { exec-once = [ #"${pkgs.iio-hyprland}/bin/iio-hyprland" - #"${pkgs.batsignal}/bin/batsignal -n BAT0 -b" + "${pkgs.batsignal}/bin/batsignal -n BAT0 -b" + "${pkgs.waybar}/bin/waybar" + "${pkgs.hyprpaper}/bin/hyprpaper" ]; monitor = "eDP-1,preferred,auto,1"; general = { @@ -100,6 +102,13 @@ "$mainMod, Space, exec, toggle_float" "$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock" + #emacs + "$mainMod, E, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c" + "$mainMod, C, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(org-roam-capture)\"" + "$mainMod, B, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(call-interactively #'bookmark-jump)\"" + "$mainMod, P, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(project-dired)\"" + "$mainMod, M, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e \"(mingus)\"" + # switch focus "$mainMod, left, movefocus, l" "$mainMod, right, movefocus, r" diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index a878c21..bb28d78 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -4,7 +4,7 @@ inputs, ... }: { - imports = [./hardware-configuration.nix]; + imports = [./hardware-configuration.nix ]; nixpkgs.config.allowUnfree = true; system.autoUpgrade.enable = true; @@ -27,8 +27,8 @@ gc.automatic = false; settings = { experimental-features = ["nix-command" "flakes"]; - substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; - trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; + #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; + #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; }; }; @@ -54,12 +54,19 @@ }; services = { - hardware.bolt = {enable = false;}; - displayManager.sddm = { + hardware.bolt = {enable = true;}; + displayManager.ly = { enable = true; - wayland.enable = true; + x11Support = false; + settings = { + animation = "colormix"; + battery_id = "BAT0"; + clear_password = true; + colormix_col1 = "0xA7C080"; + colormix_col2 = "0x7FBBB3"; + colormix_col3 = "0xE67E80"; + }; }; - desktopManager.plasma6.enable = true; pipewire = { enable = true; alsa.enable = true; @@ -85,13 +92,13 @@ lidSwitchExternalPower = "suspend"; }; avahi = { - enable = true; + enable = false; nssmdns4 = true; - openFirewall = true; # If you have a firewall enabled + openFirewall = true; }; blueman.enable = true; - fwupd.enable = false; + fwupd.enable = true; printing.enable = true; fprintd.enable = true; thermald.enable = true; @@ -100,13 +107,14 @@ stylix = { enable = true; autoEnable = true; - polarity = "light"; + polarity = "dark"; image = ./wallpaper.png; - base16Scheme = "${pkgs.base16-schemes}/share/themes/precious-light-warm.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml"; opacity = { terminal = 0.85; popups = 0.75; desktop = 0.75; + applications = 0.85; }; cursor = { package = pkgs.adwaita-icon-theme; @@ -143,6 +151,16 @@ programs = { zsh.enable = true; + virt-manager.enable = true; + hyprland = { + enable = true; + }; + }; + + virtualisation = { + libvirtd = {enable = true;}; + kvmgt = {enable = true;}; + docker = {enable = true;}; }; users.users.k = { @@ -166,7 +184,7 @@ }; systemd.sleep.extraConfig = '' - HibernateDelaySec=30m + HibernateDelaySec=20m SuspendState=mem ''; @@ -182,7 +200,6 @@ "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" - "udev.lqog_priority=3" ]; loader.timeout = 0; }; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index b1fb75f..57468f2 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -6,6 +6,7 @@ }: { imports = [ ../home/home_common.nix + ../home/hyprland.nix ]; nixpkgs.config.allowUnfree = true; @@ -19,6 +20,7 @@ blender vesktop spotify + alacritty btop zip @@ -42,7 +44,7 @@ emacs = { enable = true; - package = pkgs.emacs-pgtk; + package = pkgs.emacs-pgtk.override{withTreeSitter=true; withNativeCompilation=true;}; extraPackages = epkgs: [ epkgs.vterm ]; @@ -60,7 +62,6 @@ emacs = { enable = true; defaultEditor = true; - package = pkgs.emacs-pgtk; }; }; stylix = { diff --git a/hosts/laptop/wallpaper.png b/hosts/laptop/wallpaper.png index f741e1a..c84810b 100644 Binary files a/hosts/laptop/wallpaper.png and b/hosts/laptop/wallpaper.png differ diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index e01d7b5..28e6384 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -30,7 +30,7 @@ users = { motd = "Welcome to the Server"; - defaultUserShell = pkgs.nushell; + defaultUserShell = pkgs.zsh; users = { k = { isNormalUser = true; @@ -48,16 +48,14 @@ }; }; - home-manager = {users = {"k" = import ./home.nix;};}; + home-manager = { + backupFileExtension = "bk"; + users = {"k" = import ./home.nix;}; + }; environment.systemPackages = with pkgs; [ microcodeIntel firefox - (pkgs.kodi.withPackages (kodiPkgs: - with kodiPkgs; [ - jellyfin - youtube - ])) ]; hardware.bluetooth.enable = true; diff --git a/hosts/server/service.nix b/hosts/server/service.nix index 9c105a9..43c3cf4 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -6,11 +6,33 @@ networking = { firewall = { enable = true; - allowedTCPPorts = [80 443 22 25565 26615 8080]; - allowedUDPPorts = [26615 8080 1900]; + allowedTCPPorts = [80 443 22 25565 26615 8080 53 19132 ]; + allowedUDPPorts = [26615 8080 1900 51820 53 19132 ]; + }; + nat.externalInterface = "wlp0s20f3"; + nat.internalInterfaces = [ "wg0" ]; + wireguard.interfaces = { + wg0 = { + ips = ["10.0.0.1/24"]; + listenPort = 51820; + privateKeyFile = "/keys/wg-private"; + peers = [ + { # laptop + publicKey = "Ze2y3K+blI3aBc1AKTlvv90j+McBaitB+qSLazsuSFM="; + allowedIPs = ["10.0.0.2/32"]; + } + + { # phone + publicKey = "vcheBoHRxCrwzbMw0UI9ZsQfVDJizBWkeM+pF5/8+HE="; + allowedIPs = ["10.0.0.3/32"]; + } + ]; + }; }; }; + networking.nat.enable = true; + security.acme = { acceptTerms = true; defaults.email = "markers711@gmail.com"; @@ -33,15 +55,6 @@ i2p = {enable = true;}; - cockpit = { - enable = true; - allowed-origins = ["https://pit.dhilton.xyz"]; - }; - - pulseaudio = { - enable = true; - }; - nix-serve = { enable = true; secretKeyFile = "/var/cache-priv-key.pem"; @@ -184,11 +197,11 @@ }; }; - "pit.dhilton.xyz" = { + "map.dhilton.xyz" = { forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://127.0.0.1:9090"; + proxyPass = "http://127.0.0.1:8100"; proxyWebsockets = true; }; };