diff --git a/flake.lock b/flake.lock index bfe4ac9..7eed5f9 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -71,11 +71,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -145,11 +145,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768949235, - "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", + "lastModified": 1765170903, + "narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=", "owner": "nix-community", "repo": "home-manager", - "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", + "rev": "20561be440a11ec57a89715480717baf19fe6343", "type": "github" }, "original": { @@ -161,11 +161,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767799921, - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { @@ -193,11 +193,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769318308, - "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1767799921, - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -275,11 +275,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769472288, - "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=", + "lastModified": 1765065096, + "narHash": "sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0+/DxfAU=", "owner": "danth", "repo": "stylix", - "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c", + "rev": "84d9d55885d463d461234f3aac07b2389a2577d8", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -372,11 +372,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2f545bf..c03534c 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ inputs.home-manager.nixosModules.default inputs.stylix.nixosModules.stylix nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga + (import ./overlays/ollama.nix) ]; }; @@ -44,6 +45,7 @@ ./hosts/server/configuration.nix inputs.home-manager.nixosModules.default nixos-hardware.nixosModules.system76 + (import ./overlays/ollama.nix) ]; }; diff --git a/hosts/home/hyprland.nix b/hosts/home/hyprland.nix index 53c04d8..07d1b6c 100644 --- a/hosts/home/hyprland.nix +++ b/hosts/home/hyprland.nix @@ -99,7 +99,7 @@ "$mainMod, Return, exec, $terminal" "$mainMod, D, exec, $menu" "$mainMod Shift, C, killactive," - "$mainMod, Space, togglefloating" + "$mainMod, Space, exec, toggle_float" "$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock" #emacs diff --git a/hosts/home/niri.nix b/hosts/home/niri.nix deleted file mode 100644 index 8370726..0000000 --- a/hosts/home/niri.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: { - imports = [./waybar.nix ./tile.nix]; - home.packages = with pkgs; [ - pkgs.swaybg - pkgs.swayidle - pkgs.swaylock - pkgs.niri - pkgs.fuzzel - pkgs.iio-niri - pkgs.squeekboard - ]; -} diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index bd6968d..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; @@ -38,9 +38,23 @@ firewall.enable = true; }; - i18n.defaultLocale = "en_US.UTF-8"; + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + }; services = { + hardware.bolt = {enable = true;}; displayManager.ly = { enable = true; x11Support = false; @@ -48,9 +62,9 @@ animation = "colormix"; battery_id = "BAT0"; clear_password = true; - colormix_col1 = "0xffffea"; - colormix_col2 = "0x006600"; - colormix_col3 = "0x8888cc"; + colormix_col1 = "0xA7C080"; + colormix_col2 = "0x7FBBB3"; + colormix_col3 = "0xE67E80"; }; }; pipewire = { @@ -61,7 +75,7 @@ jack.enable = true; }; auto-cpufreq = { - enable = true; + enable = false; settings = { battery = { governor = "powersave"; @@ -77,8 +91,12 @@ lidSwitch = "suspend-then-hibernate"; lidSwitchExternalPower = "suspend"; }; + avahi = { + enable = false; + nssmdns4 = true; + openFirewall = true; + }; - hardware.bolt.enable = true; blueman.enable = true; fwupd.enable = true; printing.enable = true; @@ -89,28 +107,9 @@ stylix = { enable = true; autoEnable = true; - polarity = "light"; + polarity = "dark"; image = ./wallpaper.png; - base16Scheme = { - base00 = "#ffffea"; - base01 = "#eaffff"; - base02 = "#eeee9e"; - base03 = "#99994c"; - base04 = "#555555"; - base05 = "#000000"; - base06 = "#000000"; - base07 = "#000000"; - base08 = "#aa0000"; - base09 = "#884400"; - base0A = "#99994c"; - base0B = "#006600"; - base0C = "#8888cc"; - base0D = "#000099"; - base0E = "#8888cc"; - base0F = "#5d3a1a"; - }; - targets.chromium.enable = false; - targets.gnome.enable = false; + base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml"; opacity = { terminal = 0.85; popups = 0.75; @@ -142,14 +141,25 @@ hardware = { sensor.iio.enable = true; + graphics.enable32Bit = true; + graphics.extraPackages = with pkgs; [ + intel-vaapi-driver + intel-media-driver + intel-compute-runtime + ]; }; programs = { zsh.enable = true; - niri.enable = true; + virt-manager.enable = true; + hyprland = { + enable = true; + }; }; virtualisation = { + libvirtd = {enable = true;}; + kvmgt = {enable = true;}; docker = {enable = true;}; }; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 853c2d9..57468f2 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -6,7 +6,7 @@ }: { imports = [ ../home/home_common.nix - ../home/niri.nix + ../home/hyprland.nix ]; nixpkgs.config.allowUnfree = true; @@ -14,7 +14,6 @@ home = { packages = with pkgs; [ firefox - lagrange chromium #this might replace firefox keepassxc thunderbird @@ -33,8 +32,6 @@ direnv texliveFull ispell - - calc ]; }; @@ -47,10 +44,7 @@ emacs = { enable = true; - package = pkgs.emacs-pgtk.override { - withTreeSitter = true; - withNativeCompilation = true; - }; + package = pkgs.emacs-pgtk.override{withTreeSitter=true; withNativeCompilation=true;}; extraPackages = epkgs: [ epkgs.vterm ]; @@ -73,6 +67,5 @@ stylix = { enable = true; autoEnable = true; - targets.gnome.enable = false; }; } diff --git a/hosts/server/service.nix b/hosts/server/service.nix index cb61f3b..07997cd 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -6,25 +6,23 @@ networking = { firewall = { enable = true; - allowedTCPPorts = [80 443 22 25565 26615 8080 53 19132]; - allowedUDPPorts = [26615 8080 1900 51820 53 19132]; + allowedTCPPorts = [80 443 22 25565 26615 8080 53 19132 ]; + allowedUDPPorts = [26615 8080 1900 51820 53 19132 ]; }; nat.externalInterface = "wlp0s20f3"; - nat.internalInterfaces = ["wg0"]; + 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="; + peers = [ + { # laptop + publicKey = "Ze2y3K+blI3aBc1AKTlvv90j+McBaitB+qSLazsuSFM="; allowedIPs = ["10.0.0.2/32"]; } - { - # phone + { # phone publicKey = "vcheBoHRxCrwzbMw0UI9ZsQfVDJizBWkeM+pF5/8+HE="; allowedIPs = ["10.0.0.3/32"]; }