diff --git a/devices/server/configuration.nix b/devices/server/configuration.nix index 03552fb..abec228 100644 --- a/devices/server/configuration.nix +++ b/devices/server/configuration.nix @@ -40,6 +40,14 @@ in { reverse_proxy http://127.0.0.1:8096 ''; + virtualHosts."grafana.polensky.me".extraConfig = '' + reverse_proxy http://127.0.0.1:3000 + ''; + + virtualHosts."brigitte.polensky.me".extraConfig = '' + reverse_proxy http://127.0.0.1:4000 + ''; + virtualHosts."pb.polensky.me".extraConfig = '' request_body { max_size 10MB @@ -65,10 +73,18 @@ in { host = "0.0.0.0"; syncModels = true; loadModels = - [ "qwen3-embedding:8b" ]; + [ "qwen3-embedding:8b" "mistral:7b" ]; }; }; + services.brigitte = { + enable = true; + host = "brigitte.polensky.me"; + environmentFile = "/var/lib/brigitte/brigitte.env"; + database.enable = true; + garage.enable = true; + }; + # observability services = { grafana = { @@ -82,14 +98,26 @@ in { }; prometheus = { enable = true; - exporters = { node.enable = true; }; - scrapeConfigs = [{ - job_name = "node-exporters-lan"; - static_configs = [{ - targets = [ "127.0.0.1:9100" ]; - labels = { instance = "server"; }; - }]; - }]; + exporters = { + node.enable = true; + systemd.enable = true; + }; + scrapeConfigs = [ + { + job_name = "node-exporters-lan"; + static_configs = [{ + targets = [ "127.0.0.1:9100" ]; + labels = { instance = "server"; }; + }]; + } + { + job_name = "systemd-exporters-lan"; + static_configs = [{ + targets = [ "127.0.0.1:9558" ]; + labels = { instance = "server"; }; + }]; + } + ]; }; }; @@ -162,6 +190,8 @@ in { 9000 # mealie 8989 # sonarr 10222 # taskchampion-sync-server + 51966 # for ssh + 4000 # for brigitte ]; firewall.allowedUDPPorts = [ 5353 # mDNS diff --git a/devices/xps13/assets/avatar.jpg b/devices/xps13/assets/avatar.jpg new file mode 100644 index 0000000..39a5ecb Binary files /dev/null and b/devices/xps13/assets/avatar.jpg differ diff --git a/devices/xps13/configuration.nix b/devices/xps13/configuration.nix index d32ee14..93e1241 100644 --- a/devices/xps13/configuration.nix +++ b/devices/xps13/configuration.nix @@ -11,13 +11,13 @@ hardware.bluetooth = { enable = true; - powerOnBoot = true; + powerOnBoot = false; }; services.blueman.enable = true; services.openssh.enable = true; - services.power-profiles-daemon.enable = true; + services.power-profiles-daemon.enable = false; services.upower.enable = true; # Bootloader. @@ -26,6 +26,10 @@ boot.kernelModules = [ "msr" ]; + boot.extraModprobeConfig = '' + options snd_hda_intel power_save=1 + ''; + networking.hostName = "xps13"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -64,6 +68,7 @@ services.displayManager.sddm = { enable = true; theme = "${import ./sddm-theme.nix { inherit pkgs; }}"; + package = pkgs.kdePackages.sddm; }; # Define a user account. Don't forget to set a password with 'passwd'. @@ -100,12 +105,10 @@ pamixer networkmanagerapplet wl-clipboard - libsForQt5.qt5.qtquickcontrols2 - libsForQt5.qt5.qtgraphicaleffects ntfs3g - # Nix related - nixfmt-classic + kdePackages.qtdeclarative + kdePackages.qtsvg ]; programs.zsh.enable = true; @@ -119,7 +122,7 @@ programs.weylus = { enable = true; users = [ "polen" ]; - openFirewall= true; + openFirewall = true; }; services.gvfs.enable = true; diff --git a/devices/xps13/sddm-theme.nix b/devices/xps13/sddm-theme.nix index f8ab95e..91e13d7 100644 --- a/devices/xps13/sddm-theme.nix +++ b/devices/xps13/sddm-theme.nix @@ -1,18 +1,21 @@ { pkgs }: -let image = ./assets/a_forest_of_trees_with_fog.jpg; +let + image = ./assets/a_forest_of_trees_with_fog.jpg; + avatar = ./assets/avatar.jpg; in pkgs.stdenv.mkDerivation { name = "sddm-theme"; src = pkgs.fetchFromGitHub { - owner = "MarianArlt"; - repo = "sddm-sugar-dark"; - rev = "ceb2c455663429be03ba62d9f898c571650ef7fe"; - sha256 = "flOspjpYezPvGZ6b4R/Mr18N7N3JdytCSwwu6mf4owQ="; + owner = "xCaptaiN09"; + repo = "pixie-sddm"; + rev = "12a5f459ebd6d699be42c188c10976c8bb7076d7"; + sha256 = "sha256-lmE/49ySuAZDh5xLochWqfSw9qWrIV+fYaK5T2Ckck8="; }; installPhase = '' mkdir -p $out cp -R ./* $out/ - cd $out/ - rm Background.jpg - cp -r ${image} $out/Background.jpg + rm $out/assets/background.jpg + rm $out/assets/avatar.jpg + cp ${image} $out/assets/background.jpg + cp ${avatar} $out/assets/avatar.jpg ''; } diff --git a/flake.lock b/flake.lock index 46dc4b4..264285f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "brigitte": { + "inputs": { + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1774550555, + "narHash": "sha256-ZgRQ2xzBolehSBnpl3y3GOJfr2eYxGtN93kdiuyNn0I=", + "ref": "refs/heads/main", + "rev": "c81f1ff80ec0dd19906fd34ec92a881a36ab4bb3", + "revCount": 53, + "type": "git", + "url": "ssh://git@github.com/Polensky/brigitte" + }, + "original": { + "type": "git", + "url": "ssh://git@github.com/Polensky/brigitte" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -136,7 +155,7 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1770184146, @@ -152,18 +171,34 @@ "type": "github" } }, - "nixpkgs": { + "nixos-hardware": { "locked": { - "lastModified": 1765934234, - "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", + "lastModified": 1774567711, + "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", + "repo": "nixos-hardware", + "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -184,6 +219,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1765934234, + "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af84f9d270d404c17699522fab95bbf928a2d92f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1770562336, "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", @@ -199,7 +250,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", @@ -215,7 +266,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -231,7 +282,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1768395095, "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", @@ -273,8 +324,8 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_5", - "systems": "systems" + "nixpkgs": "nixpkgs_6", + "systems": "systems_2" }, "locked": { "lastModified": 1768464392, @@ -292,10 +343,12 @@ }, "root": { "inputs": { + "brigitte": "brigitte", "disko": "disko", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_3", "noctalia": "noctalia", "sops-nix": "sops-nix", "vimix": "vimix" @@ -303,7 +356,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1770526836, @@ -334,10 +387,43 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "vimix": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nvf": "nvf" }, "locked": { diff --git a/flake.nix b/flake.nix index 782ff0d..727a3d6 100644 --- a/flake.nix +++ b/flake.nix @@ -18,15 +18,21 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + brigitte.url = "git+ssh://git@github.com/Polensky/brigitte"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; outputs = { nixpkgs, nix-darwin, sops-nix, disko, home-manager - , ... }@inputs: { + , nixos-hardware, ... }@inputs: { nixosConfigurations = { default = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; system = "x86_64-linux"; - modules = [ ./devices/xps13/configuration.nix ./modules ]; + modules = [ + nixos-hardware.nixosModules.dell-xps-13-9370 + ./devices/xps13/configuration.nix + ./modules + ]; }; latoure = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; @@ -46,6 +52,7 @@ sops-nix.nixosModules.sops ./devices/server/configuration.nix ./modules + inputs.brigitte.nixosModules.default ]; }; pi = nixpkgs.lib.nixosSystem {