From a2f660db91fce5103747e09e0fa96b6fde8fa599 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 01:11:44 +0300 Subject: [PATCH 0001/1768] add not working configuration --- configuration.nix | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/configuration.nix b/configuration.nix index f1a4b0e..c306fbe 100644 --- a/configuration.nix +++ b/configuration.nix @@ -119,6 +119,63 @@ tlrc ]; + # services.xserver.videoDrivers = ["nvidia"]; # this setting makes my computer crash + + + # Enable OpenGL + hardware.opengl = { + enable = true; + }; + + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = ["nvidia"]; + + hardware.nvidia = { + + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = false; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = false; + + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings`. + nvidiaSettings = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + # package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.legacy_470; + }; + + + hardware.nvidia.prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + # Make sure to use the correct Bus ID values for your system! + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:6:0:0"; + # amdgpuBusId = "PCI:54:0:0"; For AMD GPU + }; + + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; From 63b94588f1ac8520ee966ec713556b84b59b1c3b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 01:12:49 +0300 Subject: [PATCH 0002/1768] enable vim --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index f1a4b0e..29e5e81 100644 --- a/configuration.nix +++ b/configuration.nix @@ -105,7 +105,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + vim wget git gnumake From 14e3b10d97c22a8e38d667539d12c2be331853dc Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 11:50:40 +0300 Subject: [PATCH 0003/1768] add docker and more programs --- configuration.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 29e5e81..6b2116a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -77,18 +77,23 @@ # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; + virtualisation.docker.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.osbm = { isNormalUser = true; description = "osbm"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "networkmanager" "wheel" "docker"]; packages = with pkgs; [ kdePackages.kate vscode discord alacritty - # thunderbird + obsidian + mpv + libreoffice + blender + gimp ]; }; @@ -98,9 +103,11 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; - + # enable nix flakes nix.settings.experimental-features = [ "nix-command" "flakes"]; + # disable the database error TODO add nix-index search + programs.command-not-found.enable = false; # List packages installed in system profile. To search, run: # $ nix search wget @@ -117,6 +124,13 @@ htop unzip tlrc + wakeonlan + neovim + python312 + python312Packages.torch + python312Packages.ipython + python312Packages.numpy + python312Packages.matplotlib ]; # Some programs need SUID wrappers, can be configured further or are From 8a3f7143bc718a8813d82ff4fc6e0e607a6f990f Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 11:58:35 +0300 Subject: [PATCH 0004/1768] add makefile --- Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c4264f2 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ + + +check-status: + @if [ -n "$$(git status --porcelain)" ]; then \ + echo "Error: You have untracked or modified files. Please commit or stash your changes."; \ + exit 1; \ + fi + echo Git is clean. :) + +build: check-status + NIXOS_LABEL := $(shell git rev-parse HEAD) + sudo nixos-rebuild switch --flake . From 7c6b6783e731e13d68589af914c666134993d74e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 11:59:26 +0300 Subject: [PATCH 0005/1768] fix echo output --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c4264f2..7bbdae6 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ check-status: echo "Error: You have untracked or modified files. Please commit or stash your changes."; \ exit 1; \ fi - echo Git is clean. :) + echo "Git is clean. :)" build: check-status NIXOS_LABEL := $(shell git rev-parse HEAD) From c7d63609dad75ae7a9aa8211b2a9349248d88980 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 12:03:19 +0300 Subject: [PATCH 0006/1768] try new makefile command --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7bbdae6..61476b8 100644 --- a/Makefile +++ b/Makefile @@ -8,5 +8,9 @@ check-status: echo "Git is clean. :)" build: check-status - NIXOS_LABEL := $(shell git rev-parse HEAD) - sudo nixos-rebuild switch --flake . + @NIXOS_LABEL=$$(git rev-parse HEAD) && \ + echo "Setting NixOS label to commit hash: $$NIXOS_LABEL" && \ + sudo nixos-rebuild switch --flake . --arg config "'{ system.label = \"$$NIXOS_LABEL\"; }'" + + +.PHONY: check-status build From 1dfeae2df6733b15bfa73fa7a22eae0b5e752e08 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 12:04:34 +0300 Subject: [PATCH 0007/1768] try new makefile command --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 61476b8..1c5577d 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ check-status: build: check-status @NIXOS_LABEL=$$(git rev-parse HEAD) && \ echo "Setting NixOS label to commit hash: $$NIXOS_LABEL" && \ - sudo nixos-rebuild switch --flake . --arg config "'{ system.label = \"$$NIXOS_LABEL\"; }'" + sudo nixos-rebuild switch --flake . .PHONY: check-status build From e94a1ca091d37feeb1f2e0d5c67068d4d1453967 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 12:16:06 +0300 Subject: [PATCH 0008/1768] add fonts --- configuration.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configuration.nix b/configuration.nix index 6b2116a..f7b18b4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -21,6 +21,18 @@ # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + proggyfonts + ]; + # Enable networking networking.networkmanager.enable = true; From 12202c880e091b770e6005af0961ec201603aa18 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Oct 2024 12:19:30 +0300 Subject: [PATCH 0009/1768] please just work --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1c5577d..b8d3a1e 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,6 @@ check-status: echo "Git is clean. :)" build: check-status - @NIXOS_LABEL=$$(git rev-parse HEAD) && \ - echo "Setting NixOS label to commit hash: $$NIXOS_LABEL" && \ - sudo nixos-rebuild switch --flake . - + @NIXOS_LABEL=$$(git rev-parse HEAD) sudo nixos-rebuild switch --flake . .PHONY: check-status build From 7c05b50e493cfd7f4144d8b578cd72495d4ec78b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Oct 2024 21:48:26 +0300 Subject: [PATCH 0010/1768] add steam and fix python packages --- configuration.nix | 19 ++++++++++++++----- flake.nix | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/configuration.nix b/configuration.nix index f7b18b4..b702abb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -121,6 +121,14 @@ # disable the database error TODO add nix-index search programs.command-not-found.enable = false; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; + + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -138,11 +146,12 @@ tlrc wakeonlan neovim - python312 - python312Packages.torch - python312Packages.ipython - python312Packages.numpy - python312Packages.matplotlib + (pkgs.python312.withPackages (ppkgs: [ + python312Packages.torch + python312Packages.ipython + python312Packages.numpy + python312Packages.matplotlib + ])) ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/flake.nix b/flake.nix index e2e981d..5fb76c8 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ tartarus = lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix ]; + # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; }; }; From 80841a9f8b5c76ee2b157ccad6944fd7d10f15f9 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Oct 2024 21:59:31 +0300 Subject: [PATCH 0011/1768] add plans to readme --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 53d09dc..7042f45 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,23 @@ # nix-configuration -The nix configuration +The nix configuration of mine. I am trying to find a very suitable workplace for myself. If i can get to be as comfortable as i am in Arch Linux I will switch to the NixOS on my Desktop too. + + +But There are couple of things i need to do before: + +- [ ] add git hash to the nixos build generations +- [ ] fix cuda drivers + - [ ] fix nvidia-smi command + - [ ] compile a cuda program successfully + - [ ] build a python package with embedded cuda and run successfully +- [ ] learn how to deal with development environments +- [ ] learn how to write derivations for cpp projects +- [ ] configure hyprland +- [ ] disk encryption +- [ ] ssh gpg secret backup +- [ ] add unstable channels to the flake.nix +- [ ] home manager setup without translating every line in my configs to nix options. (tldr just symlink files the nix way) +- [ ] add japanese IME fcitx5 mosc +- [ ] add beautifier to the nix code. +- [ ] make an ISO file with my configurations +- [ ] make a github action that tests if my configuration is gonna build successfully or not +- [ ] learn cache management From fe6f3dc37ce0e799956555c7488602da5add2d00 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Oct 2024 11:22:01 +0300 Subject: [PATCH 0012/1768] enable ssh --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index b702abb..198a921 100644 --- a/configuration.nix +++ b/configuration.nix @@ -165,7 +165,7 @@ # List services that you want to enable: # Enable the OpenSSH daemon. - # services.openssh.enable = true; + services.openssh.enable = true; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; From 9dd8c3d9933e2480afc973f678933c5b703b9b8e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Oct 2024 12:17:51 +0300 Subject: [PATCH 0013/1768] update flake --- configuration.nix | 11 ++++++++++- flake.lock | 6 +++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index 198a921..62bf8ad 100644 --- a/configuration.nix +++ b/configuration.nix @@ -152,6 +152,7 @@ python312Packages.numpy python312Packages.matplotlib ])) + # fcitx5-mosc ]; # Some programs need SUID wrappers, can be configured further or are @@ -161,7 +162,15 @@ # enable = true; # enableSSHSupport = true; # }; - + i18n.inputMethod = { + enabled = "fcitx5"; + # waylandFrontend = true; + fcitx5.addons = with pkgs; [ + fcitx5-gtk # alternatively, kdePackages.fcitx5-qt + # fcitx5-mosc # table input method support + fcitx5-nord # a color theme + ]; + }; # List services that you want to enable: # Enable the OpenSSH daemon. diff --git a/flake.lock b/flake.lock index b86cf5b..bbe9299 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { From 5697c0a054e6277eb653dfaaa0f7538e39bc13e6 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 16 Oct 2024 23:40:34 +0300 Subject: [PATCH 0014/1768] added unstable branch --- configuration.nix | 3 ++- flake.lock | 19 ++++++++++++++++++- flake.nix | 20 +++++++++++++++----- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 62bf8ad..505b026 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, pkgs-unstable, ... }: { imports = @@ -153,6 +153,7 @@ python312Packages.matplotlib ])) # fcitx5-mosc + pkgs-unstable.ani-cli ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/flake.lock b/flake.lock index bbe9299..3757bfe 100644 --- a/flake.lock +++ b/flake.lock @@ -16,9 +16,26 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 5fb76c8..7e466af 100644 --- a/flake.nix +++ b/flake.nix @@ -3,16 +3,26 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + }; - outputs = { self, nixpkgs, ... }: - let - lib = nixpkgs.lib; - in { + outputs = inputs@{ + self, + nixpkgs, + nixpkgs-unstable, + ... + }: { nixosConfigurations = { - tartarus = lib.nixosSystem { + tartarus = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ ./configuration.nix ]; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + }; # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; }; From c60c642e928a52e48da5e0911c28a3242f7e97b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 16 Oct 2024 23:41:12 +0300 Subject: [PATCH 0015/1768] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7042f45..2845567 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ But There are couple of things i need to do before: - [ ] configure hyprland - [ ] disk encryption - [ ] ssh gpg secret backup -- [ ] add unstable channels to the flake.nix +- [x] add unstable channels to the flake.nix - [ ] home manager setup without translating every line in my configs to nix options. (tldr just symlink files the nix way) - [ ] add japanese IME fcitx5 mosc - [ ] add beautifier to the nix code. From d515b7b31f6e601aaab22b2f258a34ec2d7e8be1 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 16 Oct 2024 23:46:06 +0300 Subject: [PATCH 0016/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3757bfe..8a5c1c1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { From f20a9e2884d02b1f72521be4a0a6482bbf66ce63 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 16 Oct 2024 23:51:53 +0300 Subject: [PATCH 0017/1768] try if this will work --- flake.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 7e466af..720795f 100644 --- a/flake.nix +++ b/flake.nix @@ -14,16 +14,16 @@ ... }: { nixosConfigurations = { + revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; tartarus = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ ./configuration.nix ]; - specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - }; - # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + }; }; }; }; From 1fbb779c9a1f8c399a5f3c7ac99af44e1ec347f5 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 00:19:19 +0300 Subject: [PATCH 0018/1768] also save git hash to nixos generations --- README.md | 2 +- configuration.nix | 3 ++- flake.nix | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2845567..792caac 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The nix configuration of mine. I am trying to find a very suitable workplace for But There are couple of things i need to do before: -- [ ] add git hash to the nixos build generations +- [x] add git hash to the nixos build generations - [ ] fix cuda drivers - [ ] fix nvidia-smi command - [ ] compile a cuda program successfully diff --git a/configuration.nix b/configuration.nix index 505b026..19774ec 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, pkgs-unstable, system-label, ... }: { imports = @@ -182,6 +182,7 @@ # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; + system.nixos.label = system-label; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/flake.nix b/flake.nix index 720795f..c22eac7 100644 --- a/flake.nix +++ b/flake.nix @@ -14,15 +14,16 @@ ... }: { nixosConfigurations = { - revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; tartarus = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ ./configuration.nix ]; specialArgs = { - pkgs-unstable = import nixpkgs-unstable { + pkgs-unstable = import nixpkgs-unstable { inherit system; config.allowUnfree = true; }; + system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; }; }; From 3cd05610a21b0f1c8dd589a4797e1c0de12c413c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 00:26:11 +0300 Subject: [PATCH 0019/1768] enable auto gc --- configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configuration.nix b/configuration.nix index 19774ec..26668f8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -118,6 +118,12 @@ # enable nix flakes nix.settings.experimental-features = [ "nix-command" "flakes"]; + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + # disable the database error TODO add nix-index search programs.command-not-found.enable = false; From 45c2b909d92fcf42b662387b03aa6be57236984b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 00:27:54 +0300 Subject: [PATCH 0020/1768] check another item --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 792caac..d4004a2 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,5 @@ But There are couple of things i need to do before: - [ ] add beautifier to the nix code. - [ ] make an ISO file with my configurations - [ ] make a github action that tests if my configuration is gonna build successfully or not -- [ ] learn cache management +- [x] learn cache management + From 924a5c3631dc0c2d0aa0d74365d05533c5434e42 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 00:34:08 +0300 Subject: [PATCH 0021/1768] add nerdfonts --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 26668f8..7bc07ff 100644 --- a/configuration.nix +++ b/configuration.nix @@ -30,6 +30,7 @@ fira-code-symbols mplus-outline-fonts.githubRelease dina-font + nerdfonts proggyfonts ]; From 1eab0743095f4a93ba7aee91bb8d92fc6d48f07e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 00:36:03 +0300 Subject: [PATCH 0022/1768] stupid typo --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 7bc07ff..69d885f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -175,7 +175,7 @@ # waylandFrontend = true; fcitx5.addons = with pkgs; [ fcitx5-gtk # alternatively, kdePackages.fcitx5-qt - # fcitx5-mosc # table input method support + fcitx5-mozc # table input method support fcitx5-nord # a color theme ]; }; From 8e444bc7384fc58c305d4ba42355e2911de4bc97 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 00:37:52 +0300 Subject: [PATCH 0023/1768] check another item --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4004a2..bdd4fb7 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ But There are couple of things i need to do before: - [ ] ssh gpg secret backup - [x] add unstable channels to the flake.nix - [ ] home manager setup without translating every line in my configs to nix options. (tldr just symlink files the nix way) -- [ ] add japanese IME fcitx5 mosc +- [x] add japanese IME fcitx5 mosc - [ ] add beautifier to the nix code. - [ ] make an ISO file with my configurations - [ ] make a github action that tests if my configuration is gonna build successfully or not From 21ef79fbe4f656a08832a825d53e00e5b90883ff Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 23:16:00 +0300 Subject: [PATCH 0024/1768] japanese dates --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 69d885f..0ac3037 100644 --- a/configuration.nix +++ b/configuration.nix @@ -52,7 +52,7 @@ LC_NUMERIC = "tr_TR.UTF-8"; LC_PAPER = "tr_TR.UTF-8"; LC_TELEPHONE = "tr_TR.UTF-8"; - LC_TIME = "tr_TR.UTF-8"; + LC_TIME = "ja_JP.UTF-8"; }; # Enable the X11 windowing system. From 3dcfac30663a6edf19b274490e3a5c402f2933c9 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Oct 2024 23:17:15 +0300 Subject: [PATCH 0025/1768] no need for this now --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8d3a1e..48279ac 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,6 @@ check-status: echo "Git is clean. :)" build: check-status - @NIXOS_LABEL=$$(git rev-parse HEAD) sudo nixos-rebuild switch --flake . + sudo nixos-rebuild switch --flake . .PHONY: check-status build From 0e00b442e116807d8a6d4ed24523600514675f71 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 18 Oct 2024 00:01:32 +0300 Subject: [PATCH 0026/1768] applied nixfmt --- configuration.nix | 29 +++++++++++++++-------------- flake.nix | 30 +++++++++++++----------------- 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/configuration.nix b/configuration.nix index 0ac3037..243536a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,10 +5,9 @@ { config, pkgs, pkgs-unstable, system-label, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -96,7 +95,7 @@ users.users.osbm = { isNormalUser = true; description = "osbm"; - extraGroups = [ "networkmanager" "wheel" "docker"]; + extraGroups = [ "networkmanager" "wheel" "docker" ]; packages = with pkgs; [ kdePackages.kate vscode @@ -117,7 +116,7 @@ nixpkgs.config.allowUnfree = true; # enable nix flakes - nix.settings.experimental-features = [ "nix-command" "flakes"]; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.gc = { automatic = true; @@ -130,12 +129,14 @@ programs.steam = { enable = true; - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + remotePlay.openFirewall = + true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = + true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = + true; # Open ports in the firewall for Steam Local Network Game Transfers }; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ @@ -174,11 +175,11 @@ enabled = "fcitx5"; # waylandFrontend = true; fcitx5.addons = with pkgs; [ - fcitx5-gtk # alternatively, kdePackages.fcitx5-qt - fcitx5-mozc # table input method support - fcitx5-nord # a color theme + fcitx5-gtk # alternatively, kdePackages.fcitx5-qt + fcitx5-mozc # table input method support + fcitx5-nord # a color theme ]; - }; + }; # List services that you want to enable: # Enable the OpenSSH daemon. diff --git a/flake.nix b/flake.nix index c22eac7..aa361a3 100644 --- a/flake.nix +++ b/flake.nix @@ -7,25 +7,21 @@ }; - outputs = inputs@{ - self, - nixpkgs, - nixpkgs-unstable, - ... - }: { - nixosConfigurations = { - # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; - tartarus = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ ./configuration.nix ]; - specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, ... }: { + nixosConfigurations = { + # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + tartarus = nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + modules = [ ./configuration.nix ]; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; }; + system-label = + self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; }; }; + }; } From 277297ebe511cceb76123529c0c4997601025175 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 18 Oct 2024 10:18:38 +0300 Subject: [PATCH 0027/1768] add new packages --- configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration.nix b/configuration.nix index 243536a..5480872 100644 --- a/configuration.nix +++ b/configuration.nix @@ -162,6 +162,9 @@ ])) # fcitx5-mosc pkgs-unstable.ani-cli + obs-studio + audacity + btop ]; # Some programs need SUID wrappers, can be configured further or are From c68042698ef1120f2030ecd06c64db2533c44151 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 18 Oct 2024 11:01:42 +0300 Subject: [PATCH 0028/1768] add kitty --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 5480872..359950d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -106,6 +106,7 @@ libreoffice blender gimp + kitty ]; }; From c433343afe8a47d85a4e05f8d28b92737a90c75e Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 18 Oct 2024 22:22:16 +0300 Subject: [PATCH 0029/1768] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8a5c1c1..5684098 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1728909085, - "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", + "lastModified": 1729044727, + "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", + "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729070438, + "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5785b6bb5eaae44e627d541023034e1601455827", "type": "github" }, "original": { From 66e0d89ba879c6eabf80b0b99474dab060523146 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 18 Oct 2024 22:42:14 +0300 Subject: [PATCH 0030/1768] add pciutils --- configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/configuration.nix b/configuration.nix index 359950d..ffbca11 100644 --- a/configuration.nix +++ b/configuration.nix @@ -166,6 +166,7 @@ obs-studio audacity btop + pciutils ]; # Some programs need SUID wrappers, can be configured further or are From 5a1c159abf8921ab051f0e5b40f18fe86185dff9 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 24 Oct 2024 16:39:51 +0300 Subject: [PATCH 0031/1768] add nodejs --- configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configuration.nix b/configuration.nix index ffbca11..749e898 100644 --- a/configuration.nix +++ b/configuration.nix @@ -167,6 +167,8 @@ audacity btop pciutils + nodePackages.npm + nodejs ]; # Some programs need SUID wrappers, can be configured further or are From 9b75c8036d9fd72ab65de10fdb3a41de27a64506 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 18:05:38 +0300 Subject: [PATCH 0032/1768] try out modular system configuration --- flake.nix | 2 +- .../tartarus/configuration.nix | 14 +------------- .../tartarus/hardware-configuration.nix | 0 3 files changed, 2 insertions(+), 14 deletions(-) rename configuration.nix => hosts/tartarus/configuration.nix (96%) rename hardware-configuration.nix => hosts/tartarus/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix index aa361a3..5d52268 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; tartarus = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - modules = [ ./configuration.nix ]; + modules = [ ./hosts/tartarus/configuration.nix ]; specialArgs = { pkgs-unstable = import nixpkgs-unstable { inherit system; diff --git a/configuration.nix b/hosts/tartarus/configuration.nix similarity index 96% rename from configuration.nix rename to hosts/tartarus/configuration.nix index 749e898..7142864 100644 --- a/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -7,6 +7,7 @@ { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ../../common/fonts.nix ]; # Bootloader. @@ -20,19 +21,6 @@ # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - nerdfonts - proggyfonts - ]; - # Enable networking networking.networkmanager.enable = true; diff --git a/hardware-configuration.nix b/hosts/tartarus/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to hosts/tartarus/hardware-configuration.nix From 309d4730e827c2ff576abc6e00080eecf8d07c45 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 18:07:29 +0300 Subject: [PATCH 0033/1768] also commit fonts file --- common/fonts.nix | 16 ++++++++++++++++ hosts/tartarus/configuration.nix | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 common/fonts.nix diff --git a/common/fonts.nix b/common/fonts.nix new file mode 100644 index 0000000..cda4193 --- /dev/null +++ b/common/fonts.nix @@ -0,0 +1,16 @@ +{ pkgs, lib, config, ... }: { + + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + nerdfonts + proggyfonts + ]; + +} \ No newline at end of file diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 7142864..19dc58b 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -5,7 +5,7 @@ { config, pkgs, pkgs-unstable, system-label, ... }: { - imports = [ # Include the results of the hardware scan. + imports = [ ./hardware-configuration.nix ../../common/fonts.nix ]; From b7a4ae6a186a147bb52059999827430f673eb43c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 18:16:39 +0300 Subject: [PATCH 0034/1768] seperate out nix settings --- common/nix-settings.nix | 18 ++++++++++++++++++ hosts/tartarus/configuration.nix | 16 +--------------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 common/nix-settings.nix diff --git a/common/nix-settings.nix b/common/nix-settings.nix new file mode 100644 index 0000000..c2aef9d --- /dev/null +++ b/common/nix-settings.nix @@ -0,0 +1,18 @@ +{ pkgs, lib, config, ... }: { + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # enable nix flakes + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + + # disable the database error TODO add nix-index search + programs.command-not-found.enable = false; + +} \ No newline at end of file diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 19dc58b..aaa34c8 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -8,6 +8,7 @@ imports = [ ./hardware-configuration.nix ../../common/fonts.nix + ../../common/nix-settings.nix ]; # Bootloader. @@ -101,21 +102,6 @@ # Install firefox. programs.firefox.enable = true; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - # enable nix flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - - # disable the database error TODO add nix-index search - programs.command-not-found.enable = false; - programs.steam = { enable = true; remotePlay.openFirewall = From 505fc302c8f2bae425324545de50272757c2fa74 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 18:20:49 +0300 Subject: [PATCH 0035/1768] seperate i18n --- common/i18n.nix | 36 ++++++++++++++++++++++++++++ hosts/tartarus/configuration.nix | 41 ++++---------------------------- 2 files changed, 40 insertions(+), 37 deletions(-) create mode 100644 common/i18n.nix diff --git a/common/i18n.nix b/common/i18n.nix new file mode 100644 index 0000000..d1e20a1 --- /dev/null +++ b/common/i18n.nix @@ -0,0 +1,36 @@ +{ pkgs, lib, config, ... }: { + + time.timeZone = "Europe/Istanbul"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "tr_TR.UTF-8"; + LC_IDENTIFICATION = "tr_TR.UTF-8"; + LC_MEASUREMENT = "tr_TR.UTF-8"; + LC_MONETARY = "tr_TR.UTF-8"; + LC_NAME = "tr_TR.UTF-8"; + LC_NUMERIC = "tr_TR.UTF-8"; + LC_PAPER = "tr_TR.UTF-8"; + LC_TELEPHONE = "tr_TR.UTF-8"; + LC_TIME = "ja_JP.UTF-8"; + }; + + + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + i18n.inputMethod = { + enabled = "fcitx5"; + # waylandFrontend = true; + fcitx5.addons = with pkgs; [ + fcitx5-gtk # alternatively, kdePackages.fcitx5-qt + fcitx5-mozc # table input method support + fcitx5-nord # a color theme + ]; + }; + +} \ No newline at end of file diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index aaa34c8..856705b 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -9,6 +9,7 @@ ./hardware-configuration.nix ../../common/fonts.nix ../../common/nix-settings.nix + ../../common/i18n.nix ]; # Bootloader. @@ -25,23 +26,6 @@ # Enable networking networking.networkmanager.enable = true; - # Set your time zone. - time.timeZone = "Europe/Istanbul"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "tr_TR.UTF-8"; - LC_IDENTIFICATION = "tr_TR.UTF-8"; - LC_MEASUREMENT = "tr_TR.UTF-8"; - LC_MONETARY = "tr_TR.UTF-8"; - LC_NAME = "tr_TR.UTF-8"; - LC_NUMERIC = "tr_TR.UTF-8"; - LC_PAPER = "tr_TR.UTF-8"; - LC_TELEPHONE = "tr_TR.UTF-8"; - LC_TIME = "ja_JP.UTF-8"; - }; # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. @@ -51,11 +35,6 @@ services.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; # Enable CUPS to print documents. services.printing.enable = true; @@ -68,12 +47,6 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; }; # Enable touchpad support (enabled default in most desktopManager). @@ -133,6 +106,8 @@ python312Packages.torch python312Packages.ipython python312Packages.numpy + python312Packages.pandas + python312Packages.seaborn python312Packages.matplotlib ])) # fcitx5-mosc @@ -152,15 +127,7 @@ # enable = true; # enableSSHSupport = true; # }; - i18n.inputMethod = { - enabled = "fcitx5"; - # waylandFrontend = true; - fcitx5.addons = with pkgs; [ - fcitx5-gtk # alternatively, kdePackages.fcitx5-qt - fcitx5-mozc # table input method support - fcitx5-nord # a color theme - ]; - }; + # List services that you want to enable: # Enable the OpenSSH daemon. From 8474adec6bba40e44dd12ef44e8001b0bd03c70f Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 18:49:33 +0300 Subject: [PATCH 0036/1768] seperate out python --- common/python.nix | 17 +++++++++++++++++ hosts/tartarus/configuration.nix | 16 +++------------- 2 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 common/python.nix diff --git a/common/python.nix b/common/python.nix new file mode 100644 index 0000000..92b8a76 --- /dev/null +++ b/common/python.nix @@ -0,0 +1,17 @@ +{ pkgs, lib, config, ... }: { + + + environment.systemPackages = with pkgs; [ + (pkgs.python312.withPackages (ppkgs: [ + python312Packages.torch + python312Packages.ipython + python312Packages.numpy + python312Packages.pandas + python312Packages.seaborn + python312Packages.matplotlib + ])) + pyenv + ]; + + +} \ No newline at end of file diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 856705b..ba2b460 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -10,6 +10,7 @@ ../../common/fonts.nix ../../common/nix-settings.nix ../../common/i18n.nix + ../../common/python.nix ]; # Bootloader. @@ -69,6 +70,8 @@ blender gimp kitty + obs-studio + audacity ]; }; @@ -85,8 +88,6 @@ true; # Open ports in the firewall for Steam Local Network Game Transfers }; - # List packages installed in system profile. To search, run: - # $ nix search wget environment.systemPackages = with pkgs; [ vim wget @@ -102,18 +103,7 @@ tlrc wakeonlan neovim - (pkgs.python312.withPackages (ppkgs: [ - python312Packages.torch - python312Packages.ipython - python312Packages.numpy - python312Packages.pandas - python312Packages.seaborn - python312Packages.matplotlib - ])) - # fcitx5-mosc pkgs-unstable.ani-cli - obs-studio - audacity btop pciutils nodePackages.npm From ca4fd1a72e30874d446f2f02f8291f9e32abf5eb Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 18:52:08 +0300 Subject: [PATCH 0037/1768] add python 11 --- common/python.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/python.nix b/common/python.nix index 92b8a76..7fb535d 100644 --- a/common/python.nix +++ b/common/python.nix @@ -10,6 +10,14 @@ python312Packages.seaborn python312Packages.matplotlib ])) + (pkgs.python311.withPackages (ppkgs: [ + python311Packages.torch + python311Packages.ipython + python311Packages.numpy + python311Packages.pandas + python311Packages.seaborn + python311Packages.matplotlib + ])) pyenv ]; From 72c98c78c8a79d53c79588019167cc7bcee492ae Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 18:58:39 +0300 Subject: [PATCH 0038/1768] add pip --- common/python.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/python.nix b/common/python.nix index 7fb535d..b271b23 100644 --- a/common/python.nix +++ b/common/python.nix @@ -3,6 +3,7 @@ environment.systemPackages = with pkgs; [ (pkgs.python312.withPackages (ppkgs: [ + python312Packages.pip python312Packages.torch python312Packages.ipython python312Packages.numpy @@ -11,6 +12,7 @@ python312Packages.matplotlib ])) (pkgs.python311.withPackages (ppkgs: [ + python311Packages.pip python311Packages.torch python311Packages.ipython python311Packages.numpy From 687d91f5cba8feb4315e3c38cd91d09e3c2ce5f9 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 19:19:21 +0300 Subject: [PATCH 0039/1768] add jax --- common/python.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/python.nix b/common/python.nix index b271b23..47d92f2 100644 --- a/common/python.nix +++ b/common/python.nix @@ -10,6 +10,7 @@ python312Packages.pandas python312Packages.seaborn python312Packages.matplotlib + python312Packages.jax ])) (pkgs.python311.withPackages (ppkgs: [ python311Packages.pip @@ -19,6 +20,7 @@ python311Packages.pandas python311Packages.seaborn python311Packages.matplotlib + python311Packages.jax ])) pyenv ]; From 6de30c0f0fe81a0bd578c9496dcfb25bc10f3d87 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 19:31:16 +0300 Subject: [PATCH 0040/1768] add vscode server --- flake.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 5d52268..fa55dff 100644 --- a/flake.nix +++ b/flake.nix @@ -5,14 +5,22 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + vscode-server.url = "github:nix-community/nixos-vscode-server"; + }; - outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, ... }: { + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, ... }: { nixosConfigurations = { # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; tartarus = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; - modules = [ ./hosts/tartarus/configuration.nix ]; + modules = [ + ./hosts/tartarus/configuration.nix + vscode-server.nixosModules.default + ({ config, pkgs, ... }: { + services.vscode-server.enable = true; + }) + ]; specialArgs = { pkgs-unstable = import nixpkgs-unstable { inherit system; From ff733924511a85cc350894e231741654fb1d7c85 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 19:58:15 +0300 Subject: [PATCH 0041/1768] add jupyter --- common/python.nix | 2 ++ flake.lock | 69 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/common/python.nix b/common/python.nix index 47d92f2..9685817 100644 --- a/common/python.nix +++ b/common/python.nix @@ -11,6 +11,8 @@ python312Packages.seaborn python312Packages.matplotlib python312Packages.jax + python312Packages.jupyter + python312Packages.jupyterlab ])) (pkgs.python311.withPackages (ppkgs: [ python311Packages.pip diff --git a/flake.lock b/flake.lock index 5684098..b156ec0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1729044727, @@ -32,10 +50,59 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1682134069, + "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "vscode-server": "vscode-server" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "vscode-server": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1729422940, + "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=", + "owner": "nix-community", + "repo": "nixos-vscode-server", + "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-vscode-server", + "type": "github" } } }, From 33c25072f420878bef4d24f66a4ad836f5e3d125 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 20:00:07 +0300 Subject: [PATCH 0042/1768] remove jupyter --- common/python.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/common/python.nix b/common/python.nix index 9685817..7e44a65 100644 --- a/common/python.nix +++ b/common/python.nix @@ -12,7 +12,6 @@ python312Packages.matplotlib python312Packages.jax python312Packages.jupyter - python312Packages.jupyterlab ])) (pkgs.python311.withPackages (ppkgs: [ python311Packages.pip From 335bce576da9b4a702be7c3d6f52c7fe941df517 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Oct 2024 20:01:36 +0300 Subject: [PATCH 0043/1768] remove jupyter --- common/python.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/common/python.nix b/common/python.nix index 7e44a65..47d92f2 100644 --- a/common/python.nix +++ b/common/python.nix @@ -11,7 +11,6 @@ python312Packages.seaborn python312Packages.matplotlib python312Packages.jax - python312Packages.jupyter ])) (pkgs.python311.withPackages (ppkgs: [ python311Packages.pip From 27d93ac91e0fe8fa6c0c3a39463c2988350112be Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Oct 2024 14:03:09 +0300 Subject: [PATCH 0044/1768] add cloc --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ba2b460..4dd69ae 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -108,6 +108,7 @@ pciutils nodePackages.npm nodejs + cloc ]; # Some programs need SUID wrappers, can be configured further or are From 23ede7878fed96981f249eeec1deabf02281e4d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Oct 2024 14:17:24 +0300 Subject: [PATCH 0045/1768] add very important programs --- hosts/tartarus/configuration.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 4dd69ae..6e9304d 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -109,6 +109,13 @@ nodePackages.npm nodejs cloc + neofetch + cbonsai + cowsay + fortune + lolcat + cmatrix + inxi ]; # Some programs need SUID wrappers, can be configured further or are From d7a7f2d1296fefafab1b3ffa89810982905744d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Nov 2024 15:41:46 +0300 Subject: [PATCH 0046/1768] add sops-nix --- flake.lock | 38 ++++++++++++++++++++++++++++++++++++++ flake.nix | 6 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index b156ec0..e30fde4 100644 --- a/flake.lock +++ b/flake.lock @@ -34,6 +34,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1729070438, @@ -68,9 +84,31 @@ "inputs": { "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "sops-nix": "sops-nix", "vscode-server": "vscode-server" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index fa55dff..e8a3d93 100644 --- a/flake.nix +++ b/flake.nix @@ -7,9 +7,12 @@ vscode-server.url = "github:nix-community/nixos-vscode-server"; + sops-nix.url = "github:Mic92/sops-nix"; + sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + }; - outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, ... }: { + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, sops-nix, ... }: { nixosConfigurations = { # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; tartarus = nixpkgs.lib.nixosSystem rec { @@ -20,6 +23,7 @@ ({ config, pkgs, ... }: { services.vscode-server.enable = true; }) + sops-nix.nixosModules.sops ]; specialArgs = { pkgs-unstable = import nixpkgs-unstable { From 8dac48fe9a52f1e7b4ee4c5dfe97ec29418fcc35 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Nov 2024 15:41:57 +0300 Subject: [PATCH 0047/1768] add gpg --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 6e9304d..6c38adb 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -116,6 +116,7 @@ lolcat cmatrix inxi + gnupg ]; # Some programs need SUID wrappers, can be configured further or are From 91520ff8c2896b2fceb6815e7b61344b450ef058 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Nov 2024 16:03:56 +0300 Subject: [PATCH 0048/1768] add encryption tools --- hosts/tartarus/configuration.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 6c38adb..0fca01c 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -116,16 +116,17 @@ lolcat cmatrix inxi - gnupg + age + sops ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; # List services that you want to enable: From d8751c2c299b008fbb4f35bccfba7c353c66197b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Nov 2024 17:10:56 +0300 Subject: [PATCH 0049/1768] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e30fde4..766c3fd 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { From 9ed2c0d2c6941fda1a7d9c58a49ffda13a3c509a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Nov 2024 00:08:11 +0300 Subject: [PATCH 0050/1768] unstable discord --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 0fca01c..6244463 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -62,7 +62,7 @@ packages = with pkgs; [ kdePackages.kate vscode - discord + pkgs-unstable.discord # discord sucks alacritty obsidian mpv From 375afdad48b381ee29d203b6ccda487db4c9bce1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Nov 2024 01:12:26 +0300 Subject: [PATCH 0051/1768] update to-do list --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bdd4fb7..4aa9078 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ But There are couple of things i need to do before: - [ ] learn how to deal with development environments - [ ] learn how to write derivations for cpp projects - [ ] configure hyprland -- [ ] disk encryption -- [ ] ssh gpg secret backup +- [ ] disk encryption with disko +- [ ] ssh gpg secret backup with sops - [x] add unstable channels to the flake.nix - [ ] home manager setup without translating every line in my configs to nix options. (tldr just symlink files the nix way) - [x] add japanese IME fcitx5 mosc @@ -21,4 +21,5 @@ But There are couple of things i need to do before: - [ ] make an ISO file with my configurations - [ ] make a github action that tests if my configuration is gonna build successfully or not - [x] learn cache management +- [ ] add stylix From eafe7ac300c388bed006bf22c10d499621c4a868 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Nov 2024 01:48:53 +0300 Subject: [PATCH 0052/1768] set nixpath to current nixpkgs --- common/nix-settings.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index c2aef9d..4eeb821 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -12,7 +12,11 @@ options = "--delete-older-than 30d"; }; + nix.nixPath = [ "nixpkgs=${pkgs.path}" ]; + + # disable the database error TODO add nix-index search programs.command-not-found.enable = false; -} \ No newline at end of file +} + From 9dc9b62553748497cb86db3894dd62df1cea6743 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Nov 2024 22:13:51 +0300 Subject: [PATCH 0053/1768] add torrent client --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 6244463..93797a2 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -72,6 +72,7 @@ kitty obs-studio audacity + qbittorrent ]; }; From 4bd48e99b4fbdfbbab81a4da3b9ee710125fd2f2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 3 Nov 2024 03:35:39 +0300 Subject: [PATCH 0054/1768] add jq --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 93797a2..8f415d6 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -119,6 +119,7 @@ inxi age sops + jq ]; # Some programs need SUID wrappers, can be configured further or are From d17fc15b46b11d7839e90ea9a91ddbf933a43b11 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 3 Nov 2024 04:29:55 +0300 Subject: [PATCH 0055/1768] add onefetch --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 8f415d6..538c73a 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -120,6 +120,7 @@ age sops jq + onefetch ]; # Some programs need SUID wrappers, can be configured further or are From 0aa1df6a9f3bdbeee66746b946f1ecd30269e09b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 4 Nov 2024 23:21:29 +0300 Subject: [PATCH 0056/1768] add just --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 538c73a..6e3884a 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -121,6 +121,7 @@ sops jq onefetch + just ]; # Some programs need SUID wrappers, can be configured further or are From f8e7db7eee89179f8b8e3a2bea579c0044d4d520 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 5 Nov 2024 18:14:20 +0300 Subject: [PATCH 0057/1768] update flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 766c3fd..0b2818e 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1730602179, + "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "type": "github" }, "original": { @@ -96,11 +96,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729999681, - "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", + "lastModified": 1730746162, + "narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", + "rev": "59d6988329626132eaf107761643f55eb979eef1", "type": "github" }, "original": { From f1f037878e4fc20aa90e01959c7fc705dfcaeecd Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 5 Nov 2024 22:03:47 +0300 Subject: [PATCH 0058/1768] disable qbittorrent --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 6e3884a..50cb088 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -72,7 +72,7 @@ kitty obs-studio audacity - qbittorrent + # qbittorrent ]; }; From 4ab1538fa3bb8303fc80bcb9a03753373c95f95b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Nov 2024 15:34:55 +0300 Subject: [PATCH 0059/1768] add arduino ide --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 50cb088..7077ec3 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -73,6 +73,7 @@ obs-studio audacity # qbittorrent + arduino-ide ]; }; From 528b955c06591370a44c65f2ec718cf355088392 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Nov 2024 15:52:29 +0300 Subject: [PATCH 0060/1768] add stylix --- flake.lock | 286 ++++++++++++++++++++++++++++++- flake.nix | 4 +- hosts/tartarus/configuration.nix | 7 + 3 files changed, 287 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 0b2818e..446d4cb 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,111 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1708890466, + "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "665b3c6748534eb766c777298721cece9453fdae", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -18,6 +121,60 @@ "type": "github" } }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1689549921, + "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "46.1", + "repo": "gnome-shell", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1730741070, @@ -52,11 +209,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -67,6 +224,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -85,6 +258,7 @@ "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", + "stylix": "stylix", "vscode-server": "vscode-server" } }, @@ -96,11 +270,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730746162, - "narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=", + "lastModified": 1730883027, + "narHash": "sha256-pvXMOJIqRW0trsW+FzRMl6d5PbsM4rWfD5lcKCOrrwI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "59d6988329626132eaf107761643f55eb979eef1", + "rev": "c5ae1e214ff935f2d3593187a131becb289ea639", "type": "github" }, "original": { @@ -109,6 +283,36 @@ "type": "github" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", + "systems": "systems", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" + }, + "locked": { + "lastModified": 1729963473, + "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", + "owner": "danth", + "repo": "stylix", + "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -124,10 +328,74 @@ "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" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index e8a3d93..a4f2532 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,10 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + stylix.url = "github:danth/stylix"; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, sops-nix, ... }: { + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, sops-nix, stylix, ... }: { nixosConfigurations = { # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; tartarus = nixpkgs.lib.nixosSystem rec { @@ -24,6 +25,7 @@ services.vscode-server.enable = true; }) sops-nix.nixosModules.sops + stylix.nixosModules.stylix ]; specialArgs = { pkgs-unstable = import nixpkgs-unstable { diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 7077ec3..ef79730 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -12,6 +12,13 @@ ../../common/i18n.nix ../../common/python.nix ]; + + stylix.enable = true; + stylix.image = pkgs.fetchurl { + url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; + sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; + }; + stylix.polarity = "dark"; # Bootloader. boot.loader.systemd-boot.enable = true; From f189a5b56fabba667161645c35a33844f9026f35 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Nov 2024 15:55:26 +0300 Subject: [PATCH 0061/1768] make stylix follow nixpkgs --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index a4f2532..6dfd043 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,8 @@ sops-nix.inputs.nixpkgs.follows = "nixpkgs"; stylix.url = "github:danth/stylix"; + stylix.inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, sops-nix, stylix, ... }: { From 15864ec34728766fd10586cf3e240a943e77cbfc Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Nov 2024 15:56:57 +0300 Subject: [PATCH 0062/1768] flake.lock shenanigans --- flake.lock | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 446d4cb..223e71d 100644 --- a/flake.lock +++ b/flake.lock @@ -224,22 +224,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1682134069, "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", @@ -293,7 +277,9 @@ "flake-utils": "flake-utils", "gnome-shell": "gnome-shell", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs-unstable" + ], "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -395,7 +381,7 @@ "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1729422940, From a7d118c7d55dbd89c88919922408ae82f0a2904b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Nov 2024 15:58:45 +0300 Subject: [PATCH 0063/1768] flake.lock shenanigans2 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 6dfd043..af1c2c0 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ sops-nix.inputs.nixpkgs.follows = "nixpkgs"; stylix.url = "github:danth/stylix"; - stylix.inputs.nixpkgs.follows = "nixpkgs-unstable"; + stylix.inputs.nixpkgs.follows = "nixpkgs"; }; From 20376b79c2ea5521c4757805158aea559831d82f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Nov 2024 15:59:26 +0300 Subject: [PATCH 0064/1768] flake.lock shenanigans3 :( --- flake.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 223e71d..7f01f1e 100644 --- a/flake.lock +++ b/flake.lock @@ -278,7 +278,7 @@ "gnome-shell": "gnome-shell", "home-manager": "home-manager", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ], "systems": "systems", "tinted-foot": "tinted-foot", From 007f5345945c43114bbfa3b11dc61433705ccc0d Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Nov 2024 16:04:13 +0300 Subject: [PATCH 0065/1768] flake.lock shenanigans4 <3 --- flake.lock | 176 +++++++++++++++++++++-------------------------------- flake.nix | 2 +- 2 files changed, 70 insertions(+), 108 deletions(-) diff --git a/flake.lock b/flake.lock index 7f01f1e..2c9f441 100644 --- a/flake.lock +++ b/flake.lock @@ -34,14 +34,30 @@ "type": "github" } }, + "base16-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "base16-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-foot", + "type": "github" + } + }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1696727917, + "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", "type": "github" }, "original": { @@ -50,18 +66,50 @@ "type": "github" } }, - "base16-vim": { + "base16-kitty": { "flake": false, "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "lastModified": 1665001328, + "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "owner": "kdrag0n", + "repo": "base16-kitty", + "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "type": "github" + }, + "original": { + "owner": "kdrag0n", + "repo": "base16-kitty", + "type": "github" + } + }, + "base16-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", + "repo": "base16-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", "type": "github" }, "original": { "owner": "tinted-theming", + "repo": "base16-tmux", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1663659192, + "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", + "owner": "chriskempson", + "repo": "base16-vim", + "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "type": "github" + }, + "original": { + "owner": "chriskempson", "repo": "base16-vim", "type": "github" } @@ -84,28 +132,7 @@ }, "flake-utils": { "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -162,11 +189,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -271,30 +298,29 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", + "base16-foot": "base16-foot", "base16-helix": "base16-helix", + "base16-kitty": "base16-kitty", + "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", "gnome-shell": "gnome-shell", "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ], - "systems": "systems", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" + ] }, "locked": { - "lastModified": 1729963473, - "narHash": "sha256-uGjTjvvlGQfQ0yypVP+at0NizI2nrb6kz4wGAqzRGbY=", + "lastModified": 1718122552, + "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", "owner": "danth", "repo": "stylix", - "rev": "04afcfc0684d9bbb24bb1dc77afda7c1843ec93b", + "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "type": "github" }, "original": { "owner": "danth", + "ref": "release-24.05", "repo": "stylix", "type": "github" } @@ -314,73 +340,9 @@ "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" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { diff --git a/flake.nix b/flake.nix index af1c2c0..718daa6 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - stylix.url = "github:danth/stylix"; + stylix.url = "github:danth/stylix/release-24.05"; stylix.inputs.nixpkgs.follows = "nixpkgs"; }; From 8e375551c08c0c63393b9131943c5db43e665f89 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 7 Nov 2024 03:26:32 +0300 Subject: [PATCH 0066/1768] make vscode package follow my nixpkgs input --- flake.lock | 18 +++--------------- flake.nix | 1 + 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 2c9f441..dc0109e 100644 --- a/flake.lock +++ b/flake.lock @@ -250,20 +250,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1682134069, - "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "root": { "inputs": { "nixpkgs": "nixpkgs", @@ -343,7 +329,9 @@ "vscode-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1729422940, diff --git a/flake.nix b/flake.nix index 718daa6..aaf604a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; vscode-server.url = "github:nix-community/nixos-vscode-server"; + vscode-server.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; From 6636fdc19a500b4e1194693853cbf2d607c2611a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 7 Nov 2024 23:52:33 +0300 Subject: [PATCH 0067/1768] add virtualbox --- hosts/tartarus/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ef79730..611e2eb 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -20,6 +20,11 @@ }; stylix.polarity = "dark"; + + virtualisation.virtualbox.host.enable = true; + users.extraGroups.vboxusers.members = [ "user-with-access-to-virtualbox" ]; + + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From 5d2261bcf8816f81b94390428f88322f6435830b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 7 Nov 2024 23:57:12 +0300 Subject: [PATCH 0068/1768] i am the user --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 611e2eb..f1029ee 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -22,7 +22,7 @@ virtualisation.virtualbox.host.enable = true; - users.extraGroups.vboxusers.members = [ "user-with-access-to-virtualbox" ]; + users.extraGroups.vboxusers.members = [ "osbm" ]; # Bootloader. From 8aab1c882e75cfb4224d464357ed1829432258ae Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 8 Nov 2024 15:12:37 +0300 Subject: [PATCH 0069/1768] add stupid arduino library --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index f1029ee..e8fd51d 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -135,6 +135,7 @@ jq onefetch just + adafruit-nrfutil ]; # Some programs need SUID wrappers, can be configured further or are From 1b5c5a72b5658013111977c2e208dc6828392137 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 8 Nov 2024 15:23:26 +0300 Subject: [PATCH 0070/1768] add arduino udev rules --- hosts/tartarus/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index e8fd51d..f92d891 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -151,6 +151,10 @@ # Enable the OpenSSH daemon. services.openssh.enable = true; + services.udev.extraRules = '' + KERNEL=="ttyACM0", MODE="0666" + ''; + # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; From 0ccd7f0d985950063d4c988a417431d075e6c6cc Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 8 Nov 2024 20:32:50 +0300 Subject: [PATCH 0071/1768] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index dc0109e..18c9255 100644 --- a/flake.lock +++ b/flake.lock @@ -204,11 +204,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { @@ -267,11 +267,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730883027, - "narHash": "sha256-pvXMOJIqRW0trsW+FzRMl6d5PbsM4rWfD5lcKCOrrwI=", + "lastModified": 1731047660, + "narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5ae1e214ff935f2d3593187a131becb289ea639", + "rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f", "type": "github" }, "original": { From 7713cd4a3a2230306ec06c7e22f9cfe222ea7a6e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 9 Nov 2024 22:33:42 +0300 Subject: [PATCH 0072/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 18c9255..da9dbc2 100644 --- a/flake.lock +++ b/flake.lock @@ -204,11 +204,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "lastModified": 1730963269, + "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", "type": "github" }, "original": { From ca98086387b9fa509bd804181f2ad978196a5671 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 00:29:58 +0300 Subject: [PATCH 0073/1768] try out unstable qbittorrent --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index f92d891..16793ff 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -84,7 +84,7 @@ kitty obs-studio audacity - # qbittorrent + pkgs-unstable.qbittorrent arduino-ide ]; }; From c658f1ad52ee6eb893d90b269cbd9b6b04bd8fe0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 01:34:49 +0300 Subject: [PATCH 0074/1768] add my dotfiles --- flake.lock | 17 +++++++++++++++++ flake.nix | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index da9dbc2..0c42e1c 100644 --- a/flake.lock +++ b/flake.lock @@ -114,6 +114,22 @@ "type": "github" } }, + "dotfiles": { + "flake": false, + "locked": { + "lastModified": 1730756003, + "narHash": "sha256-uKc2R08m057A6KHZeznJopYC6tVU5KC9j1z0L7epEb8=", + "owner": "osbm", + "repo": "dotfiles", + "rev": "5a8ee95b24565a3c3cc5267f2426a4da8c01cbdd", + "type": "github" + }, + "original": { + "owner": "osbm", + "repo": "dotfiles", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -252,6 +268,7 @@ }, "root": { "inputs": { + "dotfiles": "dotfiles", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index aaf604a..2c16d1e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,10 @@ stylix.url = "github:danth/stylix/release-24.05"; stylix.inputs.nixpkgs.follows = "nixpkgs"; + dotfiles = { + url = "github:osbm/dotfiles"; + flake = false; + }; }; outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, sops-nix, stylix, ... }: { @@ -28,7 +32,7 @@ services.vscode-server.enable = true; }) sops-nix.nixosModules.sops - stylix.nixosModules.stylix + stylix.nixosModules.stylix ]; specialArgs = { pkgs-unstable = import nixpkgs-unstable { From 667216c835a9dcec2d4603176c19bf37b3fa0996 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 17:13:54 +0300 Subject: [PATCH 0075/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0c42e1c..0ad323c 100644 --- a/flake.lock +++ b/flake.lock @@ -284,11 +284,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731047660, - "narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=", + "lastModified": 1731213149, + "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", "owner": "Mic92", "repo": "sops-nix", - "rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f", + "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", "type": "github" }, "original": { From 25747846df50b325dff966be67f64c2129e2f2d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 22:13:47 +0300 Subject: [PATCH 0076/1768] seperate out arduino --- common/arduino.nix | 12 ++++++++++++ hosts/tartarus/configuration.nix | 6 +----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 common/arduino.nix diff --git a/common/arduino.nix b/common/arduino.nix new file mode 100644 index 0000000..c916199 --- /dev/null +++ b/common/arduino.nix @@ -0,0 +1,12 @@ +{ pkgs, lib, config, ... }: { + + environment.systemPackages = with pkgs; [ + arduino-ide + adafruit-nrfutil + ]; + + services.udev.extraRules = '' + KERNEL=="ttyACM0", MODE="0666" + ''; + +} diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 16793ff..6eb93c8 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -11,6 +11,7 @@ ../../common/nix-settings.nix ../../common/i18n.nix ../../common/python.nix + ../../common/arduino.nix ]; stylix.enable = true; @@ -85,7 +86,6 @@ obs-studio audacity pkgs-unstable.qbittorrent - arduino-ide ]; }; @@ -135,7 +135,6 @@ jq onefetch just - adafruit-nrfutil ]; # Some programs need SUID wrappers, can be configured further or are @@ -151,9 +150,6 @@ # Enable the OpenSSH daemon. services.openssh.enable = true; - services.udev.extraRules = '' - KERNEL=="ttyACM0", MODE="0666" - ''; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; From e9de1bd54b50e8a667536cf687d9a2444733f03d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 22:14:11 +0300 Subject: [PATCH 0077/1768] weird-ass styling --- hosts/tartarus/configuration.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 6eb93c8..4a5fc75 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -13,7 +13,7 @@ ../../common/python.nix ../../common/arduino.nix ]; - + stylix.enable = true; stylix.image = pkgs.fetchurl { url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; @@ -94,12 +94,12 @@ programs.steam = { enable = true; - remotePlay.openFirewall = - true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = - true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = - true; # Open ports in the firewall for Steam Local Network Game Transfers + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; }; environment.systemPackages = with pkgs; [ From bf884dc3b4ed47fb2eb6d30faedaf6578a2e331d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 22:15:41 +0300 Subject: [PATCH 0078/1768] remove python11 --- common/python.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/common/python.nix b/common/python.nix index 47d92f2..21077f6 100644 --- a/common/python.nix +++ b/common/python.nix @@ -12,18 +12,8 @@ python312Packages.matplotlib python312Packages.jax ])) - (pkgs.python311.withPackages (ppkgs: [ - python311Packages.pip - python311Packages.torch - python311Packages.ipython - python311Packages.numpy - python311Packages.pandas - python311Packages.seaborn - python311Packages.matplotlib - python311Packages.jax - ])) pyenv ]; -} \ No newline at end of file +} From 0ba408c64521dc09f0d2c3ffc6be5f8fef59abbd Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 22:17:26 +0300 Subject: [PATCH 0079/1768] stupid ass error --- common/arduino.nix | 2 +- hosts/tartarus/configuration.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/arduino.nix b/common/arduino.nix index c916199..5f1e0ce 100644 --- a/common/arduino.nix +++ b/common/arduino.nix @@ -1,7 +1,7 @@ { pkgs, lib, config, ... }: { environment.systemPackages = with pkgs; [ - arduino-ide + # arduino-ide adafruit-nrfutil ]; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 4a5fc75..e3713b0 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -86,6 +86,7 @@ obs-studio audacity pkgs-unstable.qbittorrent + arduino-ide ]; }; From 5084ec366b1562b3b6f1affcb2d05a07fe1b5034 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 22:18:50 +0300 Subject: [PATCH 0080/1768] unstable arduino --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index e3713b0..5da6c31 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -86,7 +86,7 @@ obs-studio audacity pkgs-unstable.qbittorrent - arduino-ide + pkgs-unstable.arduino-ide ]; }; From 53151f88c2acc08b1bf42f3598aa9b5533ac0d5a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Nov 2024 23:52:32 +0300 Subject: [PATCH 0081/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0ad323c..bd4fbf1 100644 --- a/flake.lock +++ b/flake.lock @@ -252,11 +252,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { From 86e4aabaa3ffd69ff8d372ee734a1a9631fccf43 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 11 Nov 2024 18:24:22 +0300 Subject: [PATCH 0082/1768] add gh --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 5da6c31..306d688 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -136,6 +136,7 @@ jq onefetch just + gh ]; # Some programs need SUID wrappers, can be configured further or are From 303954ef6f149533c3158e6f9324ab6deb3d879c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 11 Nov 2024 18:31:50 +0300 Subject: [PATCH 0083/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bd4fbf1..e4a4555 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730963269, - "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", + "lastModified": 1731239293, + "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", + "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", "type": "github" }, "original": { From 04a54e64f4b491bf6e4d53b3a0ab8c2d71b4d360 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 12 Nov 2024 19:52:10 +0300 Subject: [PATCH 0084/1768] unstable obsidian --- flake.lock | 6 +++--- hosts/tartarus/configuration.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e4a4555..2bdaad3 100644 --- a/flake.lock +++ b/flake.lock @@ -284,11 +284,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731213149, - "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", + "lastModified": 1731364708, + "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", + "rev": "4c91d52db103e757fc25b58998b0576ae702d659", "type": "github" }, "original": { diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 306d688..d1acde7 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -77,7 +77,7 @@ vscode pkgs-unstable.discord # discord sucks alacritty - obsidian + pkgs-unstable.obsidian mpv libreoffice blender From 4dabc1ff79eb3745aff5e55242f68676fe551928 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 14 Nov 2024 18:41:14 +0300 Subject: [PATCH 0085/1768] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2bdaad3..d5493af 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { From 636d72ad873e75439323c6ea3ed3c53e506b826a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 14 Nov 2024 20:40:30 +0300 Subject: [PATCH 0086/1768] tick stylix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4aa9078..773c939 100644 --- a/README.md +++ b/README.md @@ -21,5 +21,5 @@ But There are couple of things i need to do before: - [ ] make an ISO file with my configurations - [ ] make a github action that tests if my configuration is gonna build successfully or not - [x] learn cache management -- [ ] add stylix +- [x] add stylix From ca3f6df2370aff7937c7e120016ca0d4e3bc15ee Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 16 Nov 2024 17:23:35 +0300 Subject: [PATCH 0087/1768] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d5493af..2d86b20 100644 --- a/flake.lock +++ b/flake.lock @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1731652201, + "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d", "type": "github" }, "original": { @@ -284,11 +284,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731364708, - "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", + "lastModified": 1731748189, + "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4c91d52db103e757fc25b58998b0576ae702d659", + "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054", "type": "github" }, "original": { From 2f6e9fc4f836284e3779c051a98d6707fddc316c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 16 Nov 2024 17:50:57 +0300 Subject: [PATCH 0088/1768] add starship --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index d1acde7..6a5cfad 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -137,6 +137,7 @@ onefetch just gh + starship ]; # Some programs need SUID wrappers, can be configured further or are From 0feadf474dc0fef9e511958bca3904b4a6761532 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 17 Nov 2024 16:04:00 +0300 Subject: [PATCH 0089/1768] update flake --- flake.lock | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 2d86b20..e5e429c 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1730756003, - "narHash": "sha256-uKc2R08m057A6KHZeznJopYC6tVU5KC9j1z0L7epEb8=", + "lastModified": 1731783906, + "narHash": "sha256-z3ns8rdq+ddS9X0Z9ty8tj22syOovMo4ExyraOiQGvU=", "owner": "osbm", "repo": "dotfiles", - "rev": "5a8ee95b24565a3c3cc5267f2426a4da8c01cbdd", + "rev": "d382450c6483194f6e5bc3f69efb494df34752e8", "type": "github" }, "original": { @@ -234,29 +234,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730602179, - "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -280,15 +264,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731748189, - "narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=", + "lastModified": 1731846058, + "narHash": "sha256-8UpWTQTlDeWo1rPhi+IQJmDea+KK7q7u35aMlLAkHfU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054", + "rev": "dfcebb55c8e8165208c4a802335353d2e7517341", "type": "github" }, "original": { From b2f123d002ed5c0dec458ce60d9eadd1f8d7a971 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Nov 2024 09:48:00 +0300 Subject: [PATCH 0090/1768] update flake --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e5e429c..816d73d 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1731783906, - "narHash": "sha256-z3ns8rdq+ddS9X0Z9ty8tj22syOovMo4ExyraOiQGvU=", + "lastModified": 1731886092, + "narHash": "sha256-pq/rr6qV2npkPhQyrMYrs2ngrjxw3xYxklcvry+Dpds=", "owner": "osbm", "repo": "dotfiles", - "rev": "d382450c6483194f6e5bc3f69efb494df34752e8", + "rev": "78df6f0bb8b7230c76b6cb2bc48aa8e3a2a26dd5", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731652201, - "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1731846058, - "narHash": "sha256-8UpWTQTlDeWo1rPhi+IQJmDea+KK7q7u35aMlLAkHfU=", + "lastModified": 1731862312, + "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "dfcebb55c8e8165208c4a802335353d2e7517341", + "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978", "type": "github" }, "original": { From b3fa7810f0d87d657c07095b348b0e43d97ce2b1 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Nov 2024 10:22:16 +0300 Subject: [PATCH 0091/1768] add tree --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 6a5cfad..068b36e 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -138,6 +138,7 @@ just gh starship + tree ]; # Some programs need SUID wrappers, can be configured further or are From ff5b7ec7ffb4b8fd8e43abad59307a815ac4529a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Nov 2024 11:50:41 +0300 Subject: [PATCH 0092/1768] revert arduino-ide --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 068b36e..91a336b 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -86,7 +86,7 @@ obs-studio audacity pkgs-unstable.qbittorrent - pkgs-unstable.arduino-ide + arduino-ide ]; }; From 48ec45c583aa44c52ef3b9b595001a992fb2c65f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Nov 2024 11:47:41 +0300 Subject: [PATCH 0093/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 816d73d..a89a106 100644 --- a/flake.lock +++ b/flake.lock @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1731862312, - "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=", + "lastModified": 1731954233, + "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978", + "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", "type": "github" }, "original": { From 5aca0e676e4414408c3cb5db22620d2e124e199b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Nov 2024 15:12:58 +0300 Subject: [PATCH 0094/1768] add new fonts --- common/fonts.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/fonts.nix b/common/fonts.nix index cda4193..aa781e4 100644 --- a/common/fonts.nix +++ b/common/fonts.nix @@ -11,6 +11,11 @@ dina-font nerdfonts proggyfonts + source-sans + source-sans-pro + source-serif-pro + font-awesome + font-awesome_5 ]; -} \ No newline at end of file +} From 976e247851c046498e8d4ee221cd0ee4b6a23470 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Nov 2024 15:14:54 +0300 Subject: [PATCH 0095/1768] add roboto --- common/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/fonts.nix b/common/fonts.nix index aa781e4..0fa97cb 100644 --- a/common/fonts.nix +++ b/common/fonts.nix @@ -16,6 +16,7 @@ source-serif-pro font-awesome font-awesome_5 + roboto ]; } From 80a7a9e5e2b8b3e599554f0b9ccfd075ffb0bd45 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 12:15:05 +0300 Subject: [PATCH 0096/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a89a106..394f40a 100644 --- a/flake.lock +++ b/flake.lock @@ -236,11 +236,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { From de12b63d0fa50d8f39aa261b0dbc41724dcf76f6 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 15:07:47 +0300 Subject: [PATCH 0097/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 394f40a..dd40a00 100644 --- a/flake.lock +++ b/flake.lock @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1731954233, - "narHash": "sha256-vvXx1m2Rsw7MkbKJdpcICzz4YPgZPApGKQGhNZfkhOI=", + "lastModified": 1732186149, + "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e39947d0ee8e341fa7108bd02a33cdfa24a1360e", + "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "type": "github" }, "original": { From 28d8c74956c5463cc1ef5aa8d546dcf95fa7188a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 16:10:42 +0300 Subject: [PATCH 0098/1768] firefox options --- hosts/tartarus/configuration.nix | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 91a336b..5db369e 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -91,7 +91,34 @@ }; # Install firefox. - programs.firefox.enable = true; + programs.firefox = { + enable = true; + languagePacks = [ "ja" "en-US" ]; + + # profiles.osbm = { + + + # Check about:policies#documentation for options. + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value= true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + }; + # DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + # OverrideFirstRunPage = ""; + # OverridePostUpdatePage = ""; + # DontCheckDefaultBrowser = true; + # DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab" + # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + # SearchBar = "unified"; # alternat + } programs.steam = { enable = true; From 25c21fd019683a8d774ba3de83ecf1aa2cd2d6f8 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 16:11:49 +0300 Subject: [PATCH 0099/1768] fix error --- hosts/tartarus/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 5db369e..2383f93 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -118,7 +118,8 @@ # DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab" # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" # SearchBar = "unified"; # alternat - } + }; + }; programs.steam = { enable = true; From 9e73dcc551dafb56850d1bffa95fac2877d3cabb Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 16:58:39 +0300 Subject: [PATCH 0100/1768] firefox settings --- hosts/tartarus/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 2383f93..356eecc 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -93,7 +93,7 @@ # Install firefox. programs.firefox = { enable = true; - languagePacks = [ "ja" "en-US" ]; + languagePacks = [ "ja" "tr" "en-US" ]; # profiles.osbm = { @@ -112,6 +112,7 @@ DisableFirefoxAccounts = true; DisableAccounts = true; DisableFirefoxScreenshots = true; + StartPage = "previous-session"; # OverrideFirstRunPage = ""; # OverridePostUpdatePage = ""; # DontCheckDefaultBrowser = true; From fc909e99da4925933441f0e745f2b9005317ecf0 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 17:02:55 +0300 Subject: [PATCH 0101/1768] firefox settings --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 356eecc..e112829 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -116,7 +116,7 @@ # OverrideFirstRunPage = ""; # OverridePostUpdatePage = ""; # DontCheckDefaultBrowser = true; - # DisplayBookmarksToolbar = "never"; # alternatives: "always" or "newtab" + DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" # SearchBar = "unified"; # alternat }; From af160ad89c0b22a5576190e31a333c998bef37a0 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 21:28:44 +0300 Subject: [PATCH 0102/1768] nixos version update --- flake.lock | 198 ++++++++++++++++++++++++++++++++--------------------- flake.nix | 4 +- 2 files changed, 121 insertions(+), 81 deletions(-) diff --git a/flake.lock b/flake.lock index dd40a00..7f582f1 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1731966541, + "narHash": "sha256-AhX8QQBQLRqEWHftFibTmvlmh157134vzBYXW0LOBKo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "d8e769add6333892b44afc107f193074a5072717", "type": "github" }, "original": { @@ -34,30 +34,14 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { @@ -66,50 +50,18 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -148,7 +100,28 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -167,11 +140,11 @@ "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -205,11 +178,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -220,16 +193,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -284,29 +257,31 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "gnome-shell": "gnome-shell", "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1718122552, - "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", + "lastModified": 1732036949, + "narHash": "sha256-prZV8HDVvBqHiJLkjElJYoZ6zonV7cOABb8Z0lWonJA=", "owner": "danth", "repo": "stylix", - "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", + "rev": "4912f4db00bc931c7636d827e829faf01f6bf155", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.05", + "ref": "master", "repo": "stylix", "type": "github" } @@ -326,9 +301,74 @@ "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" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 2c16d1e..f7f7afa 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My system configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; vscode-server.url = "github:nix-community/nixos-vscode-server"; @@ -11,7 +11,7 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - stylix.url = "github:danth/stylix/release-24.05"; + stylix.url = "github:danth/stylix/master"; stylix.inputs.nixpkgs.follows = "nixpkgs"; dotfiles = { From 8c0d34610cf6c7b88df5d77355a33839c9946420 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 21:33:10 +0300 Subject: [PATCH 0103/1768] update input method --- common/i18n.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/i18n.nix b/common/i18n.nix index d1e20a1..83a0c92 100644 --- a/common/i18n.nix +++ b/common/i18n.nix @@ -24,13 +24,13 @@ }; i18n.inputMethod = { - enabled = "fcitx5"; - # waylandFrontend = true; + type = "fcitx5"; + enable = true; fcitx5.addons = with pkgs; [ - fcitx5-gtk # alternatively, kdePackages.fcitx5-qt - fcitx5-mozc # table input method support - fcitx5-nord # a color theme + fcitx5-mozc + fcitx5-gtk + fcitx5-nord # a color theme ]; }; -} \ No newline at end of file +} From cb8c4209f52c8a151c412248acc3a0cf743205a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 21:38:28 +0300 Subject: [PATCH 0104/1768] disable stylix --- flake.nix | 2 +- hosts/tartarus/configuration.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index f7f7afa..ac77917 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ services.vscode-server.enable = true; }) sops-nix.nixosModules.sops - stylix.nixosModules.stylix + # stylix.nixosModules.stylix ]; specialArgs = { pkgs-unstable = import nixpkgs-unstable { diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index e112829..b5bafba 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -14,12 +14,12 @@ ../../common/arduino.nix ]; - stylix.enable = true; - stylix.image = pkgs.fetchurl { - url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; - sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; - }; - stylix.polarity = "dark"; + # stylix.enable = true; + # stylix.image = pkgs.fetchurl { + # url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; + # sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; + # }; + # stylix.polarity = "dark"; virtualisation.virtualbox.host.enable = true; From b8b74b0fffc408dfc5d870a716b0654f832b5148 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 21:39:31 +0300 Subject: [PATCH 0105/1768] updated font name --- common/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/fonts.nix b/common/fonts.nix index 0fa97cb..8e5c5cb 100644 --- a/common/fonts.nix +++ b/common/fonts.nix @@ -2,7 +2,7 @@ fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code From 4df960070c8895485e6dbf4f9a16083ccddbedc3 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 22:40:09 +0300 Subject: [PATCH 0106/1768] use unstable mosc --- common/i18n.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/i18n.nix b/common/i18n.nix index 83a0c92..73d9c6b 100644 --- a/common/i18n.nix +++ b/common/i18n.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: { +{ pkgs, lib, config, pkgs-unstable, ... }: { time.timeZone = "Europe/Istanbul"; @@ -27,7 +27,7 @@ type = "fcitx5"; enable = true; fcitx5.addons = with pkgs; [ - fcitx5-mozc + pkgs-unstable.fcitx5-mozc #TODO revert back to stable once its updated fcitx5-gtk fcitx5-nord # a color theme ]; From f4bfc5dff8a109f994f0f9d7b6ef86d15525555d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 22:42:59 +0300 Subject: [PATCH 0107/1768] whitespace fake commit --- hosts/tartarus/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index b5bafba..3e1bcf1 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -1,7 +1,6 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, pkgs-unstable, system-label, ... }: { From c656992897381779ee9f7883a9b441a478fc7b0f Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 21 Nov 2024 23:24:05 +0300 Subject: [PATCH 0108/1768] a bit more beautiful --- flake.nix | 3 --- hosts/tartarus/configuration.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index ac77917..e70cca3 100644 --- a/flake.nix +++ b/flake.nix @@ -28,9 +28,6 @@ modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default - ({ config, pkgs, ... }: { - services.vscode-server.enable = true; - }) sops-nix.nixosModules.sops # stylix.nixosModules.stylix ]; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 3e1bcf1..fd680db 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -20,6 +20,8 @@ # }; # stylix.polarity = "dark"; + services.vscode-server.enable = true; + virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = [ "osbm" ]; From c42a75c43b2225faf5e1149d78f5a78a367d3de2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 22 Nov 2024 16:53:23 +0300 Subject: [PATCH 0109/1768] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 7f582f1..33657d9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1731966541, - "narHash": "sha256-AhX8QQBQLRqEWHftFibTmvlmh157134vzBYXW0LOBKo=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "d8e769add6333892b44afc107f193074a5072717", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -272,11 +272,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1732036949, - "narHash": "sha256-prZV8HDVvBqHiJLkjElJYoZ6zonV7cOABb8Z0lWonJA=", + "lastModified": 1732261424, + "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", "owner": "danth", "repo": "stylix", - "rev": "4912f4db00bc931c7636d827e829faf01f6bf155", + "rev": "b667a340730dd3d0596083aa7c949eef01367c62", "type": "github" }, "original": { From 363d7db67db4e48bbe13db1ff9098e6df5f124b1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 23 Nov 2024 18:44:17 +0300 Subject: [PATCH 0110/1768] add git lfs --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index fd680db..4a36ed6 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -137,6 +137,7 @@ vim wget git + git-lfs gnumake zip fish From c2c37ba98fed5c6e985b76edf6ed078d53745737 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 24 Nov 2024 12:47:55 +0300 Subject: [PATCH 0111/1768] update flake --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 33657d9..3a4463e 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1731886092, - "narHash": "sha256-pq/rr6qV2npkPhQyrMYrs2ngrjxw3xYxklcvry+Dpds=", + "lastModified": 1732372015, + "narHash": "sha256-kuXZoiM5VFINdefIW6K01XDz8nkN5zJmzZu4P7hP4kQ=", "owner": "osbm", "repo": "dotfiles", - "rev": "78df6f0bb8b7230c76b6cb2bc48aa8e3a2a26dd5", + "rev": "20ea52277df359d048f729ff617fa3de4bea936a", "type": "github" }, "original": { From 896d93096caa882bc1666d2b06718f5ea6493299 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 25 Nov 2024 11:44:18 +0300 Subject: [PATCH 0112/1768] update flake and install ffmpeg --- flake.lock | 12 ++++++------ hosts/tartarus/configuration.nix | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3a4463e..9a8bd73 100644 --- a/flake.lock +++ b/flake.lock @@ -69,11 +69,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1732372015, - "narHash": "sha256-kuXZoiM5VFINdefIW6K01XDz8nkN5zJmzZu4P7hP4kQ=", + "lastModified": 1732519391, + "narHash": "sha256-NgbVpJzWCpE4/gEVFjpxbfcZOQFJ7totJE54Qq37N4E=", "owner": "osbm", "repo": "dotfiles", - "rev": "20ea52277df359d048f729ff617fa3de4bea936a", + "rev": "974a30186e1439017a60c4766c213269d2644b30", "type": "github" }, "original": { @@ -193,11 +193,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731755305, - "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", "type": "github" }, "original": { diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 4a36ed6..7a3d7fb 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -170,6 +170,7 @@ gh starship tree + ffmpeg ]; # Some programs need SUID wrappers, can be configured further or are From 1395a158cea7a60d130a7404530d06130f3dcb9f Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 25 Nov 2024 17:13:36 +0300 Subject: [PATCH 0113/1768] formatting flake --- flake.nix | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index e70cca3..112d25f 100644 --- a/flake.nix +++ b/flake.nix @@ -11,35 +11,43 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - stylix.url = "github:danth/stylix/master"; - stylix.inputs.nixpkgs.follows = "nixpkgs"; + # stylix.url = "github:danth/stylix/master"; + # stylix.inputs.nixpkgs.follows = "nixpkgs"; dotfiles = { - url = "github:osbm/dotfiles"; - flake = false; + url = "github:osbm/dotfiles"; + flake = false; }; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, vscode-server, sops-nix, stylix, ... }: { - nixosConfigurations = { - # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; - tartarus = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ - ./hosts/tartarus/configuration.nix - vscode-server.nixosModules.default - sops-nix.nixosModules.sops - # stylix.nixosModules.stylix - ]; - specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; + outputs = + { + self, + nixpkgs, + nixpkgs-unstable, + vscode-server, + sops-nix, + ... + }: + { + nixosConfigurations = { + # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + tartarus = nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + modules = [ + ./hosts/tartarus/configuration.nix + vscode-server.nixosModules.default + sops-nix.nixosModules.sops + # stylix.nixosModules.stylix + ]; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; - system-label = - self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; }; }; - }; } From 52b029825bb2e0c29f3bac687b7e7dddbdc9f4d7 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 25 Nov 2024 17:15:35 +0300 Subject: [PATCH 0114/1768] update flake.lock --- flake.lock | 260 +---------------------------------------------------- 1 file changed, 2 insertions(+), 258 deletions(-) diff --git a/flake.lock b/flake.lock index 9a8bd73..0f5e2c1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,71 +1,5 @@ { "nodes": { - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1732200724, - "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "153d52373b0fb2d343592871009a286ec8837aec", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1716150083, - "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "type": "github" - } - }, "dotfiles": { "flake": false, "locked": { @@ -82,46 +16,9 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": [ - "stylix", - "systems" - ] - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1681202837, @@ -137,60 +34,6 @@ "type": "github" } }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1713702291, - "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", - "type": "github" - }, - "original": { - "owner": "GNOME", - "ref": "46.1", - "repo": "gnome-shell", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1732350895, @@ -229,7 +72,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", - "stylix": "stylix", "vscode-server": "vscode-server" } }, @@ -253,39 +95,6 @@ "type": "github" } }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "gnome-shell": "gnome-shell", - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems", - "tinted-foot": "tinted-foot", - "tinted-kitty": "tinted-kitty", - "tinted-tmux": "tinted-tmux" - }, - "locked": { - "lastModified": 1732261424, - "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=", - "owner": "danth", - "repo": "stylix", - "rev": "b667a340730dd3d0596083aa7c949eef01367c62", - "type": "github" - }, - "original": { - "owner": "danth", - "ref": "master", - "repo": "stylix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -301,74 +110,9 @@ "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" - } - }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] From 98db1da64d93d17d04b277dcd54194fed39fc3ac Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 25 Nov 2024 20:59:21 +0300 Subject: [PATCH 0115/1768] add python packages --- common/python.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/python.nix b/common/python.nix index 21077f6..547e1e0 100644 --- a/common/python.nix +++ b/common/python.nix @@ -11,6 +11,9 @@ python312Packages.seaborn python312Packages.matplotlib python312Packages.jax + python312Packages.huggingface-hub + python312Packages.datasets + python312Packages.jupyter ])) pyenv ]; From e8fdb029b9e2b1e4f3effea864ca6319271ba156 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 25 Nov 2024 21:09:17 +0300 Subject: [PATCH 0116/1768] add huggingface packages --- common/python.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/python.nix b/common/python.nix index 547e1e0..6c6e41c 100644 --- a/common/python.nix +++ b/common/python.nix @@ -13,6 +13,8 @@ python312Packages.jax python312Packages.huggingface-hub python312Packages.datasets + python312Packages.transformers + python312Packages.diffusers python312Packages.jupyter ])) pyenv From ea2b0cbfa29f37daf7fd79481b11c53b90f93b6c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 25 Nov 2024 21:22:35 +0300 Subject: [PATCH 0117/1768] remove whitespace --- common/python.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/python.nix b/common/python.nix index 6c6e41c..497d5da 100644 --- a/common/python.nix +++ b/common/python.nix @@ -19,6 +19,4 @@ ])) pyenv ]; - - } From eb46b13aae2a4e532d219088ff51fdbf3a7b44cc Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 26 Nov 2024 15:02:58 +0300 Subject: [PATCH 0118/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0f5e2c1..7528138 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1732186149, - "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", + "lastModified": 1732575825, + "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", + "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "type": "github" }, "original": { From 1fca6eba467ea7e0eace15c03ac21b08933c4a2c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 26 Nov 2024 20:25:15 +0300 Subject: [PATCH 0119/1768] freedom --- hosts/tartarus/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 7a3d7fb..ee9f191 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -42,6 +42,12 @@ networking.networkmanager.enable = true; + networking.extraHosts = + '' + 0.0.0.0 youtube.com + ::0 youtube.com + ''; + # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = true; From 5bb4d3a94f913f78ee0f3b3187b6e734427f221b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 26 Nov 2024 20:27:33 +0300 Subject: [PATCH 0120/1768] freedom squared --- hosts/tartarus/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ee9f191..d800a46 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -46,6 +46,9 @@ '' 0.0.0.0 youtube.com ::0 youtube.com + + 0.0.0.0 www.youtube.com + ::0 www.youtube.com ''; # Enable the X11 windowing system. From bc3ecae125e41fd0a2255e9ee7bf2ed0a729da21 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 27 Nov 2024 12:09:37 +0300 Subject: [PATCH 0121/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7528138..050c4a6 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "type": "github" }, "original": { From 60b4c2005ebddda426b939aa2effcfd93330f031 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 29 Nov 2024 18:03:25 +0300 Subject: [PATCH 0122/1768] add direnv --- hosts/tartarus/configuration.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index d800a46..26aafbf 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -73,6 +73,17 @@ pulse.enable = true; }; + programs.direnv = { + package = pkgs.direnv; + silent = false; + loadInNixShell = true; + direnvrcExtra = ""; + nix-direnv = { + enable = true; + package = pkgs.nix-direnv; + }; + + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; virtualisation.docker.enable = true; From d643998e231c43e055689ab78d6678856002e433 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 29 Nov 2024 18:04:27 +0300 Subject: [PATCH 0123/1768] add direnv --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 26aafbf..7c45e09 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -82,7 +82,7 @@ enable = true; package = pkgs.nix-direnv; }; - + }; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; From 0da0b4ea65ee0b81ef0d6b2f225164d7d4d07118 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 29 Nov 2024 18:12:21 +0300 Subject: [PATCH 0124/1768] add direnv --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 7c45e09..7845bc3 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -74,6 +74,7 @@ }; programs.direnv = { + enable = true; package = pkgs.direnv; silent = false; loadInNixShell = true; From 5ca9bb4ceee52a593dd30205ff81f45426f5ccbb Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 30 Nov 2024 18:55:46 +0300 Subject: [PATCH 0125/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 050c4a6..0cf3245 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732350895, - "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", + "lastModified": 1732824227, + "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", + "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1732758367, + "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", "type": "github" }, "original": { From bdebca5361d7625233126420d2ee122b474b6d84 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 00:28:50 +0300 Subject: [PATCH 0126/1768] add ymir machine --- common/common-packages.nix | 71 +++++++++++ common/firefox.nix | 37 ++++++ flake.nix | 16 +++ hosts/tartarus/configuration.nix | 97 +-------------- hosts/ymir/configuration.nix | 170 ++++++++++++++++++++++++++ hosts/ymir/hardware-configuration.nix | 43 +++++++ 6 files changed, 342 insertions(+), 92 deletions(-) create mode 100644 common/common-packages.nix create mode 100644 common/firefox.nix create mode 100644 hosts/ymir/configuration.nix create mode 100644 hosts/ymir/hardware-configuration.nix diff --git a/common/common-packages.nix b/common/common-packages.nix new file mode 100644 index 0000000..2568b65 --- /dev/null +++ b/common/common-packages.nix @@ -0,0 +1,71 @@ +{ pkgs, lib, config, ... }: { + + + environment.systemPackages = with pkgs; [ + vim + wget + git + git-lfs + gnumake + zip + fish + trash-cli + tmux + zoxide + htop + unzip + tlrc + wakeonlan + neovim + pkgs-unstable.ani-cli + btop + pciutils + nodePackages.npm + nodejs + cloc + neofetch + cbonsai + cowsay + fortune + lolcat + cmatrix + inxi + age + sops + jq + onefetch + just + gh + starship + tree + ffmpeg + ]; + + programs.steam = { + enable = true; + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; + }; + + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + programs.direnv = { + enable = true; + package = pkgs.direnv; + silent = false; + loadInNixShell = true; + direnvrcExtra = ""; + nix-direnv = { + enable = true; + package = pkgs.nix-direnv; + }; + }; + +} diff --git a/common/firefox.nix b/common/firefox.nix new file mode 100644 index 0000000..b6b90ce --- /dev/null +++ b/common/firefox.nix @@ -0,0 +1,37 @@ +{ pkgs, lib, config, ... }: { + + # Install firefox. + programs.firefox = { + enable = true; + languagePacks = [ "ja" "tr" "en-US" ]; + + # profiles.osbm = { + + + # Check about:policies#documentation for options. + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value= true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + }; + # DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + StartPage = "previous-session"; + # OverrideFirstRunPage = ""; + # OverridePostUpdatePage = ""; + # DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" + # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + # SearchBar = "unified"; # alternat + }; + }; + + + +} diff --git a/flake.nix b/flake.nix index 112d25f..b45b573 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,22 @@ system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; }; + ymir = nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + modules = [ + ./hosts/ymir/configuration.nix + vscode-server.nixosModules.default + sops-nix.nixosModules.sops + # stylix.nixosModules.stylix + ]; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + }; + }; }; }; } diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 7845bc3..ac4d9fd 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -1,6 +1,7 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). + { config, pkgs, pkgs-unstable, system-label, ... }: { @@ -11,6 +12,8 @@ ../../common/i18n.nix ../../common/python.nix ../../common/arduino.nix + ../../common/firefox.nix + ../../common/common-packages.nix ]; # stylix.enable = true; @@ -73,17 +76,7 @@ pulse.enable = true; }; - programs.direnv = { - enable = true; - package = pkgs.direnv; - silent = false; - loadInNixShell = true; - direnvrcExtra = ""; - nix-direnv = { - enable = true; - package = pkgs.nix-direnv; - }; - }; + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -112,95 +105,15 @@ ]; }; - # Install firefox. - programs.firefox = { - enable = true; - languagePacks = [ "ja" "tr" "en-US" ]; - # profiles.osbm = { - - - # Check about:policies#documentation for options. - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - EnableTrackingProtection = { - Value= true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - }; - # DisablePocket = true; - DisableFirefoxAccounts = true; - DisableAccounts = true; - DisableFirefoxScreenshots = true; - StartPage = "previous-session"; - # OverrideFirstRunPage = ""; - # OverridePostUpdatePage = ""; - # DontCheckDefaultBrowser = true; - DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" - # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" - # SearchBar = "unified"; # alternat - }; - }; - - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - dedicatedServer.openFirewall = true; - # Open ports in the firewall for Steam Local Network Game Transfers - localNetworkGameTransfers.openFirewall = true; - }; environment.systemPackages = with pkgs; [ - vim - wget - git - git-lfs - gnumake - zip - fish - trash-cli - tmux - zoxide - htop - unzip - tlrc - wakeonlan - neovim - pkgs-unstable.ani-cli - btop - pciutils - nodePackages.npm - nodejs - cloc - neofetch - cbonsai - cowsay - fortune - lolcat - cmatrix - inxi - age - sops - jq - onefetch - just - gh - starship - tree - ffmpeg ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; + # List services that you want to enable: diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix new file mode 100644 index 0000000..1d1e279 --- /dev/null +++ b/hosts/ymir/configuration.nix @@ -0,0 +1,170 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, pkgs-unstable, system-label, ... }: + +{ + imports = [ + ./hardware-configuration.nix + ../../common/fonts.nix + ../../common/nix-settings.nix + ../../common/i18n.nix + ../../common/python.nix + ../../common/arduino.nix + ../../common/firefox.nix + ../../common/common-packages.nix + ]; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.luks.devices."luks-b84e6223-825f-4944-a6fe-16368b75c6de".device = "/dev/disk/by-uuid/b84e6223-825f-4944-a6fe-16368b75c6de"; + networking.hostName = "ymir"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; + + + # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + # Enable OpenGL + hardware.graphics = { + enable = true; + }; + + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = ["nvidia"]; + + hardware.nvidia = { + + # Modesetting is required. + modesetting.enable = true; + + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement.enable = false; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + powerManagement.finegrained = false; + + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = false; + + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings`. + nvidiaSettings = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + + + # Enable the X11 windowing system. + # You can disable this if you're only using the Wayland session. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound with pipewire. + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + #jack.enable = true; + + # use the example session manager (no others are packaged yet so this is enabled by default, + # no need to redefine it in your config for now) + #media-session.enable = true; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + virtualisation.docker.enable = true; + + users.users.osbm = { + isNormalUser = true; + description = "osbm"; + extraGroups = [ "networkmanager" "wheel" "docker" ]; + packages = with pkgs; [ + kdePackages.kate + vscode + pkgs-unstable.discord # discord sucks + alacritty + pkgs-unstable.obsidian + mpv + libreoffice + blender + gimp + kitty + obs-studio + audacity + pkgs-unstable.qbittorrent + arduino-ide + ]; + }; + + + + nixpkgs.config.allowUnfree = true; + + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "24.11"; # Did you read the comment? + +} diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/ymir/hardware-configuration.nix new file mode 100644 index 0000000..08a4429 --- /dev/null +++ b/hosts/ymir/hardware-configuration.nix @@ -0,0 +1,43 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/bfbd04d5-49bb-4571-8897-d36b2c679a6c"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-58144581-4049-4169-b8a9-4da19129416a".device = "/dev/disk/by-uuid/58144581-4049-4169-b8a9-4da19129416a"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/7F17-2E5B"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/a07d03b7-c2fb-40f9-89b0-d8f6db9d0e0e"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From db0d426ea27e77c63b46d4d99b98915d0206db08 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 00:30:56 +0300 Subject: [PATCH 0127/1768] dont forget unstable --- common/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/common-packages.nix b/common/common-packages.nix index 2568b65..fc633b7 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: { +{ pkgs, pkgs-unstable, lib, config, ... }: { environment.systemPackages = with pkgs; [ From f54e61e8edf9296fb5317357802bee806108c25e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 12:47:22 +0300 Subject: [PATCH 0128/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 0cf3245..cea6d3e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1732519391, - "narHash": "sha256-NgbVpJzWCpE4/gEVFjpxbfcZOQFJ7totJE54Qq37N4E=", + "lastModified": 1733003114, + "narHash": "sha256-sExnQiJWktLdf1r8m0j1BQpWUXuLYOsXgJ8JTZdJ5dE=", "owner": "osbm", "repo": "dotfiles", - "rev": "974a30186e1439017a60c4766c213269d2644b30", + "rev": "dee54164bc1250075deb888106591ae10ac58d04", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732824227, - "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { From 8ab2158c2c152383bca22b80ed6ba8af89b4b87f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 16:23:37 +0300 Subject: [PATCH 0129/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cea6d3e..07b8308 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1733003114, - "narHash": "sha256-sExnQiJWktLdf1r8m0j1BQpWUXuLYOsXgJ8JTZdJ5dE=", + "lastModified": 1733057282, + "narHash": "sha256-MNK2meL6gs+MsRSyMfrq3B+IRLJ/x0tiWwNds05sdQc=", "owner": "osbm", "repo": "dotfiles", - "rev": "dee54164bc1250075deb888106591ae10ac58d04", + "rev": "59b752cf485f867572b2b4237b4e40631af86dcb", "type": "github" }, "original": { From 8a0b4856c4a051cee83d3d8aecfd3572d0767a0e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 20:20:23 +0300 Subject: [PATCH 0130/1768] try adding ExtensionSettings --- common/firefox.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/common/firefox.nix b/common/firefox.nix index b6b90ce..866c3f1 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -29,6 +29,29 @@ DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" # SearchBar = "unified"; # alternat + ExtensionSettings = with builtins; + let extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; + }; + }; + in listToAttrs [ + (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") + # (extension "ublock-origin" "uBlock0@raymondhill.net") + (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") + # (extension "tabliss" "extension@tabliss.io") + # (extension "umatrix" "uMatrix@raymondhill.net") + # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") + # (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") + ]; + # To add additional extensions, find it on addons.mozilla.org, find + # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) + # Then, download the XPI by filling it in to the install_url template, unzip it, + # run `jq .browser_specific_settings.gecko.id manifest.json` or + # `jq .applications.gecko.id manifest.json` to get the UUID + }; }; }; From 4ae9716a9546a4889fd43d0b56a670d1cc31e2fb Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 20:25:57 +0300 Subject: [PATCH 0131/1768] fmt and fix --- common/firefox.nix | 49 +++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/common/firefox.nix b/common/firefox.nix index 866c3f1..26474e0 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -1,19 +1,28 @@ -{ pkgs, lib, config, ... }: { +{ + pkgs, + lib, + config, + ... +}: +{ # Install firefox. programs.firefox = { enable = true; - languagePacks = [ "ja" "tr" "en-US" ]; + languagePacks = [ + "ja" + "tr" + "en-US" + ]; # profiles.osbm = { - # Check about:policies#documentation for options. policies = { DisableTelemetry = true; DisableFirefoxStudies = true; EnableTrackingProtection = { - Value= true; + Value = true; Locked = true; Cryptomining = true; Fingerprinting = true; @@ -29,15 +38,18 @@ DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" # SearchBar = "unified"; # alternat - ExtensionSettings = with builtins; - let extension = shortId: uuid: { - name = uuid; - value = { - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; + ExtensionSettings = + with builtins; + let + extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; + }; }; - }; - in listToAttrs [ + in + listToAttrs [ (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") # (extension "ublock-origin" "uBlock0@raymondhill.net") (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") @@ -46,15 +58,12 @@ # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") # (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") ]; - # To add additional extensions, find it on addons.mozilla.org, find - # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) - # Then, download the XPI by filling it in to the install_url template, unzip it, - # run `jq .browser_specific_settings.gecko.id manifest.json` or - # `jq .applications.gecko.id manifest.json` to get the UUID - }; + # To add additional extensions, find it on addons.mozilla.org, find + # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) + # Then, download the XPI by filling it in to the install_url template, unzip it, + # run `jq .browser_specific_settings.gecko.id manifest.json` or + # `jq .applications.gecko.id manifest.json` to get the UUID }; }; - - } From 65280ca7bd934e61dc055490e65fad2a54aeba02 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 20:51:06 +0300 Subject: [PATCH 0132/1768] new settings and extensions --- common/firefox.nix | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/common/firefox.nix b/common/firefox.nix index 26474e0..fb8031f 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -4,6 +4,16 @@ config, ... }: +let + lock-false = { + Value = false; + Status = "locked"; + }; + lock-true = { + Value = true; + Status = "locked"; + }; + in { # Install firefox. @@ -17,6 +27,7 @@ # profiles.osbm = { + # Check about:policies#documentation for options. policies = { DisableTelemetry = true; @@ -51,8 +62,11 @@ in listToAttrs [ (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") - # (extension "ublock-origin" "uBlock0@raymondhill.net") + (extension "ublock-origin" "uBlock0@raymondhill.net") (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") + (extension "motivation-new-tab" "") + (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") + # (extension "tabliss" "extension@tabliss.io") # (extension "umatrix" "uMatrix@raymondhill.net") # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") @@ -64,6 +78,30 @@ # run `jq .browser_specific_settings.gecko.id manifest.json` or # `jq .applications.gecko.id manifest.json` to get the UUID }; + + /* ---- PREFERENCES ---- */ + # Check about:config for options. + Preferences = { + "browser.contentblocking.category" = { Value = "strict"; Status = "locked"; }; + "extensions.pocket.enabled" = lock-false; + "extensions.screenshots.disabled" = lock-true; + "browser.topsites.contile.enabled" = lock-false; + "browser.formfill.enable" = lock-false; + "browser.search.suggest.enabled" = lock-false; + "browser.search.suggest.enabled.private" = lock-false; + "browser.urlbar.suggest.searches" = lock-false; + "browser.urlbar.showSearchSuggestionsFirst" = lock-false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; + "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; + "browser.newtabpage.activity-stream.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; + "toolkit.legacyUserProfileCustomizations.stylesheets" = lock-true; + }; }; } From 13a47affc85d540ead016b9001ab27df2eea9a04 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 20:52:07 +0300 Subject: [PATCH 0133/1768] try fixing capital data --- common/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/firefox.nix b/common/firefox.nix index fb8031f..e64e1e1 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -81,7 +81,7 @@ let /* ---- PREFERENCES ---- */ # Check about:config for options. - Preferences = { + preferences = { "browser.contentblocking.category" = { Value = "strict"; Status = "locked"; }; "extensions.pocket.enabled" = lock-false; "extensions.screenshots.disabled" = lock-true; From 1c643d0376a1909e7a8b8e0ce6931fc3c8b72b66 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 20:53:16 +0300 Subject: [PATCH 0134/1768] weird --- common/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/firefox.nix b/common/firefox.nix index e64e1e1..8a73904 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -82,7 +82,7 @@ let /* ---- PREFERENCES ---- */ # Check about:config for options. preferences = { - "browser.contentblocking.category" = { Value = "strict"; Status = "locked"; }; + "browser.contentblocking.category" = lock-true; "extensions.pocket.enabled" = lock-false; "extensions.screenshots.disabled" = lock-true; "browser.topsites.contile.enabled" = lock-false; From 9d9b24800e9e42d52b6c797008289612b3388694 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Dec 2024 20:53:58 +0300 Subject: [PATCH 0135/1768] try not locking --- common/firefox.nix | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/common/firefox.nix b/common/firefox.nix index 8a73904..a6c2011 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -82,25 +82,25 @@ let /* ---- PREFERENCES ---- */ # Check about:config for options. preferences = { - "browser.contentblocking.category" = lock-true; - "extensions.pocket.enabled" = lock-false; - "extensions.screenshots.disabled" = lock-true; - "browser.topsites.contile.enabled" = lock-false; - "browser.formfill.enable" = lock-false; - "browser.search.suggest.enabled" = lock-false; - "browser.search.suggest.enabled.private" = lock-false; - "browser.urlbar.suggest.searches" = lock-false; - "browser.urlbar.showSearchSuggestionsFirst" = lock-false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false; - "browser.newtabpage.activity-stream.feeds.snippets" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false; - "browser.newtabpage.activity-stream.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.system.showSponsored" = lock-false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false; - "toolkit.legacyUserProfileCustomizations.stylesheets" = lock-true; + "browser.contentblocking.category" = true; + "extensions.pocket.enabled" = false; + "extensions.screenshots.disabled" = true; + "browser.topsites.contile.enabled" = false; + "browser.formfill.enable" = false; + "browser.search.suggest.enabled" = false; + "browser.search.suggest.enabled.private" = false; + "browser.urlbar.suggest.searches" = false; + "browser.urlbar.showSearchSuggestionsFirst" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.snippets" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; }; }; From c29586f31292990524cacfb8f41c5e549c1c2052 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 09:43:36 +0300 Subject: [PATCH 0136/1768] seperate out hosts file --- common/concentration.nix | 11 +++++++++++ hosts/tartarus/configuration.nix | 10 +--------- hosts/ymir/configuration.nix | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 common/concentration.nix diff --git a/common/concentration.nix b/common/concentration.nix new file mode 100644 index 0000000..83e2523 --- /dev/null +++ b/common/concentration.nix @@ -0,0 +1,11 @@ +{ pkgs, lib, config, ... }: { + + networking.extraHosts = + '' + 0.0.0.0 youtube.com + ::0 youtube.com + + 0.0.0.0 www.youtube.com + ::0 www.youtube.com + ''; +} diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ac4d9fd..a122abe 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -14,6 +14,7 @@ ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix + ../../common/concentration.nix ]; # stylix.enable = true; @@ -45,15 +46,6 @@ networking.networkmanager.enable = true; - networking.extraHosts = - '' - 0.0.0.0 youtube.com - ::0 youtube.com - - 0.0.0.0 www.youtube.com - ::0 www.youtube.com - ''; - # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = true; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 1d1e279..595fa3d 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,6 +14,7 @@ ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix + ../../common/concentration.nix ]; # Bootloader. From 06ffb3f1659b3c5f6a5f9a3ad03282eec697d31b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 10:06:07 +0300 Subject: [PATCH 0137/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 07b8308..0e713fc 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { From 9a74c3167ff7c26352b68ba402d7fdf67b01ca45 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 10:06:37 +0300 Subject: [PATCH 0138/1768] add nom --- common/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/common-packages.nix b/common/common-packages.nix index fc633b7..07ff1f3 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -39,6 +39,7 @@ starship tree ffmpeg + nix-output-monitor ]; programs.steam = { From b7a926cfa92edbc11a44cfd182c8f436ab9d484a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 10:07:53 +0300 Subject: [PATCH 0139/1768] add justfile --- justfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 justfile diff --git a/justfile b/justfile new file mode 100644 index 0000000..dc4328d --- /dev/null +++ b/justfile @@ -0,0 +1,23 @@ +_default: + @just --list --unsorted + + +[linux] +build *args: + sudo nixos-rebuild build --flake . {{args}} |& nom + nvd diff /run/current-system ./result + +[linux] +switch *args: + sudo nixos-rebuild switch --flake . {{args}} |& nom + +update: + nix flake update + +check: + nix flake check + +clean: + sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old + # home-manager expire-generations now + sudo nix-collect-garbage --delete-older-than 3d From f396c65d5f06596a0db405a02a0804481ff39072 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 10:10:51 +0300 Subject: [PATCH 0140/1768] add check-git step --- justfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/justfile b/justfile index dc4328d..e0e90f7 100644 --- a/justfile +++ b/justfile @@ -2,6 +2,11 @@ _default: @just --list --unsorted +check-git: + # output of the git status --porcelain must be empty + test -z "$(git status --porcelain)" + + [linux] build *args: sudo nixos-rebuild build --flake . {{args}} |& nom From 75e2024965d98acd9c63840a8c911b67cfba7989 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 10:12:53 +0300 Subject: [PATCH 0141/1768] add dependency --- justfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/justfile b/justfile index e0e90f7..e88dce9 100644 --- a/justfile +++ b/justfile @@ -3,17 +3,17 @@ _default: check-git: - # output of the git status --porcelain must be empty + # git must be clean test -z "$(git status --porcelain)" [linux] -build *args: +build *args: check-git sudo nixos-rebuild build --flake . {{args}} |& nom nvd diff /run/current-system ./result [linux] -switch *args: +switch *args: check-git sudo nixos-rebuild switch --flake . {{args}} |& nom update: From 0ed8c9ca81dcb501f74442bcf811b0801a2b85ae Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 10:14:04 +0300 Subject: [PATCH 0142/1768] get rid of ugly makefile --- Makefile | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 48279ac..0000000 --- a/Makefile +++ /dev/null @@ -1,13 +0,0 @@ - - -check-status: - @if [ -n "$$(git status --porcelain)" ]; then \ - echo "Error: You have untracked or modified files. Please commit or stash your changes."; \ - exit 1; \ - fi - echo "Git is clean. :)" - -build: check-status - sudo nixos-rebuild switch --flake . - -.PHONY: check-status build From 5977b126ce782cd33569db2a79b562197226f405 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 12:08:44 +0300 Subject: [PATCH 0143/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0e713fc..48772a5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1733057282, - "narHash": "sha256-MNK2meL6gs+MsRSyMfrq3B+IRLJ/x0tiWwNds05sdQc=", + "lastModified": 1733129139, + "narHash": "sha256-Qp/P+Dtx8W0QPLSoU9vj5ohDvPzd9op66+Zbv5shb7o=", "owner": "osbm", "repo": "dotfiles", - "rev": "59b752cf485f867572b2b4237b4e40631af86dcb", + "rev": "2c33518f6fd83e2328ee79edb379a1603076313e", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1732575825, - "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", + "lastModified": 1733128155, + "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", + "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "type": "github" }, "original": { From 6365c99be20c0a4e5d9323f55dd0311358b04e67 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Dec 2024 16:31:44 +0300 Subject: [PATCH 0144/1768] add ollama to only ymir --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 595fa3d..41a6cf2 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -139,6 +139,7 @@ # $ nix search wget environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + ollama ]; # Some programs need SUID wrappers, can be configured further or are From 53a8737f12e1eb7d505eb7c95a5c2b06146b1ab2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 3 Dec 2024 00:02:22 +0300 Subject: [PATCH 0145/1768] disable hybernation in ymir --- hosts/ymir/configuration.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 41a6cf2..7d8691f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -102,6 +102,28 @@ #media-session.enable = true; }; + systemd = { + targets = { + sleep = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + suspend = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + hibernate = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + "hybrid-sleep" = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + }; + }; + + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; From 1a17560355889474cffe6e43cc6a099c10424b50 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 3 Dec 2024 00:29:52 +0300 Subject: [PATCH 0146/1768] update tasks --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 773c939..99c4306 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ But There are couple of things i need to do before: - [ ] learn how to deal with development environments - [ ] learn how to write derivations for cpp projects - [ ] configure hyprland -- [ ] disk encryption with disko +- [x] disk encryption with disko (cancelled) + - enabled disk encryption during system installation. - [ ] ssh gpg secret backup with sops - [x] add unstable channels to the flake.nix - [ ] home manager setup without translating every line in my configs to nix options. (tldr just symlink files the nix way) From bad5fa22d1405180695d518310a54dfcf48bc0c0 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 3 Dec 2024 00:33:42 +0300 Subject: [PATCH 0147/1768] update readme --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 99c4306..62bba8c 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,20 @@ -# nix-configuration -The nix configuration of mine. I am trying to find a very suitable workplace for myself. If i can get to be as comfortable as i am in Arch Linux I will switch to the NixOS on my Desktop too. +# nixos is life +The nix configuration of mine. + +Here i have 2 machines. +- Laptop **tartarus** (faulty hardware, nvidia gpu doesnt work) +- Desktop **ymir** (beast, my most prized possesion as of now) -But There are couple of things i need to do before: + +## To-do list - [x] add git hash to the nixos build generations -- [ ] fix cuda drivers - - [ ] fix nvidia-smi command +- [x] fix cuda drivers + - [x] fix nvidia-smi command - [ ] compile a cuda program successfully - [ ] build a python package with embedded cuda and run successfully -- [ ] learn how to deal with development environments +- [x] learn how to deal with development environments - [ ] learn how to write derivations for cpp projects - [ ] configure hyprland - [x] disk encryption with disko (cancelled) From 027e4413ef601749bb90f995e37e56791e9cec2d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 3 Dec 2024 15:05:22 +0300 Subject: [PATCH 0148/1768] add home-manager because of peer pressure --- flake.lock | 27 ++++++++++++++++++++++++--- flake.nix | 3 +++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 48772a5..286958b 100644 --- a/flake.lock +++ b/flake.lock @@ -34,13 +34,33 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733120037, + "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", "type": "github" }, "original": { @@ -69,6 +89,7 @@ "root": { "inputs": { "dotfiles": "dotfiles", + "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index b45b573..fa32688 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,9 @@ # stylix.url = "github:danth/stylix/master"; # stylix.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + dotfiles = { url = "github:osbm/dotfiles"; flake = false; From b6a8924c92dc3cf9f8557146dbd8ad4fdb435126 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 3 Dec 2024 20:55:39 +0300 Subject: [PATCH 0149/1768] why is there a random tab --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 7d8691f..a54f247 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -67,7 +67,7 @@ open = false; # Enable the Nvidia settings menu, - # accessible via `nvidia-settings`. + # accessible via `nvidia-settings` nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. From 18a9ed44ce207171dc770eb952d07eef9f4f75df Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 3 Dec 2024 23:37:05 +0300 Subject: [PATCH 0150/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 286958b..a717753 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733015953, - "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { From 53e59a321cc9906c70b7f5f8543ac572583a1217 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 4 Dec 2024 13:31:52 +0300 Subject: [PATCH 0151/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a717753..ee71009 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733304249, + "narHash": "sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "6c3a7a0b72c19ec994b85c57a1712d177bd809b2", "type": "github" }, "original": { From 8c80394cc21d8ef4d3fdb404eacaadeacaa59a82 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 4 Dec 2024 13:32:47 +0300 Subject: [PATCH 0152/1768] enable youtube for now --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a54f247..c86a8b2 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,7 +14,7 @@ ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix - ../../common/concentration.nix + # ../../common/concentration.nix ]; # Bootloader. From 382a7f31c9ab137d195cc39f4dfa4b29d8872658 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 4 Dec 2024 17:18:08 +0300 Subject: [PATCH 0153/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ee71009..04dd161 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733304249, - "narHash": "sha256-o6wNhr1ONxMuBJUGC9v0hEjFdv5rN6XzHJEL/rQJLjA=", + "lastModified": 1733317578, + "narHash": "sha256-anN/LcP5IuqEARvhPETg1vnbyG3IQ0wdvSAYEJfIQzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6c3a7a0b72c19ec994b85c57a1712d177bd809b2", + "rev": "ad48eb25cd0b00ce730da00fa1f8e6e6c27b397d", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733120037, - "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { From 85cc1c6b5720164ba83254b0065236a5461cab28 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 5 Dec 2024 11:12:08 +0300 Subject: [PATCH 0154/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 04dd161..eb50908 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733317578, - "narHash": "sha256-anN/LcP5IuqEARvhPETg1vnbyG3IQ0wdvSAYEJfIQzA=", + "lastModified": 1733354384, + "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=", "owner": "nix-community", "repo": "home-manager", - "rev": "ad48eb25cd0b00ce730da00fa1f8e6e6c27b397d", + "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe", "type": "github" }, "original": { From 9ea006416bb4b314d58fbc68356a516c1d5a01f2 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 5 Dec 2024 21:22:00 +0300 Subject: [PATCH 0155/1768] add cachix --- common/nix-settings.nix | 2 ++ flake.nix | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index 4eeb821..833993c 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -6,6 +6,8 @@ # enable nix flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.trusted-users = [ "root", "osbm" ]; + nix.gc = { automatic = true; dates = "weekly"; diff --git a/flake.nix b/flake.nix index fa32688..1191a6e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,14 @@ { description = "My system configuration"; + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; From ed2c9dae63eb333a58fba564b31c0f324febde03 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 5 Dec 2024 21:23:11 +0300 Subject: [PATCH 0156/1768] =?UTF-8?q?weird=20nix=20syntax=20=F0=9F=98=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index 833993c..71134c6 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -6,7 +6,7 @@ # enable nix flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix.settings.trusted-users = [ "root", "osbm" ]; + nix.settings.trusted-users = [ "root" "osbm" ]; nix.gc = { automatic = true; From 4270908330b2b0fcbab3531da3cb4951fb9845dd Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 5 Dec 2024 22:20:56 +0300 Subject: [PATCH 0157/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index eb50908..df7a587 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733354384, - "narHash": "sha256-foZG2PLwumxYZkpXq7ajHDhuQlXaUeKfOpFfQpMviLM=", + "lastModified": 1733389730, + "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", "owner": "nix-community", "repo": "home-manager", - "rev": "0daaded612b0e6eaed0a63fc9d0778d8f05940fe", + "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", "type": "github" }, "original": { From 384874f55df91a225d831db49319b7fc13cfc8db Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 6 Dec 2024 14:23:46 +0300 Subject: [PATCH 0158/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index df7a587..a3725c6 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { From 8f1d91e86c9fd8fbe4e02913ade1e7d06c973cd2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 6 Dec 2024 16:53:30 +0300 Subject: [PATCH 0159/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a3725c6..0eb3148 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { From ba87de48e679a4a7a7fc46488e5baf502515870a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 15:29:18 +0300 Subject: [PATCH 0160/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0eb3148..2765d6d 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733261153, - "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { From 4f0cdda387c4a609803a0200c862b4190300276d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:08:48 +0300 Subject: [PATCH 0161/1768] ignore result file --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result From 2a6d62052c10c0ab490cb84c968118de04985392 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:09:03 +0300 Subject: [PATCH 0162/1768] add builder workflow --- .github/workflows/nix.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/nix.yml diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml new file mode 100644 index 0000000..6af865e --- /dev/null +++ b/.github/workflows/nix.yml @@ -0,0 +1,28 @@ +name: Nix +on: + push: + branches: + - master + pull_request: +jobs: + build: + strategy: + matrix: + os: + - ubuntu-20.04 + target-system: + - ymir + - tartarus + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v16 + # TODO: add a binary cache + # - uses: cachix/cachix-action@v10 + # with: + # name: YOURCACHE + # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - run: nix flake check + # Pre-build the system configuration + - run: nix build .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel + From 4e8232704c8915dd8251f23f4770f3e44736f42b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:10:29 +0300 Subject: [PATCH 0163/1768] enable for all branches --- .github/workflows/nix.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 6af865e..779ef1d 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -1,8 +1,6 @@ name: Nix on: push: - branches: - - master pull_request: jobs: build: From 4506f7a158ab3ebfc92d154ce373074259112fe6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:14:38 +0300 Subject: [PATCH 0164/1768] accept flake config --- .github/workflows/nix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 779ef1d..fbcaaf5 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -20,7 +20,7 @@ jobs: # with: # name: YOURCACHE # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - run: nix flake check + - run: nix flake check --accept-flake-config # Pre-build the system configuration - run: nix build .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel From 7c45956ee5bdc507ee6f92b683943b64e8a7df61 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:19:39 +0300 Subject: [PATCH 0165/1768] not enough space on github actions for this --- .github/workflows/nix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index fbcaaf5..c53589e 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -22,5 +22,5 @@ jobs: # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix flake check --accept-flake-config # Pre-build the system configuration - - run: nix build .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel + - run: nix build --accept-flake-config --dry-run .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel From 8b211fa373604ab08adf5eb87f0ed5e1bef8fbda Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:47:21 +0300 Subject: [PATCH 0166/1768] add formatter --- .github/workflows/nix.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index c53589e..bc8719c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -23,4 +23,10 @@ jobs: - run: nix flake check --accept-flake-config # Pre-build the system configuration - run: nix build --accept-flake-config --dry-run .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v16 + - run: nix shell nixpkgs#alejandra -c alejandra -c . From cd91077c8671e3ab005cfba83df706bc705e6fb1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:53:41 +0300 Subject: [PATCH 0167/1768] change job name --- .github/workflows/nix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index bc8719c..f89237b 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -23,7 +23,7 @@ jobs: - run: nix flake check --accept-flake-config # Pre-build the system configuration - run: nix build --accept-flake-config --dry-run .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel - build: + check-formatting: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 55553b0b0f5646e431daf8216049376351b57b2b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 16:57:03 +0300 Subject: [PATCH 0168/1768] format nix --- common/arduino.nix | 9 ++- common/common-packages.nix | 11 ++-- common/concentration.nix | 11 ++-- common/firefox.nix | 47 ++++++------- common/fonts.nix | 9 ++- common/i18n.nix | 13 ++-- common/nix-settings.nix | 17 ++--- common/python.nix | 9 ++- flake.nix | 80 +++++++++++------------ hosts/tartarus/configuration.nix | 24 +++---- hosts/tartarus/hardware-configuration.nix | 46 +++++++------ hosts/ymir/configuration.nix | 21 +++--- hosts/ymir/hardware-configuration.nix | 46 +++++++------ 13 files changed, 175 insertions(+), 168 deletions(-) diff --git a/common/arduino.nix b/common/arduino.nix index 5f1e0ce..6152eb8 100644 --- a/common/arduino.nix +++ b/common/arduino.nix @@ -1,5 +1,9 @@ -{ pkgs, lib, config, ... }: { - +{ + pkgs, + lib, + config, + ... +}: { environment.systemPackages = with pkgs; [ # arduino-ide adafruit-nrfutil @@ -8,5 +12,4 @@ services.udev.extraRules = '' KERNEL=="ttyACM0", MODE="0666" ''; - } diff --git a/common/common-packages.nix b/common/common-packages.nix index 07ff1f3..c0df9e7 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -1,6 +1,10 @@ -{ pkgs, pkgs-unstable, lib, config, ... }: { - - +{ + pkgs, + pkgs-unstable, + lib, + config, + ... +}: { environment.systemPackages = with pkgs; [ vim wget @@ -68,5 +72,4 @@ package = pkgs.nix-direnv; }; }; - } diff --git a/common/concentration.nix b/common/concentration.nix index 83e2523..52cf7c3 100644 --- a/common/concentration.nix +++ b/common/concentration.nix @@ -1,7 +1,10 @@ -{ pkgs, lib, config, ... }: { - - networking.extraHosts = - '' +{ + pkgs, + lib, + config, + ... +}: { + networking.extraHosts = '' 0.0.0.0 youtube.com ::0 youtube.com diff --git a/common/firefox.nix b/common/firefox.nix index a6c2011..2a00c8d 100644 --- a/common/firefox.nix +++ b/common/firefox.nix @@ -3,19 +3,16 @@ lib, config, ... -}: -let - lock-false = { - Value = false; - Status = "locked"; - }; - lock-true = { - Value = true; - Status = "locked"; - }; - in -{ - +}: let + lock-false = { + Value = false; + Status = "locked"; + }; + lock-true = { + Value = true; + Status = "locked"; + }; +in { # Install firefox. programs.firefox = { enable = true; @@ -27,7 +24,6 @@ let # profiles.osbm = { - # Check about:policies#documentation for options. policies = { DisableTelemetry = true; @@ -49,17 +45,15 @@ let DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" # SearchBar = "unified"; # alternat - ExtensionSettings = - with builtins; - let - extension = shortId: uuid: { - name = uuid; - value = { - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; - }; + ExtensionSettings = with builtins; let + extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; }; - in + }; + in listToAttrs [ (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") (extension "ublock-origin" "uBlock0@raymondhill.net") @@ -79,7 +73,9 @@ let # `jq .applications.gecko.id manifest.json` to get the UUID }; - /* ---- PREFERENCES ---- */ + /* + ---- PREFERENCES ---- + */ # Check about:config for options. preferences = { "browser.contentblocking.category" = true; @@ -103,5 +99,4 @@ let "toolkit.legacyUserProfileCustomizations.stylesheets" = true; }; }; - } diff --git a/common/fonts.nix b/common/fonts.nix index 8e5c5cb..3017f52 100644 --- a/common/fonts.nix +++ b/common/fonts.nix @@ -1,5 +1,9 @@ -{ pkgs, lib, config, ... }: { - +{ + pkgs, + lib, + config, + ... +}: { fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans @@ -18,5 +22,4 @@ font-awesome_5 roboto ]; - } diff --git a/common/i18n.nix b/common/i18n.nix index 73d9c6b..5de8971 100644 --- a/common/i18n.nix +++ b/common/i18n.nix @@ -1,5 +1,10 @@ -{ pkgs, lib, config, pkgs-unstable, ... }: { - +{ + pkgs, + lib, + config, + pkgs-unstable, + ... +}: { time.timeZone = "Europe/Istanbul"; # Select internationalisation properties. @@ -17,7 +22,6 @@ LC_TIME = "ja_JP.UTF-8"; }; - services.xserver.xkb = { layout = "us"; variant = ""; @@ -29,8 +33,7 @@ fcitx5.addons = with pkgs; [ pkgs-unstable.fcitx5-mozc #TODO revert back to stable once its updated fcitx5-gtk - fcitx5-nord # a color theme + fcitx5-nord # a color theme ]; }; - } diff --git a/common/nix-settings.nix b/common/nix-settings.nix index 71134c6..aa87967 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -1,12 +1,16 @@ -{ pkgs, lib, config, ... }: { - +{ + pkgs, + lib, + config, + ... +}: { # Allow unfree packages nixpkgs.config.allowUnfree = true; # enable nix flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; - nix.settings.trusted-users = [ "root" "osbm" ]; + nix.settings.trusted-users = ["root" "osbm"]; nix.gc = { automatic = true; @@ -14,11 +18,8 @@ options = "--delete-older-than 30d"; }; - nix.nixPath = [ "nixpkgs=${pkgs.path}" ]; - + nix.nixPath = ["nixpkgs=${pkgs.path}"]; # disable the database error TODO add nix-index search programs.command-not-found.enable = false; - } - diff --git a/common/python.nix b/common/python.nix index 497d5da..88e9374 100644 --- a/common/python.nix +++ b/common/python.nix @@ -1,6 +1,9 @@ -{ pkgs, lib, config, ... }: { - - +{ + pkgs, + lib, + config, + ... +}: { environment.systemPackages = with pkgs; [ (pkgs.python312.withPackages (ppkgs: [ python312Packages.pip diff --git a/flake.nix b/flake.nix index 1191a6e..79200f2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" @@ -32,50 +31,49 @@ }; }; - outputs = - { - self, - nixpkgs, - nixpkgs-unstable, - vscode-server, - sops-nix, - ... - }: - { - nixosConfigurations = { - # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; - tartarus = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ - ./hosts/tartarus/configuration.nix - vscode-server.nixosModules.default - sops-nix.nixosModules.sops - # stylix.nixosModules.stylix - ]; - specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + outputs = { + self, + nixpkgs, + nixpkgs-unstable, + vscode-server, + sops-nix, + ... + }: { + nixosConfigurations = { + # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + tartarus = nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + modules = [ + ./hosts/tartarus/configuration.nix + vscode-server.nixosModules.default + sops-nix.nixosModules.sops + # stylix.nixosModules.stylix + ]; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; }; + system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; - ymir = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = [ - ./hosts/ymir/configuration.nix - vscode-server.nixosModules.default - sops-nix.nixosModules.sops - # stylix.nixosModules.stylix - ]; - specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + }; + ymir = nixpkgs.lib.nixosSystem rec { + system = "x86_64-linux"; + modules = [ + ./hosts/ymir/configuration.nix + vscode-server.nixosModules.default + sops-nix.nixosModules.sops + # stylix.nixosModules.stylix + ]; + specialArgs = { + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; }; + system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; }; }; }; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; + }; } diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index a122abe..7c79517 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -1,10 +1,13 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, pkgs-unstable, system-label, ... }: - { + config, + pkgs, + pkgs-unstable, + system-label, + ... +}: { imports = [ ./hardware-configuration.nix ../../common/fonts.nix @@ -26,10 +29,8 @@ services.vscode-server.enable = true; - virtualisation.virtualbox.host.enable = true; - users.extraGroups.vboxusers.members = [ "osbm" ]; - + users.extraGroups.vboxusers.members = ["osbm"]; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -45,7 +46,6 @@ # Enable networking networking.networkmanager.enable = true; - # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = true; @@ -54,7 +54,6 @@ services.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; - # Enable CUPS to print documents. services.printing.enable = true; @@ -68,8 +67,6 @@ pulse.enable = true; }; - - # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; virtualisation.docker.enable = true; @@ -78,7 +75,7 @@ users.users.osbm = { isNormalUser = true; description = "osbm"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; + extraGroups = ["networkmanager" "wheel" "docker"]; packages = with pkgs; [ kdePackages.kate vscode @@ -97,8 +94,6 @@ ]; }; - - environment.systemPackages = with pkgs; [ ]; @@ -106,13 +101,11 @@ # started in user sessions. # programs.mtr.enable = true; - # List services that you want to enable: # Enable the OpenSSH daemon. services.openssh.enable = true; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; @@ -127,5 +120,4 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.05"; # Did you read the comment? - } diff --git a/hosts/tartarus/hardware-configuration.nix b/hosts/tartarus/hardware-configuration.nix index ed2d3bb..aecb129 100644 --- a/hosts/tartarus/hardware-configuration.nix +++ b/hosts/tartarus/hardware-configuration.nix @@ -1,32 +1,36 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/246d3df7-3578-44b2-8aee-c1ed33581184"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/246d3df7-3578-44b2-8aee-c1ed33581184"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/33D0-6524"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/33D0-6524"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/b74b04db-c7ea-44e7-b3fe-15cd6d0cd851"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/b74b04db-c7ea-44e7-b3fe-15cd6d0cd851";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index c86a8b2..3ce6ba5 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -1,10 +1,13 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, pkgs-unstable, system-label, ... }: - { + config, + pkgs, + pkgs-unstable, + system-label, + ... +}: { imports = [ ./hardware-configuration.nix ../../common/fonts.nix @@ -32,7 +35,6 @@ # Enable networking networking.networkmanager.enable = true; - # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; # Enable OpenGL hardware.graphics = { @@ -43,7 +45,6 @@ services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { - # Modesetting is required. modesetting.enable = true; @@ -74,7 +75,6 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; - # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = true; @@ -123,7 +123,6 @@ }; }; - # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -133,7 +132,7 @@ users.users.osbm = { isNormalUser = true; description = "osbm"; - extraGroups = [ "networkmanager" "wheel" "docker" ]; + extraGroups = ["networkmanager" "wheel" "docker"]; packages = with pkgs; [ kdePackages.kate vscode @@ -152,15 +151,12 @@ ]; }; - - nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. ollama ]; @@ -190,5 +186,4 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.11"; # Did you read the comment? - } diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/ymir/hardware-configuration.nix index 08a4429..e51ea49 100644 --- a/hosts/ymir/hardware-configuration.nix +++ b/hosts/ymir/hardware-configuration.nix @@ -1,34 +1,38 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/bfbd04d5-49bb-4571-8897-d36b2c679a6c"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/bfbd04d5-49bb-4571-8897-d36b2c679a6c"; + fsType = "ext4"; + }; boot.initrd.luks.devices."luks-58144581-4049-4169-b8a9-4da19129416a".device = "/dev/disk/by-uuid/58144581-4049-4169-b8a9-4da19129416a"; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/7F17-2E5B"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7F17-2E5B"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/a07d03b7-c2fb-40f9-89b0-d8f6db9d0e0e"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/a07d03b7-c2fb-40f9-89b0-d8f6db9d0e0e";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From bf5f4746abaa5537a24988ca7b7630101a1b0f53 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 17:00:30 +0300 Subject: [PATCH 0169/1768] use set ubuntu version --- .github/workflows/nix.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index f89237b..c1b8157 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -6,12 +6,10 @@ jobs: build: strategy: matrix: - os: - - ubuntu-20.04 target-system: - ymir - tartarus - runs-on: ${{ matrix.os }} + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 @@ -24,7 +22,7 @@ jobs: # Pre-build the system configuration - run: nix build --accept-flake-config --dry-run .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel check-formatting: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 From 243b61d85740d9dac32a2acb5d28c8308ffdec2e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 17:04:09 +0300 Subject: [PATCH 0170/1768] check more items --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62bba8c..36da556 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ Here i have 2 machines. - [x] add unstable channels to the flake.nix - [ ] home manager setup without translating every line in my configs to nix options. (tldr just symlink files the nix way) - [x] add japanese IME fcitx5 mosc -- [ ] add beautifier to the nix code. +- [x] add beautifier to the nix code. - [ ] make an ISO file with my configurations -- [ ] make a github action that tests if my configuration is gonna build successfully or not +- [x] make a github action that tests if my configuration is gonna build successfully or not - [x] learn cache management - [x] add stylix From 3a23586086e4ec9172d9b3276ebd3154f84196be Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 22:16:07 +0300 Subject: [PATCH 0171/1768] add prismlauncher --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 3ce6ba5..2c43553 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -148,6 +148,7 @@ audacity pkgs-unstable.qbittorrent arduino-ide + prismlauncher ]; }; From 2e0e8f5f3fb035376a6cc956c68668282d4e8488 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Dec 2024 22:18:57 +0300 Subject: [PATCH 0172/1768] try accepting flake config --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index e88dce9..b136a91 100644 --- a/justfile +++ b/justfile @@ -14,7 +14,7 @@ build *args: check-git [linux] switch *args: check-git - sudo nixos-rebuild switch --flake . {{args}} |& nom + sudo nixos-rebuild switch --accept-flake-config --flake . {{args}} |& nom update: nix flake update From efac578236526240592c5fc5acdf7b8b45ba1112 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 8 Dec 2024 19:25:42 +0300 Subject: [PATCH 0173/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2765d6d..322ec41 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { From 2568e34b32ded79c53ba04d4f05532ec404841a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 8 Dec 2024 19:35:32 +0300 Subject: [PATCH 0174/1768] disable youtube again --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 2c43553..3250130 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -17,7 +17,7 @@ ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix - # ../../common/concentration.nix + ../../common/concentration.nix ]; # Bootloader. From 08f41e3d6f50ecf845e71521b4432211207c049e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 9 Dec 2024 09:47:13 +0300 Subject: [PATCH 0175/1768] unstable arduino --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 7c79517..dfd42eb 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -90,7 +90,7 @@ obs-studio audacity pkgs-unstable.qbittorrent - arduino-ide + pkgs-unstable.arduino-ide ]; }; From 395fe68b6897efbe3d3078921fb2aa0a398f0661 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 9 Dec 2024 09:54:02 +0300 Subject: [PATCH 0176/1768] the fuck kind of error is this? --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index dfd42eb..f99b59a 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -97,6 +97,7 @@ environment.systemPackages = with pkgs; [ ]; + hardware.opengl.setLdLibraryPath = true; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; From 60289cd588f957e0a08c26241632848d28cd9148 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 9 Dec 2024 09:55:32 +0300 Subject: [PATCH 0177/1768] cancel --- hosts/tartarus/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index f99b59a..dfd42eb 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -97,7 +97,6 @@ environment.systemPackages = with pkgs; [ ]; - hardware.opengl.setLdLibraryPath = true; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; From cb0d6aae4d3589145581d8f6e0ae0469a4ab9d8b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 9 Dec 2024 11:29:19 +0300 Subject: [PATCH 0178/1768] try usb --- common/arduino.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/arduino.nix b/common/arduino.nix index 6152eb8..6be9e8d 100644 --- a/common/arduino.nix +++ b/common/arduino.nix @@ -10,6 +10,6 @@ ]; services.udev.extraRules = '' - KERNEL=="ttyACM0", MODE="0666" + KERNEL=="ttyUSB0", MODE="0666" ''; } From 05988fad3c7812e11d577c13b6409307fc5b8f4d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 9 Dec 2024 16:34:58 +0300 Subject: [PATCH 0179/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 322ec41..d6775c4 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { From 610a2987bbfaea47ffe8f79818d4d8bf5ba59149 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 9 Dec 2024 16:44:21 +0300 Subject: [PATCH 0180/1768] use ollama service --- hosts/ymir/configuration.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 3250130..ec6e275 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -158,9 +158,13 @@ # $ nix search wget environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - ollama ]; + services.ollama = { + enable = true; + acceleration = "cuda"; + }; + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; From 3e59bdd849a95631359817eb03db8af4d42ff74c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Dec 2024 00:23:14 +0300 Subject: [PATCH 0181/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d6775c4..c57918d 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1733754861, + "narHash": "sha256-3JKzIou54yjiMVmvgdJwopekEvZxX3JDT8DpKZs4oXY=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "9ebaa80a227eaca9c87c53ed515ade013bc2bca9", "type": "github" }, "original": { From 92744d63c7aee371c1f6b6ce47805ce5ab7e6b98 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Dec 2024 19:41:32 +0300 Subject: [PATCH 0182/1768] add nvidia container toolkit to ymir --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ec6e275..a722faf 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -158,6 +158,7 @@ # $ nix search wget environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + nvidia-container-toolkit ]; services.ollama = { From e30981dcc31b9b06e32128a7bb5b075ec3aba94d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Dec 2024 19:50:29 +0300 Subject: [PATCH 0183/1768] try out --- hosts/ymir/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a722faf..a406e18 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -127,7 +127,10 @@ # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - virtualisation.docker.enable = true; + virtualisation.docker = { + enable = true; + enableNvidia = true; + }; users.users.osbm = { isNormalUser = true; From 819dfe5cbfdba09981b501b378c24e939f7a7681 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Dec 2024 19:53:26 +0300 Subject: [PATCH 0184/1768] try this out for docker nvidia --- hosts/ymir/configuration.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a406e18..535052f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -35,6 +35,8 @@ # Enable networking networking.networkmanager.enable = true; + hardware.nvidia-container-toolkit.enable; + # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; # Enable OpenGL hardware.graphics = { @@ -127,10 +129,7 @@ # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - virtualisation.docker = { - enable = true; - enableNvidia = true; - }; + virtualisation.docker.enable = true; users.users.osbm = { isNormalUser = true; From 529c3a14531ec381ac1b883626b495704d08d81a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Dec 2024 19:54:08 +0300 Subject: [PATCH 0185/1768] hotfix --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 535052f..619ed86 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -35,7 +35,7 @@ # Enable networking networking.networkmanager.enable = true; - hardware.nvidia-container-toolkit.enable; + hardware.nvidia-container-toolkit.enable = true; # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; # Enable OpenGL From ae8b0300aa052717683c1187260479e9cc8087be Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 11 Dec 2024 03:58:08 +0300 Subject: [PATCH 0186/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c57918d..8e7ab9c 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1733129139, - "narHash": "sha256-Qp/P+Dtx8W0QPLSoU9vj5ohDvPzd9op66+Zbv5shb7o=", + "lastModified": 1733843196, + "narHash": "sha256-mLb4YQLoQ55pqTDMS3Ku2AeIlaJcVTVIETPeSKbkYRk=", "owner": "osbm", "repo": "dotfiles", - "rev": "2c33518f6fd83e2328ee79edb379a1603076313e", + "rev": "70a84ef9b697f449b52d18d634f5e2a0ad0b9951", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733754861, - "narHash": "sha256-3JKzIou54yjiMVmvgdJwopekEvZxX3JDT8DpKZs4oXY=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ebaa80a227eaca9c87c53ed515ade013bc2bca9", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733785344, + "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a", "type": "github" }, "original": { From 3ed38bd8f56801c1ccec102251e7b8321640ceaf Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 11 Dec 2024 17:46:04 +0300 Subject: [PATCH 0187/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8e7ab9c..7aa7519 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { From 1b5e9b2e37aa540cae519a68d1970b5dd440518d Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 11 Dec 2024 18:08:11 +0300 Subject: [PATCH 0188/1768] try latest driver --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 619ed86..2297b79 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -74,7 +74,7 @@ nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.latest; }; # Enable the X11 windowing system. From 58ade75dcf8f93f5a4f04ecd3295609138cb3641 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 11 Dec 2024 18:11:49 +0300 Subject: [PATCH 0189/1768] try latest driver --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 2297b79..f959fe7 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -74,7 +74,7 @@ nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.latest; + package = config.boot.kernelPackages_6_6.nvidiaPackages.beta; }; # Enable the X11 windowing system. From 166e7a8c0baeca6272aa6a33fa24f3f22032cce6 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 11 Dec 2024 18:14:36 +0300 Subject: [PATCH 0190/1768] try latest driver again --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index f959fe7..fc66c3f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -74,7 +74,7 @@ nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages_6_6.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; # Enable the X11 windowing system. From e67eb90d26bfe0eccfe87b71aac3f4f27aa5b378 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 11 Dec 2024 20:46:05 +0300 Subject: [PATCH 0191/1768] dont use global python package in nixos --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index fc66c3f..e60c572 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -13,7 +13,7 @@ ../../common/fonts.nix ../../common/nix-settings.nix ../../common/i18n.nix - ../../common/python.nix + # ../../common/python.nix ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix From b1ac56cd69722093133cf186e115784a6322f584 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 12 Dec 2024 03:59:53 +0300 Subject: [PATCH 0192/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7aa7519..48773ec 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { From 7edc108f2877e75527ac6d2cb9b1cfc723918d53 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 12 Dec 2024 19:49:29 +0300 Subject: [PATCH 0193/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 48773ec..e667ae2 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ ] }, "locked": { - "lastModified": 1733785344, - "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { From 9008f3fd10de9fd501ee2b8cc14748b09581c25a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 12 Dec 2024 23:37:55 +0300 Subject: [PATCH 0194/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e667ae2..f779ede 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1733951607, - "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", + "lastModified": 1734031102, + "narHash": "sha256-6RDywJJ1AuG2NflpXaWgNDYOOLGCqgTezUuc0RiEYzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", + "rev": "15151bb5e7d6e352247ecaeeeefc34d0f306b287", "type": "github" }, "original": { From 1d89eec86de0010297e1cbd5024c5cd57cdb635b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Dec 2024 14:32:48 +0300 Subject: [PATCH 0195/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f779ede..bcb2d39 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1734031102, - "narHash": "sha256-6RDywJJ1AuG2NflpXaWgNDYOOLGCqgTezUuc0RiEYzA=", + "lastModified": 1734043726, + "narHash": "sha256-e9YAMReFV1fDPcZLFC2pa4k/8TloSXeX0z2VysNMAoA=", "owner": "nix-community", "repo": "home-manager", - "rev": "15151bb5e7d6e352247ecaeeeefc34d0f306b287", + "rev": "3066cc58f552421a2c5414e78407fa5603405b1e", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { From ec653c5d1bca3d5f2433160804bd49961bf5c752 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Dec 2024 15:56:32 +0300 Subject: [PATCH 0196/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bcb2d39..deb877b 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1734043726, - "narHash": "sha256-e9YAMReFV1fDPcZLFC2pa4k/8TloSXeX0z2VysNMAoA=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3066cc58f552421a2c5414e78407fa5603405b1e", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { From 1ee3257c9376e07ce117adc4c28611482cf3e959 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 04:25:36 +0300 Subject: [PATCH 0197/1768] some rewrite to the flake --- flake.lock | 393 +++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 35 ++--- 2 files changed, 397 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index deb877b..42e31f7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,60 @@ { "nodes": { - "dotfiles": { - "flake": false, + "devshell": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1733843196, - "narHash": "sha256-mLb4YQLoQ55pqTDMS3Ku2AeIlaJcVTVIETPeSKbkYRk=", - "owner": "osbm", - "repo": "dotfiles", - "rev": "70a84ef9b697f449b52d18d634f5e2a0ad0b9951", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { - "owner": "osbm", - "repo": "dotfiles", + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -20,6 +62,24 @@ "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" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -34,6 +94,62 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "osbm-nvim", + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -54,6 +170,103 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "osbm-nvim", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729958008, + "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.6", + "repo": "ixx", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixpkgs" + ], + "nmd": "nmd", + "nmt": "nmt" + }, + "locked": { + "lastModified": 1729445390, + "narHash": "sha256-TxJ7RZLlBkKWZos1ai3eWIH0fBq1G6SVE+q3dW+0qRU=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "9f4bcf647cad2edafda7e1143071e0daf37cbc41", + "type": "github" + }, + "original": { + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1733808091, @@ -86,12 +299,133 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "osbm-nvim", + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1734103614, + "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nmd": { + "flake": false, + "locked": { + "lastModified": 1666190571, + "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=", + "owner": "rycee", + "repo": "nmd", + "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmd", + "type": "gitlab" + } + }, + "nmt": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "ixx": "ixx", + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "owner": "NuschtOS", + "repo": "search", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, + "osbm-nvim": { + "inputs": { + "nix-formatter-pack": "nix-formatter-pack", + "nixpkgs": "nixpkgs_2", + "nixvim": "nixvim" + }, + "locked": { + "lastModified": 1734135886, + "narHash": "sha256-/dU6ym759CJnVdur/jHYLH/h1l2wlgDNzzKxsIZYo9Y=", + "owner": "osbm", + "repo": "osbm-nvim", + "rev": "bea0d00a8594fc1650f70bb3c7d8c784559865c2", + "type": "github" + }, + "original": { + "owner": "osbm", + "repo": "osbm-nvim", + "type": "github" + } + }, "root": { "inputs": { - "dotfiles": "dotfiles", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "osbm-nvim": "osbm-nvim", "sops-nix": "sops-nix", "vscode-server": "vscode-server" } @@ -131,9 +465,46 @@ "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" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "osbm-nvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 79200f2..7fec4ce 100644 --- a/flake.nix +++ b/flake.nix @@ -25,10 +25,7 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - dotfiles = { - url = "github:osbm/dotfiles"; - flake = false; - }; + osbm-nvim.url = "github:osbm/osbm-nvim"; }; outputs = { @@ -37,40 +34,38 @@ nixpkgs-unstable, vscode-server, sops-nix, + osbm-nvim, ... }: { - nixosConfigurations = { - # revision = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + nixosConfigurations = let + system = "x86_64-linux"; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; + system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + in + { tartarus = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; + inherit system; modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default sops-nix.nixosModules.sops - # stylix.nixosModules.stylix ]; specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + inherit pkgs-unstable system-label; }; }; ymir = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; + inherit system; modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default sops-nix.nixosModules.sops - # stylix.nixosModules.stylix ]; specialArgs = { - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; + inherit pkgs-unstable system-label; }; }; }; From 30485caf09b16735a112c386c461f99d719d6f6a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 04:25:56 +0300 Subject: [PATCH 0198/1768] remove default neovim --- common/common-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/common-packages.nix b/common/common-packages.nix index c0df9e7..2fb3bd4 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -6,7 +6,7 @@ ... }: { environment.systemPackages = with pkgs; [ - vim + # vim wget git git-lfs @@ -20,7 +20,7 @@ unzip tlrc wakeonlan - neovim + # neovim pkgs-unstable.ani-cli btop pciutils From c3fbe2e337d2aed5ed0c3572471d90f1eb38a400 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Dec 2024 04:29:28 +0300 Subject: [PATCH 0199/1768] formatting --- flake.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 7fec4ce..002fca9 100644 --- a/flake.nix +++ b/flake.nix @@ -38,14 +38,13 @@ ... }: { nixosConfigurations = let - system = "x86_64-linux"; + system = "x86_64-linux"; pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; + inherit system; + config.allowUnfree = true; + }; system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; - in - { + in { tartarus = nixpkgs.lib.nixosSystem rec { inherit system; modules = [ From d9a7547306b1babc3367bca4bafd3d64d4f18007 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 15 Dec 2024 19:36:44 +0300 Subject: [PATCH 0200/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 42e31f7..80ee13d 100644 --- a/flake.lock +++ b/flake.lock @@ -269,11 +269,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { @@ -285,11 +285,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -407,11 +407,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734135886, - "narHash": "sha256-/dU6ym759CJnVdur/jHYLH/h1l2wlgDNzzKxsIZYo9Y=", + "lastModified": 1734169435, + "narHash": "sha256-9VZIhF2/I/uiTtM/xqDqp3Mso/JNd/rHnnLLKpNfC+s=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "bea0d00a8594fc1650f70bb3c7d8c784559865c2", + "rev": "1ef6ff4c64ff32cf46783ebfd435acbfd7fadb40", "type": "github" }, "original": { From 5d0ee5b35624dcf3fae93f3eeac5a88b0a62b026 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Dec 2024 01:08:16 +0300 Subject: [PATCH 0201/1768] add yazi --- common/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/common-packages.nix b/common/common-packages.nix index 2fb3bd4..a2344e4 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -44,6 +44,7 @@ tree ffmpeg nix-output-monitor + yazi ]; programs.steam = { From 635048d7a141841e9cc33ead8387ca396b83fafc Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Dec 2024 09:39:56 +0300 Subject: [PATCH 0202/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 80ee13d..cbf1acc 100644 --- a/flake.lock +++ b/flake.lock @@ -407,11 +407,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734169435, - "narHash": "sha256-9VZIhF2/I/uiTtM/xqDqp3Mso/JNd/rHnnLLKpNfC+s=", + "lastModified": 1734300674, + "narHash": "sha256-577iMXwJNFN+6h2JAe4hBXYIZlO6sWVxJqSDiB16wgM=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "1ef6ff4c64ff32cf46783ebfd435acbfd7fadb40", + "rev": "f62258d9b712e84a1f1ce8dfb523a2d06abc6610", "type": "github" }, "original": { From 97a10bf9b2a246681ac8a456c0bb0a7957036295 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Dec 2024 15:13:46 +0300 Subject: [PATCH 0203/1768] add ripgrep --- common/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/common-packages.nix b/common/common-packages.nix index a2344e4..94f8eb3 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -45,6 +45,7 @@ ffmpeg nix-output-monitor yazi + ripgrep ]; programs.steam = { From 6610ba8b091946bae53eba28bfb8a323e3a11465 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Dec 2024 16:06:49 +0300 Subject: [PATCH 0204/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cbf1acc..8bdad18 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { From 9c274c128b268d150562a7c2a6fc213fd905c226 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Dec 2024 16:16:46 +0300 Subject: [PATCH 0205/1768] add bluetooth --- hosts/tartarus/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index dfd42eb..e175324 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -67,6 +67,9 @@ pulse.enable = true; }; + hardware.bluetooth.enable = true; # enables support for Bluetooth + hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot + # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; virtualisation.docker.enable = true; From 5a7d8fcba68a21080176601a61a72557b9b9c5cd Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 00:06:17 +0300 Subject: [PATCH 0206/1768] add my nvim --- flake.nix | 4 ++-- hosts/ymir/configuration.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 002fca9..371486a 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ sops-nix.nixosModules.sops ]; specialArgs = { - inherit pkgs-unstable system-label; + inherit pkgs-unstable system-label osbm-nvim; }; }; ymir = nixpkgs.lib.nixosSystem rec { @@ -64,7 +64,7 @@ sops-nix.nixosModules.sops ]; specialArgs = { - inherit pkgs-unstable system-label; + inherit pkgs-unstable system-label osbm-nvim; }; }; }; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index e60c572..1db1849 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -6,6 +6,7 @@ pkgs, pkgs-unstable, system-label, + osbm-nvim, ... }: { imports = [ @@ -161,6 +162,7 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit + osbm-nvim ]; services.ollama = { From 055dfc4ee50fe9bef77125103167f6ff08bfdd72 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 00:10:19 +0300 Subject: [PATCH 0207/1768] try this --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 1db1849..479c37b 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -162,7 +162,7 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit - osbm-nvim + khanelivim.packages.${system}.default ]; services.ollama = { From 6f8ecf18b9013a5e78b5547f813f22cc63dcf87f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 00:11:00 +0300 Subject: [PATCH 0208/1768] dont just copy paste lines --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 479c37b..feaec05 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -162,7 +162,7 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit - khanelivim.packages.${system}.default + osbm-nvim.packages.${system}.default ]; services.ollama = { From 4d79606ac6d0f0dbaba11bf339c2885ef069c689 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 11:10:05 +0300 Subject: [PATCH 0209/1768] add nvim to tartarus --- hosts/tartarus/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index e175324..f00c482 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -6,6 +6,7 @@ pkgs, pkgs-unstable, system-label, + osbm-nvim, ... }: { imports = [ @@ -98,6 +99,7 @@ }; environment.systemPackages = with pkgs; [ + osbm-nvim.packages.${system}.default ]; # Some programs need SUID wrappers, can be configured further or are From bd564a32879e6497cd70bd27a13d8c82bb3be8ca Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 11:53:19 +0300 Subject: [PATCH 0210/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8bdad18..423f280 100644 --- a/flake.lock +++ b/flake.lock @@ -269,11 +269,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734083684, - "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { @@ -407,11 +407,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734300674, - "narHash": "sha256-577iMXwJNFN+6h2JAe4hBXYIZlO6sWVxJqSDiB16wgM=", + "lastModified": 1734425531, + "narHash": "sha256-8hPoxi3JypBUMmwrkVqYiX1nDQYRo5hM5NLRFKeNRzM=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "f62258d9b712e84a1f1ce8dfb523a2d06abc6610", + "rev": "5af22b80e039b17c41b29329fa806c64d7ae0f2c", "type": "github" }, "original": { From a2e03c12c60fce4240c42cf6a6a29457eec0306e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 13:12:23 +0300 Subject: [PATCH 0211/1768] try enabling home-manager in tartars --- flake.nix | 2 ++ home.nix | 27 +++++++++++++++++++++++++++ hosts/tartarus/configuration.nix | 5 +++++ 3 files changed, 34 insertions(+) create mode 100644 home.nix diff --git a/flake.nix b/flake.nix index 371486a..d88713b 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,7 @@ vscode-server, sops-nix, osbm-nvim, + home-manager, ... }: { nixosConfigurations = let @@ -51,6 +52,7 @@ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager ]; specialArgs = { inherit pkgs-unstable system-label osbm-nvim; diff --git a/home.nix b/home.nix new file mode 100644 index 0000000..f3d083f --- /dev/null +++ b/home.nix @@ -0,0 +1,27 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the + # paths it should manage. + home.username = "osbm"; + home.homeDirectory = "/home/osbm"; + + # Packages that should be installed to the user profile. + home.packages = [ + pkgs.htop + pkgs.fortune + ]; + + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + home.stateVersion = "24.11"; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index f00c482..8b605ed 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -30,6 +30,11 @@ services.vscode-server.enable = true; + + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.osbm = import ./home.nix; + virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; From 1fc43426eaa73e863dfdda6b221e70546dff3fe2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 13:13:41 +0300 Subject: [PATCH 0212/1768] mv home.nix --- home.nix => hosts/tartarus/home.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename home.nix => hosts/tartarus/home.nix (100%) diff --git a/home.nix b/hosts/tartarus/home.nix similarity index 100% rename from home.nix rename to hosts/tartarus/home.nix From 3f870e4b21018ab699c849e1b1a5d1792f5fa3a5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 13:14:50 +0300 Subject: [PATCH 0213/1768] hotfix --- hosts/tartarus/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/home.nix b/hosts/tartarus/home.nix index f3d083f..b3ca4fb 100644 --- a/hosts/tartarus/home.nix +++ b/hosts/tartarus/home.nix @@ -24,4 +24,4 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; - +} From 2639e9c4e14f2ef8fa0451152e3434fce953549a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 13:18:53 +0300 Subject: [PATCH 0214/1768] set home-manager to 24.11 --- flake.lock | 7 ++++--- flake.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 423f280..8cf6dba 100644 --- a/flake.lock +++ b/flake.lock @@ -157,15 +157,16 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index d88713b..de6419d 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ # stylix.url = "github:danth/stylix/master"; # stylix.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; osbm-nvim.url = "github:osbm/osbm-nvim"; From 6c23eac37b34fef60bed2ef4e0fd158b9025b8ea Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 14:06:07 +0300 Subject: [PATCH 0215/1768] formatting --- hosts/tartarus/configuration.nix | 1 - hosts/tartarus/home.nix | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 8b605ed..774509d 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -30,7 +30,6 @@ services.vscode-server.enable = true; - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ./home.nix; diff --git a/hosts/tartarus/home.nix b/hosts/tartarus/home.nix index b3ca4fb..5c8e294 100644 --- a/hosts/tartarus/home.nix +++ b/hosts/tartarus/home.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: - { + config, + pkgs, + ... +}: { # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "osbm"; @@ -12,6 +14,12 @@ pkgs.fortune ]; + programs.git = { + enable = true; + userEmail = "osmanfbayram@gmail.com"; + userName = "osbm"; + }; + # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards From cd647195b9f0b617de1165bda26fe2506f9809aa Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 17 Dec 2024 17:17:12 +0300 Subject: [PATCH 0216/1768] add cloudflare warp --- hosts/tartarus/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 774509d..369e0c1 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -28,6 +28,8 @@ # }; # stylix.polarity = "dark"; + services.cloudflare-warp.enable = true; + services.vscode-server.enable = true; home-manager.useGlobalPkgs = true; From 421e89aa70950be0cf2f2e0d84eeabda1321d9fa Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 18 Dec 2024 16:42:49 +0300 Subject: [PATCH 0217/1768] update flake.lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 8cf6dba..e5a71dd 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1733318908, - "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", + "lastModified": 1734279981, + "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", + "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734103614, - "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=", + "lastModified": 1734472356, + "narHash": "sha256-RIoG3zXarfuHfzM/z/NPjoHHxl3sqYrtEatSLA1/bIk=", "owner": "nix-community", "repo": "nixvim", - "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3", + "rev": "4f1fe403b18c45614d6b81423038a34cff371244", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1733411491, - "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", + "lastModified": 1733773348, + "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", "owner": "NuschtOS", "repo": "search", - "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", + "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734425531, - "narHash": "sha256-8hPoxi3JypBUMmwrkVqYiX1nDQYRo5hM5NLRFKeNRzM=", + "lastModified": 1734529342, + "narHash": "sha256-LMdq4QGEBVAr73f2Zw4FLh7ePAu041mIRSoAE9v569s=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "5af22b80e039b17c41b29329fa806c64d7ae0f2c", + "rev": "a348380e642a711f52fa92625132570c9cc30fbb", "type": "github" }, "original": { @@ -490,11 +490,11 @@ ] }, "locked": { - "lastModified": 1733440889, - "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", "type": "github" }, "original": { From 32837d362e996e3517a58b702802eef59da04f1c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Dec 2024 23:43:59 +0300 Subject: [PATCH 0218/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e5a71dd..d540fa5 100644 --- a/flake.lock +++ b/flake.lock @@ -408,11 +408,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734529342, - "narHash": "sha256-LMdq4QGEBVAr73f2Zw4FLh7ePAu041mIRSoAE9v569s=", + "lastModified": 1734547734, + "narHash": "sha256-pYQUJisFl2KbD+frNXRk6mBHX8zXmOGA/aDD/4ASDbk=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "a348380e642a711f52fa92625132570c9cc30fbb", + "rev": "c91dc96ba1691e3fcc54cca05cf9902a00c80f45", "type": "github" }, "original": { @@ -438,11 +438,11 @@ ] }, "locked": { - "lastModified": 1733965552, - "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { From 6f91edeadd0d327bfa28606fb27104f463394ed8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 20 Dec 2024 18:54:38 +0300 Subject: [PATCH 0219/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d540fa5..bbb2645 100644 --- a/flake.lock +++ b/flake.lock @@ -270,11 +270,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734323986, - "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", + "lastModified": 1734600368, + "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "394571358ce82dff7411395829aa6a3aad45b907", + "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", "type": "github" }, "original": { From 917e68cc366c056e239c88ca7d6e937f420735cc Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Dec 2024 01:41:55 +0300 Subject: [PATCH 0220/1768] update osbm-nvim --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index bbb2645..99f97de 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1734279981, - "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", + "lastModified": 1734425854, + "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", + "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734472356, - "narHash": "sha256-RIoG3zXarfuHfzM/z/NPjoHHxl3sqYrtEatSLA1/bIk=", + "lastModified": 1734688442, + "narHash": "sha256-MjaMAeZH9t09LEQMK559/PMouXxuWcMHXb/Em2Vb9dw=", "owner": "nix-community", "repo": "nixvim", - "rev": "4f1fe403b18c45614d6b81423038a34cff371244", + "rev": "f3ef2721abf6e7f4f9ab8346cb1efebb0ecb9769", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734547734, - "narHash": "sha256-pYQUJisFl2KbD+frNXRk6mBHX8zXmOGA/aDD/4ASDbk=", + "lastModified": 1734711423, + "narHash": "sha256-VFXcSoE7VRqeHJcOZa1jERe/3kgE+ClWmd6tMbEXW+c=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "c91dc96ba1691e3fcc54cca05cf9902a00c80f45", + "rev": "aaacead00338b04afb8dfc612639ead77bb66c00", "type": "github" }, "original": { From c56646eb29fef61378e5367d9e5ece4e453610a3 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Dec 2024 20:44:49 +0300 Subject: [PATCH 0221/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 99f97de..6b5da0f 100644 --- a/flake.lock +++ b/flake.lock @@ -270,11 +270,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734600368, - "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=", + "lastModified": 1734737257, + "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca", + "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734688442, - "narHash": "sha256-MjaMAeZH9t09LEQMK559/PMouXxuWcMHXb/Em2Vb9dw=", + "lastModified": 1734749627, + "narHash": "sha256-5HLarzO44i6tUBIr+DRMeAHJP3p84Z1b9wuElv85O1U=", "owner": "nix-community", "repo": "nixvim", - "rev": "f3ef2721abf6e7f4f9ab8346cb1efebb0ecb9769", + "rev": "9f32e25f3f2b029b76e79ef7c1f48cd3596938d8", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734711423, - "narHash": "sha256-VFXcSoE7VRqeHJcOZa1jERe/3kgE+ClWmd6tMbEXW+c=", + "lastModified": 1734776557, + "narHash": "sha256-yNI9htUvjgFCL2axZWvcsg7ZbiBSypUGhbVZM/4tHis=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "aaacead00338b04afb8dfc612639ead77bb66c00", + "rev": "4e3bbe5583f9e61d33601236823c7599a51b8fca", "type": "github" }, "original": { From 49c247704468a4d9f0dac477c51e458c2607a549 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Dec 2024 23:58:44 +0300 Subject: [PATCH 0222/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6b5da0f..2de7680 100644 --- a/flake.lock +++ b/flake.lock @@ -286,11 +286,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { From 1b52170d45bb64514d55a038c635c83483d4ddc2 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Dec 2024 16:24:36 +0300 Subject: [PATCH 0223/1768] update flake.lock and disable concentration --- flake.lock | 6 +++--- hosts/ymir/configuration.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 2de7680..6d934a0 100644 --- a/flake.lock +++ b/flake.lock @@ -270,11 +270,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734737257, - "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index feaec05..8dec8ed 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -18,7 +18,7 @@ ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix - ../../common/concentration.nix + # ../../common/concentration.nix ]; # Bootloader. From ce55a45bd4bddeae197133e018131a83e8c51221 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Dec 2024 21:53:02 +0300 Subject: [PATCH 0224/1768] enable python --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 8dec8ed..69f3717 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,7 +14,7 @@ ../../common/fonts.nix ../../common/nix-settings.nix ../../common/i18n.nix - # ../../common/python.nix + ../../common/python.nix ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix From aab38eadac50b810dd80af6083f8c33c6f9ae23b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 24 Dec 2024 14:12:21 +0300 Subject: [PATCH 0225/1768] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 6d934a0..1dfb331 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1734425854, - "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1729445390, - "narHash": "sha256-TxJ7RZLlBkKWZos1ai3eWIH0fBq1G6SVE+q3dW+0qRU=", + "lastModified": 1734904675, + "narHash": "sha256-MoYUUxiLcNwC9woNLoCfXfzcCAHE310DqDcJd/GjM98=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "9f4bcf647cad2edafda7e1143071e0daf37cbc41", + "rev": "19e8cb01a078fea1e6cf824097978c41af74e24b", "type": "github" }, "original": { @@ -302,11 +302,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734749627, - "narHash": "sha256-5HLarzO44i6tUBIr+DRMeAHJP3p84Z1b9wuElv85O1U=", + "lastModified": 1734956286, + "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", "owner": "nix-community", "repo": "nixvim", - "rev": "9f32e25f3f2b029b76e79ef7c1f48cd3596938d8", + "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734776557, - "narHash": "sha256-yNI9htUvjgFCL2axZWvcsg7ZbiBSypUGhbVZM/4tHis=", + "lastModified": 1734960879, + "narHash": "sha256-1CACM/cSsEMjhRHaO3mHzt62YLkUE6PtBoLIDmvmS+0=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "4e3bbe5583f9e61d33601236823c7599a51b8fca", + "rev": "0bbb0c8a9e89be4c0a04d8461ca118c4730bb00a", "type": "github" }, "original": { @@ -490,11 +490,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { From 6b5b00a8c9063c291eaa5e3bf54ad6e4da39cb71 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 24 Dec 2024 23:05:47 +0300 Subject: [PATCH 0226/1768] fuck python --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 69f3717..8dec8ed 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,7 +14,7 @@ ../../common/fonts.nix ../../common/nix-settings.nix ../../common/i18n.nix - ../../common/python.nix + # ../../common/python.nix ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix From e36b7d0c40dfe580ef02887acacc1190c707e25f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 25 Dec 2024 13:33:20 +0300 Subject: [PATCH 0227/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1dfb331..a31cc74 100644 --- a/flake.lock +++ b/flake.lock @@ -270,11 +270,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1734991663, + "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", "type": "github" }, "original": { From 6e7ef7cec9eebc88d05c2f16b2bb278091f61cab Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 26 Dec 2024 14:12:12 +0300 Subject: [PATCH 0228/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a31cc74..19b4f2a 100644 --- a/flake.lock +++ b/flake.lock @@ -332,11 +332,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734956286, - "narHash": "sha256-8h7Fs6S+Ftg3NNmwT/KkYWI9epUNPCMPn56QFXOfmTM=", + "lastModified": 1735169833, + "narHash": "sha256-Wu201kM5vgOUhhwkKuYSZmmTMflgBybqeEIzIH4MRY4=", "owner": "nix-community", "repo": "nixvim", - "rev": "8938e09db14d510dcc2f266e8b2e738ee527d386", + "rev": "25c13524642cb7fe98583a5dd5f90992c76198b9", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1734960879, - "narHash": "sha256-1CACM/cSsEMjhRHaO3mHzt62YLkUE6PtBoLIDmvmS+0=", + "lastModified": 1735211515, + "narHash": "sha256-Sh2hFzdo8/F9VY5fchCZc5RDuAiKdZ+JOtACqU6wx5w=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "0bbb0c8a9e89be4c0a04d8461ca118c4730bb00a", + "rev": "61eaa22caac9acf455b0a21d4d5f73adc23eebb5", "type": "github" }, "original": { From 7f48d02f5d91353ea51d86ca13f25dbb5696bd68 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 28 Dec 2024 11:40:22 +0300 Subject: [PATCH 0229/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 19b4f2a..0721f5b 100644 --- a/flake.lock +++ b/flake.lock @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734991663, - "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=", + "lastModified": 1735141468, + "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff", + "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "type": "github" }, "original": { @@ -286,11 +286,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { From 81d8f22d6f9028dc7ec4e1287ac7bea60c7ddf4b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 28 Dec 2024 13:55:41 +0300 Subject: [PATCH 0230/1768] enable python --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 8dec8ed..69f3717 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,7 +14,7 @@ ../../common/fonts.nix ../../common/nix-settings.nix ../../common/i18n.nix - # ../../common/python.nix + ../../common/python.nix ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix From be76d4646bb7521091a45f8b0f2d72f81d3ebaad Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 13:58:27 +0300 Subject: [PATCH 0231/1768] add agenix --- flake.lock | 157 +++++++++++++++++++++++++++++++++++++++-------------- flake.nix | 14 +++-- 2 files changed, 125 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 0721f5b..f791107 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,48 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "owner": "ryantm", + "repo": "agenix", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "devshell": { "inputs": { "nixpkgs": [ @@ -60,7 +103,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -78,7 +121,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -151,6 +194,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -171,7 +235,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "osbm-nvim", @@ -270,16 +334,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735141468, - "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -302,11 +366,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735264675, + "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -322,7 +402,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", "nixpkgs": [ "osbm-nvim", @@ -332,11 +412,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735169833, - "narHash": "sha256-Wu201kM5vgOUhhwkKuYSZmmTMflgBybqeEIzIH4MRY4=", + "lastModified": 1735343514, + "narHash": "sha256-CZGsEGSRN5PQnf3ciNFdlpCDorvyo6+YQ1cPQ1ebVxk=", "owner": "nix-community", "repo": "nixvim", - "rev": "25c13524642cb7fe98583a5dd5f90992c76198b9", + "rev": "0307cdf297cd6bdafd55a66d69c54b55c482edf8", "type": "github" }, "original": { @@ -404,15 +484,15 @@ "osbm-nvim": { "inputs": { "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim" }, "locked": { - "lastModified": 1735211515, - "narHash": "sha256-Sh2hFzdo8/F9VY5fchCZc5RDuAiKdZ+JOtACqU6wx5w=", + "lastModified": 1735375284, + "narHash": "sha256-Q8n9u+0mfzVk7gIXoO3NxR8ysHIp8q486dbuIVyzvHs=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "61eaa22caac9acf455b0a21d4d5f73adc23eebb5", + "rev": "8070b91694af42c6ba912665901c9fc5ea33744a", "type": "github" }, "original": { @@ -423,34 +503,14 @@ }, "root": { "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "agenix": "agenix", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "osbm-nvim": "osbm-nvim", - "sops-nix": "sops-nix", "vscode-server": "vscode-server" } }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -481,6 +541,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index de6419d..85d479e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,8 +16,11 @@ vscode-server.url = "github:nix-community/nixos-vscode-server"; vscode-server.inputs.nixpkgs.follows = "nixpkgs"; - sops-nix.url = "github:Mic92/sops-nix"; - sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + # sops-nix.url = "github:Mic92/sops-nix"; + # sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + + agenix.url = "github:ryantm/agenix"; + # stylix.url = "github:danth/stylix/master"; # stylix.inputs.nixpkgs.follows = "nixpkgs"; @@ -33,7 +36,7 @@ nixpkgs, nixpkgs-unstable, vscode-server, - sops-nix, + agenix, osbm-nvim, home-manager, ... @@ -51,7 +54,7 @@ modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default - sops-nix.nixosModules.sops + agenix.nixosModules.sops home-manager.nixosModules.home-manager ]; specialArgs = { @@ -63,7 +66,8 @@ modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default - sops-nix.nixosModules.sops + agenix.nixosModules.sops + home-manager.nixosModules.home-manager ]; specialArgs = { inherit pkgs-unstable system-label osbm-nvim; From 43cd47e6f50548e9474cde804a618f4200d41031 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 13:59:25 +0300 Subject: [PATCH 0232/1768] fix name --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 85d479e..58f2c33 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,7 @@ modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default - agenix.nixosModules.sops + agenix.nixosModules.default home-manager.nixosModules.home-manager ]; specialArgs = { @@ -66,7 +66,7 @@ modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default - agenix.nixosModules.sops + agenix.nixosModules.default home-manager.nixosModules.home-manager ]; specialArgs = { From 16c5138cc2f205543d2bbcd7bcff398d1b2c04ec Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 14:02:37 +0300 Subject: [PATCH 0233/1768] add agenix --- common/common-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/common-packages.nix b/common/common-packages.nix index 94f8eb3..6475c83 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -3,6 +3,7 @@ pkgs-unstable, lib, config, + agenix, ... }: { environment.systemPackages = with pkgs; [ @@ -46,6 +47,7 @@ nix-output-monitor yazi ripgrep + agenix.packages.x86_64-linux.default ]; programs.steam = { From 1e854a93fba0346304d5db893f7bbb4285523d04 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 14:10:07 +0300 Subject: [PATCH 0234/1768] try adding agenix this way --- common/common-packages.nix | 2 -- flake.nix | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/common-packages.nix b/common/common-packages.nix index 6475c83..94f8eb3 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -3,7 +3,6 @@ pkgs-unstable, lib, config, - agenix, ... }: { environment.systemPackages = with pkgs; [ @@ -47,7 +46,6 @@ nix-output-monitor yazi ripgrep - agenix.packages.x86_64-linux.default ]; programs.steam = { diff --git a/flake.nix b/flake.nix index 58f2c33..33a0ae9 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,9 @@ vscode-server.nixosModules.default agenix.nixosModules.default home-manager.nixosModules.home-manager + { + environment.systemPackages = [ agenix.packages.${system}.default ]; + } ]; specialArgs = { inherit pkgs-unstable system-label osbm-nvim; From 788ea511b01b6bcae3f6a7fc643813acfedc7df2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 16:25:35 +0300 Subject: [PATCH 0235/1768] init secret management --- common/secrets.nix | 6 ++++ flake.nix | 3 +- hosts/ymir/configuration.nix | 56 ++++++++++++++++++++++-------------- secrets/another-secret.age | 5 ++++ secrets/bayram.age | 5 ++++ secrets/secrets.nix | 7 +++++ 6 files changed, 59 insertions(+), 23 deletions(-) create mode 100644 common/secrets.nix create mode 100644 secrets/another-secret.age create mode 100644 secrets/bayram.age create mode 100644 secrets/secrets.nix diff --git a/common/secrets.nix b/common/secrets.nix new file mode 100644 index 0000000..e08c4fe --- /dev/null +++ b/common/secrets.nix @@ -0,0 +1,6 @@ +{ + age.secrets = { + another-secret.file = ./secrets/another-secret.age; + bayram.file = ./secrets/bayram.age; + }; +} diff --git a/flake.nix b/flake.nix index 33a0ae9..a032b8d 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ agenix.url = "github:ryantm/agenix"; - # stylix.url = "github:danth/stylix/master"; # stylix.inputs.nixpkgs.follows = "nixpkgs"; @@ -69,7 +68,7 @@ agenix.nixosModules.default home-manager.nixosModules.home-manager { - environment.systemPackages = [ agenix.packages.${system}.default ]; + environment.systemPackages = [agenix.packages.${system}.default]; } ]; specialArgs = { diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 69f3717..8533eae 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -132,27 +132,41 @@ # Define a user account. Don't forget to set a password with ‘passwd’. virtualisation.docker.enable = true; - users.users.osbm = { - isNormalUser = true; - description = "osbm"; - extraGroups = ["networkmanager" "wheel" "docker"]; - packages = with pkgs; [ - kdePackages.kate - vscode - pkgs-unstable.discord # discord sucks - alacritty - pkgs-unstable.obsidian - mpv - libreoffice - blender - gimp - kitty - obs-studio - audacity - pkgs-unstable.qbittorrent - arduino-ide - prismlauncher - ]; + users.users = { + osbm = { + isNormalUser = true; + description = "osbm"; + extraGroups = ["networkmanager" "wheel" "docker"]; + packages = with pkgs; [ + kdePackages.kate + vscode + pkgs-unstable.discord # discord sucks + alacritty + pkgs-unstable.obsidian + mpv + libreoffice + blender + gimp + kitty + obs-studio + audacity + pkgs-unstable.qbittorrent + arduino-ide + prismlauncher + ]; + }; + bayram = { + isNormalUser = true; + description = "So my family have easy access"; + passwordFile = config.age.secrets.bayram.path; + extraGroups = ["networkmanager"]; + packages = with pkgs; [ + vlc + ungoogled-chromium + prismlauncher + qbittorrent + ]; + }; }; nixpkgs.config.allowUnfree = true; diff --git a/secrets/another-secret.age b/secrets/another-secret.age new file mode 100644 index 0000000..057119e --- /dev/null +++ b/secrets/another-secret.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 kHqLyg OW2HK97DDr1UZKOpPa0SDNZOsDTLqBELlwBZc1XFrSQ +uNZWhAoHKBdixxY2U5CKO8HtsTwx4wa0H651xYwDygI +--- OvggssvwH6p6+QBWTPrY5mtBeI0HbiG2s2bIOhdxSQ0 +3uɆsۄܕh$&jv˴ZКne^] \ No newline at end of file diff --git a/secrets/bayram.age b/secrets/bayram.age new file mode 100644 index 0000000..607329d --- /dev/null +++ b/secrets/bayram.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 kHqLyg BEyDZtX/I/qiDP0bJ0Jn+NsvJwgDzekkSo8muEIGASA +tOoVfPm//+PDuVhdDQZ+NZSHtkrIDvqwqpRQMIVRfHw +--- heWlHp9d+XOBJJbfVXEOxElINm7D8U2aklHfDOwxjVw +{yC]wnCVRh{.?aSAۊ* \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix new file mode 100644 index 0000000..f96ab79 --- /dev/null +++ b/secrets/secrets.nix @@ -0,0 +1,7 @@ +let + ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxc1ycxtzO2u4bHas71pi5CpR8Zzcj6GXjx1lLWMOHq"; +in { + "another-secret.age".publicKeys = [ymir]; + # "gpg.age".publicKeys = [ymir]; + "bayram.age".publicKeys = [ymir]; +} From 41aa5f554773d7d0458de9c3c12e4f6440da57fe Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 16:26:42 +0300 Subject: [PATCH 0236/1768] also import secrets --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 8533eae..a39f781 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -19,6 +19,7 @@ ../../common/firefox.nix ../../common/common-packages.nix # ../../common/concentration.nix + ../../common/secrets.nix ]; # Bootloader. From 21089d2df034cd4f7257aa16403faaeea046cf12 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 16:27:34 +0300 Subject: [PATCH 0237/1768] renamed option --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a39f781..5c4d0bd 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -159,7 +159,7 @@ bayram = { isNormalUser = true; description = "So my family have easy access"; - passwordFile = config.age.secrets.bayram.path; + hashedPasswordFile = config.age.secrets.bayram.path; extraGroups = ["networkmanager"]; packages = with pkgs; [ vlc From ccadf5e450a98a45bef6177f4b0087b6d1bf8c44 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 16:29:21 +0300 Subject: [PATCH 0238/1768] correct folder path --- common/secrets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/secrets.nix b/common/secrets.nix index e08c4fe..3ceca67 100644 --- a/common/secrets.nix +++ b/common/secrets.nix @@ -1,6 +1,6 @@ { age.secrets = { - another-secret.file = ./secrets/another-secret.age; - bayram.file = ./secrets/bayram.age; + another-secret.file = ../secrets/another-secret.age; + bayram.file = ../secrets/bayram.age; }; } From cf5a5d79e144656625dcff3979c015f7298fc254 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 17:05:30 +0300 Subject: [PATCH 0239/1768] change name --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 5c4d0bd..6281dc8 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -158,7 +158,7 @@ }; bayram = { isNormalUser = true; - description = "So my family have easy access"; + description = "bayram"; hashedPasswordFile = config.age.secrets.bayram.path; extraGroups = ["networkmanager"]; packages = with pkgs; [ From 8c5320f4df0f827e0ca235283c7a5470e437feda Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 19:02:08 +0300 Subject: [PATCH 0240/1768] update age file --- secrets/bayram.age | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/secrets/bayram.age b/secrets/bayram.age index 607329d..912013f 100644 --- a/secrets/bayram.age +++ b/secrets/bayram.age @@ -1,5 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 kHqLyg BEyDZtX/I/qiDP0bJ0Jn+NsvJwgDzekkSo8muEIGASA -tOoVfPm//+PDuVhdDQZ+NZSHtkrIDvqwqpRQMIVRfHw ---- heWlHp9d+XOBJJbfVXEOxElINm7D8U2aklHfDOwxjVw -{yC]wnCVRh{.?aSAۊ* \ No newline at end of file +-> ssh-ed25519 kHqLyg CBbvWtpqSbv3Uv41mfd7Tnvt1N0aZ5WeE4Y+Dch3cWs +XBA8eWG9efBASzLgQMjjqh8c7MvCBXvabjNfZBkujZs +--- HyMcQBms5kfbas5oukfNfhYfXFHYeqozlkJGXG/4jHU +/WR@"_XT8-b +$`9ºIUt +B=_Z!n 8!F\;d l8޿8~59Z$%?_ Date: Sun, 29 Dec 2024 21:28:23 +0300 Subject: [PATCH 0241/1768] update age file --- secrets/bayram.age | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/secrets/bayram.age b/secrets/bayram.age index 912013f..140ab08 100644 --- a/secrets/bayram.age +++ b/secrets/bayram.age @@ -1,7 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 kHqLyg CBbvWtpqSbv3Uv41mfd7Tnvt1N0aZ5WeE4Y+Dch3cWs -XBA8eWG9efBASzLgQMjjqh8c7MvCBXvabjNfZBkujZs ---- HyMcQBms5kfbas5oukfNfhYfXFHYeqozlkJGXG/4jHU -/WR@"_XT8-b -$`9ºIUt -B=_Z!n 8!F\;d l8޿8~59Z$%?_ ssh-ed25519 kHqLyg pZEYYxGx40iXiBmfr8sP2m/F08V2Q0bXwWbI1bmadiw +1klc0wfU7F2NYn1b4Ab2nqqvDkaP7cQtsp2xHspi2Tw +--- IyWoFVIZhOIz8zGMM6w3Ci4IiOdt2BcNtLyJDlJFbzs +>沁[sɽI eՐ;{URƨ)A/$霷Q==^nFɝJ_FdmNojI2jŮߤ^H-Lr"X*XE/RQU+b_FĬ- \ No newline at end of file From 68746c0d7303b6bbaa329f083c1af7d8e7cea125 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 29 Dec 2024 22:23:37 +0300 Subject: [PATCH 0242/1768] add ownership to password --- common/secrets.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/secrets.nix b/common/secrets.nix index 3ceca67..8fcbb4c 100644 --- a/common/secrets.nix +++ b/common/secrets.nix @@ -1,6 +1,9 @@ { age.secrets = { another-secret.file = ../secrets/another-secret.age; - bayram.file = ../secrets/bayram.age; + bayram = { + file = ../secrets/bayram.age; + owner = "bayram"; + }; }; } From ba8da8025c4d9822ae5dcc701d5bf5d54a141874 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 31 Dec 2024 13:39:07 +0300 Subject: [PATCH 0243/1768] use initial password --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 6281dc8..ccc4152 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -159,7 +159,7 @@ bayram = { isNormalUser = true; description = "bayram"; - hashedPasswordFile = config.age.secrets.bayram.path; + initialPassword = "changeme"; extraGroups = ["networkmanager"]; packages = with pkgs; [ vlc From ee13cd7ac7e2fc10b3c2530f940cfd2f15d730c7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 31 Dec 2024 13:43:48 +0300 Subject: [PATCH 0244/1768] try disabling the user --- hosts/ymir/configuration.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ccc4152..49b6a36 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -156,18 +156,18 @@ prismlauncher ]; }; - bayram = { - isNormalUser = true; - description = "bayram"; - initialPassword = "changeme"; - extraGroups = ["networkmanager"]; - packages = with pkgs; [ - vlc - ungoogled-chromium - prismlauncher - qbittorrent - ]; - }; + # bayram = { + # isNormalUser = true; + # description = "bayram"; + # initialPassword = "changeme"; + # extraGroups = ["networkmanager"]; + # packages = with pkgs; [ + # vlc + # ungoogled-chromium + # prismlauncher + # qbittorrent + # ]; + # }; }; nixpkgs.config.allowUnfree = true; From 8c0f71babc2c0055d6542f0950cf152d5a317db5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 31 Dec 2024 14:01:46 +0300 Subject: [PATCH 0245/1768] reenable bayram user --- hosts/ymir/configuration.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 49b6a36..ccc4152 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -156,18 +156,18 @@ prismlauncher ]; }; - # bayram = { - # isNormalUser = true; - # description = "bayram"; - # initialPassword = "changeme"; - # extraGroups = ["networkmanager"]; - # packages = with pkgs; [ - # vlc - # ungoogled-chromium - # prismlauncher - # qbittorrent - # ]; - # }; + bayram = { + isNormalUser = true; + description = "bayram"; + initialPassword = "changeme"; + extraGroups = ["networkmanager"]; + packages = with pkgs; [ + vlc + ungoogled-chromium + prismlauncher + qbittorrent + ]; + }; }; nixpkgs.config.allowUnfree = true; From 72b411083a102ec42c265fe4e2d7fda625d739e0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 4 Jan 2025 16:07:27 +0300 Subject: [PATCH 0246/1768] remove old keys --- common/secrets.nix | 5 ----- secrets/another-secret.age | 5 ----- secrets/bayram.age | 5 ----- secrets/secrets.nix | 4 +--- 4 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 secrets/another-secret.age delete mode 100644 secrets/bayram.age diff --git a/common/secrets.nix b/common/secrets.nix index 8fcbb4c..645e1cb 100644 --- a/common/secrets.nix +++ b/common/secrets.nix @@ -1,9 +1,4 @@ { age.secrets = { - another-secret.file = ../secrets/another-secret.age; - bayram = { - file = ../secrets/bayram.age; - owner = "bayram"; - }; }; } diff --git a/secrets/another-secret.age b/secrets/another-secret.age deleted file mode 100644 index 057119e..0000000 --- a/secrets/another-secret.age +++ /dev/null @@ -1,5 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 kHqLyg OW2HK97DDr1UZKOpPa0SDNZOsDTLqBELlwBZc1XFrSQ -uNZWhAoHKBdixxY2U5CKO8HtsTwx4wa0H651xYwDygI ---- OvggssvwH6p6+QBWTPrY5mtBeI0HbiG2s2bIOhdxSQ0 -3uɆsۄܕh$&jv˴ZКne^] \ No newline at end of file diff --git a/secrets/bayram.age b/secrets/bayram.age deleted file mode 100644 index 140ab08..0000000 --- a/secrets/bayram.age +++ /dev/null @@ -1,5 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 kHqLyg pZEYYxGx40iXiBmfr8sP2m/F08V2Q0bXwWbI1bmadiw -1klc0wfU7F2NYn1b4Ab2nqqvDkaP7cQtsp2xHspi2Tw ---- IyWoFVIZhOIz8zGMM6w3Ci4IiOdt2BcNtLyJDlJFbzs ->沁[sɽI eՐ;{URƨ)A/$霷Q==^nFɝJ_FdmNojI2jŮߤ^H-Lr"X*XE/RQU+b_FĬ- \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index f96ab79..67adabf 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,7 +1,5 @@ let ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxc1ycxtzO2u4bHas71pi5CpR8Zzcj6GXjx1lLWMOHq"; in { - "another-secret.age".publicKeys = [ymir]; - # "gpg.age".publicKeys = [ymir]; - "bayram.age".publicKeys = [ymir]; + ymir = ymir; } From f93dbcd7deff59028ffa840a6762af41f5880f58 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 4 Jan 2025 16:26:10 +0300 Subject: [PATCH 0247/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f791107..1eaca7f 100644 --- a/flake.lock +++ b/flake.lock @@ -350,11 +350,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1735922141, + "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", "type": "github" }, "original": { @@ -412,11 +412,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735343514, - "narHash": "sha256-CZGsEGSRN5PQnf3ciNFdlpCDorvyo6+YQ1cPQ1ebVxk=", + "lastModified": 1735378670, + "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", "owner": "nix-community", "repo": "nixvim", - "rev": "0307cdf297cd6bdafd55a66d69c54b55c482edf8", + "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", "type": "github" }, "original": { @@ -488,11 +488,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1735375284, - "narHash": "sha256-Q8n9u+0mfzVk7gIXoO3NxR8ysHIp8q486dbuIVyzvHs=", + "lastModified": 1735478275, + "narHash": "sha256-jYRXkXfdPR3WJXjYsqFwX0mLX0kl5AKftNADvWIRI8U=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8070b91694af42c6ba912665901c9fc5ea33744a", + "rev": "6114c88ef3619157f09a6c96f6ec09b0e3f48dd8", "type": "github" }, "original": { From a2942d8f35469fa9fa58f503c3e68a42b42cc794 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 4 Jan 2025 18:03:46 +0300 Subject: [PATCH 0248/1768] update readme --- README.md | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 36da556..bfcc90c 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,18 @@ # nixos is life The nix configuration of mine. -Here i have 2 machines. +Here i have 4 machines. - Laptop **tartarus** (faulty hardware, nvidia gpu doesnt work) - Desktop **ymir** (beast, my most prized possesion as of now) +- Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) +- Raspberry Pi 5 **pochita** (a server that i experiment with) (not setup yet) +# To-do list -## To-do list - -- [x] add git hash to the nixos build generations -- [x] fix cuda drivers - - [x] fix nvidia-smi command - - [ ] compile a cuda program successfully - - [ ] build a python package with embedded cuda and run successfully -- [x] learn how to deal with development environments -- [ ] learn how to write derivations for cpp projects -- [ ] configure hyprland -- [x] disk encryption with disko (cancelled) - - enabled disk encryption during system installation. -- [ ] ssh gpg secret backup with sops -- [x] add unstable channels to the flake.nix -- [ ] home manager setup without translating every line in my configs to nix options. (tldr just symlink files the nix way) -- [x] add japanese IME fcitx5 mosc -- [x] add beautifier to the nix code. -- [ ] make an ISO file with my configurations -- [x] make a github action that tests if my configuration is gonna build successfully or not -- [x] learn cache management -- [x] add stylix +- [ ] iso image generator +- agenix + - [ ] add my gpg keys + - [ ] add ssh keys so that machines can connect to each other +- [ ] From d20ca024a72e447ce450628e457220aa21bc1ca3 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 4 Jan 2025 18:49:34 +0300 Subject: [PATCH 0249/1768] update readme --- README.md | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bfcc90c..34cca54 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,29 @@ # nixos is life -The nix configuration of mine. +The nix configuration of mine. My intentions are just to maintain my configuration and to contribute to the nix community. Here i have 4 machines. - Laptop **tartarus** (faulty hardware, nvidia gpu doesnt work) - Desktop **ymir** (beast, my most prized possesion as of now) + +I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) - Raspberry Pi 5 **pochita** (a server that i experiment with) (not setup yet) - +- Android phone (termux) **android** (not setup yet) # To-do list -- [ ] iso image generator +- [ ] iso image generator for nixos + - Basically the original nixos iso with added packages and tweaks. +- [ ] build custom android rom + - Or how to run nixos on the phone. +- [ ] build android apps using nix + - [ ] lichess + - [ ] termux +- [ ] build my qmk keyboard with nix - agenix - [ ] add my gpg keys - [ ] add ssh keys so that machines can connect to each other -- [ ] - +- [ ] module system with options +- [ ] see which derivations will be built and which will be downloaded from cache or which is already present in the nix store. +- [ ] see which python packages are giving build errors. +- [ ] home-manager setup From 9c0ddc5658790fc309929597559010b58ceadb22 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 4 Jan 2025 18:51:50 +0300 Subject: [PATCH 0250/1768] ignore readme in actions --- .github/workflows/nix.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index c1b8157..58a6814 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -1,7 +1,12 @@ name: Nix on: push: + paths-ignore: + - README.md pull_request: + paths-ignore: + - README.md + jobs: build: strategy: From 8163acd5788bb63b6ed8f24931ff73312e58fecc Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 4 Jan 2025 20:49:59 +0300 Subject: [PATCH 0251/1768] add agenix to tartarus --- flake.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index a032b8d..e852d3c 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,9 @@ vscode-server.nixosModules.default agenix.nixosModules.default home-manager.nixosModules.home-manager + { + environment.systemPackages = [agenix.packages.${system}.default]; + } ]; specialArgs = { inherit pkgs-unstable system-label osbm-nvim; From 3f83b3fc97b6847daae07b245e258d3ca5151eb1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 5 Jan 2025 00:23:05 +0300 Subject: [PATCH 0252/1768] add nh --- common/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/common-packages.nix b/common/common-packages.nix index 94f8eb3..dbbeb4f 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -46,6 +46,7 @@ nix-output-monitor yazi ripgrep + nh ]; programs.steam = { From 130228d60a81399b9e4ec31c45677abaec316caf Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 5 Jan 2025 00:25:50 +0300 Subject: [PATCH 0253/1768] add comma --- common/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/common-packages.nix b/common/common-packages.nix index dbbeb4f..0804fb2 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -47,6 +47,7 @@ yazi ripgrep nh + comma ]; programs.steam = { From ed415ca634dc1ee72cb68c0e89d4d978bbcb5c04 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 5 Jan 2025 22:53:48 +0300 Subject: [PATCH 0254/1768] add ability to compile aarch64 to ymir --- hosts/ymir/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ccc4152..62fbfa9 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -193,6 +193,10 @@ # enableSSHSupport = true; # }; + + boot.binfmt.emulatedSystems = ["aarch64-linux"]; + nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; + # List services that you want to enable: # Enable the OpenSSH daemon. From 50d9afd8ae67248189661fbea9b0dc34fab71090 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 7 Jan 2025 13:33:53 +0300 Subject: [PATCH 0255/1768] update flake.lock --- flake.lock | 144 ++++++++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 68 deletions(-) diff --git a/flake.lock b/flake.lock index 1eaca7f..1e422f2 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -149,19 +149,14 @@ "osbm-nvim", "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "osbm-nvim", - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -244,11 +239,11 @@ ] }, "locked": { - "lastModified": 1734862405, - "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", + "lastModified": 1735979091, + "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", "type": "github" }, "original": { @@ -296,11 +291,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1735956190, + "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", "type": "github" }, "original": { @@ -349,6 +344,54 @@ } }, "nixpkgs-unstable": { + "locked": { + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1735834308, "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", @@ -364,38 +407,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1735922141, - "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -404,19 +415,16 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin", - "nixpkgs": [ - "osbm-nvim", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_4", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735378670, - "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", + "lastModified": 1735980252, + "narHash": "sha256-aVFpRYFmLP6jECp9SwsoJkSBTOSOJKYOjHgsR0RcbCQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", + "rev": "9fec10597383c024a2a1a8b71fb58d6b1f30ebb9", "type": "github" }, "original": { @@ -468,11 +476,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -488,11 +496,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1735478275, - "narHash": "sha256-jYRXkXfdPR3WJXjYsqFwX0mLX0kl5AKftNADvWIRI8U=", + "lastModified": 1736002778, + "narHash": "sha256-TK4V86BKYzAz2h3e2xNFU+WCuzx5y9ILdffAprvWA0E=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "6114c88ef3619157f09a6c96f6ec09b0e3f48dd8", + "rev": "791cb4b6e099be3924b7e04c62091137e82a7a7f", "type": "github" }, "original": { @@ -565,11 +573,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { From fd1f33ffad84b407f629fbcb2a0cd84b99b8bba8 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 7 Jan 2025 16:46:27 +0300 Subject: [PATCH 0256/1768] formatting --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 62fbfa9..a646b45 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -193,7 +193,6 @@ # enableSSHSupport = true; # }; - boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; From 72bcfde3819cfa8a028c160f1b0da9f3d86aba1f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 07:53:01 +0300 Subject: [PATCH 0257/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1e422f2..719e927 100644 --- a/flake.lock +++ b/flake.lock @@ -361,11 +361,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { From b9691caf5869c433c3dce42712757ba23dc62fcb Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 07:54:04 +0300 Subject: [PATCH 0258/1768] update flake.lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 719e927..31a00e6 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1735979091, - "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=", + "lastModified": 1736089250, + "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "11ab08541e61ac3bbf2ab27229f68622629401df", + "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1735956190, - "narHash": "sha256-svzx3yVXD5tbBJZCn3Lt1RriH8GHo6CyVUPTHejf7sU=", + "lastModified": 1736085891, + "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3feaf376d75d3d58ebf7e9a4f584d00628548ad9", + "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -420,11 +420,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735980252, - "narHash": "sha256-aVFpRYFmLP6jECp9SwsoJkSBTOSOJKYOjHgsR0RcbCQ=", + "lastModified": 1736292108, + "narHash": "sha256-0mGe0okcNDKp0A9lS/birSP0Z5oheqgrXzQeolHM9U8=", "owner": "nix-community", "repo": "nixvim", - "rev": "9fec10597383c024a2a1a8b71fb58d6b1f30ebb9", + "rev": "0ebc64a2328fc0a0532f9544eb6c6e297135962e", "type": "github" }, "original": { @@ -496,11 +496,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1736002778, - "narHash": "sha256-TK4V86BKYzAz2h3e2xNFU+WCuzx5y9ILdffAprvWA0E=", + "lastModified": 1736312005, + "narHash": "sha256-vJ21hyKhmk0HOM3os0MdJdklDf/5jMDWsewLgP+y8CE=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "791cb4b6e099be3924b7e04c62091137e82a7a7f", + "rev": "0914453481cdafe08495976625f923c6edf3762c", "type": "github" }, "original": { @@ -573,11 +573,11 @@ ] }, "locked": { - "lastModified": 1735905407, - "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", + "lastModified": 1736115332, + "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", + "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", "type": "github" }, "original": { From a181a11e3efb33215a6e06ffbccd2a46fe577c52 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 17:12:01 +0300 Subject: [PATCH 0259/1768] update concentration.nix --- common/concentration.nix | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/common/concentration.nix b/common/concentration.nix index 52cf7c3..8fa9bc4 100644 --- a/common/concentration.nix +++ b/common/concentration.nix @@ -4,11 +4,37 @@ config, ... }: { - networking.extraHosts = '' - 0.0.0.0 youtube.com - ::0 youtube.com + options = { + blockYoutube = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Disables youtube using /etc/hosts file"; + }; + blockTwitter = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Disables twitter using /etc/hosts file"; + }; + }; - 0.0.0.0 www.youtube.com - ::0 www.youtube.com - ''; -} + config = lib.mkMerge [ + (lib.mkIf config.blockYoutube { + networking.extraHosts = '' + 0.0.0.0 youtube.com + ::0 youtube.com + + 0.0.0.0 www.youtube.com + ::0 www.youtube.com + ''; + }) + (lib.mkIf config.blockTwitter { + networking.extraHosts = '' + 0.0.0.0 twitter.com + ::0 twitter.com + + 0.0.0.0 www.twitter.com + ::0 www.twitter.com + ''; + }) + ]; +} \ No newline at end of file From 7fb1550cbaccc5f5d187bf3188bc95339917b9dd Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 17:14:53 +0300 Subject: [PATCH 0260/1768] block youtube --- hosts/tartarus/configuration.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 369e0c1..22c5042 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -21,12 +21,7 @@ ../../common/concentration.nix ]; - # stylix.enable = true; - # stylix.image = pkgs.fetchurl { - # url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg"; - # sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50="; - # }; - # stylix.polarity = "dark"; + concentration.blockYoutube = true; services.cloudflare-warp.enable = true; From 216c82e819da88b40262cfd7fbefa66af8743054 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 17:15:39 +0300 Subject: [PATCH 0261/1768] try this --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 22c5042..ff52955 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -21,7 +21,7 @@ ../../common/concentration.nix ]; - concentration.blockYoutube = true; + blockYoutube = true; services.cloudflare-warp.enable = true; From e3adbdd0e65551d9cc0ccef8f9e391b21efd1c40 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 17:18:20 +0300 Subject: [PATCH 0262/1768] also try blocking twitter --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ff52955..0d3599e 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -22,6 +22,7 @@ ]; blockYoutube = true; + blockTwitter = true; services.cloudflare-warp.enable = true; From 4fcd95d3cac8d506fd9db49d844c200a7af3a8dc Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 17:21:22 +0300 Subject: [PATCH 0263/1768] disable warp --- hosts/tartarus/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 0d3599e..c2a7c5f 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -24,7 +24,6 @@ blockYoutube = true; blockTwitter = true; - services.cloudflare-warp.enable = true; services.vscode-server.enable = true; From 0ee5ed2e84c095bf672857e85144bcc23886b9e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Jan 2025 17:36:46 +0300 Subject: [PATCH 0264/1768] delete commented lines --- flake.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/flake.nix b/flake.nix index e852d3c..1d83ebf 100644 --- a/flake.nix +++ b/flake.nix @@ -21,9 +21,6 @@ agenix.url = "github:ryantm/agenix"; - # stylix.url = "github:danth/stylix/master"; - # stylix.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; From f819c8855cbdde8857aef48c483f3d96eea0f66b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 9 Jan 2025 16:20:07 +0300 Subject: [PATCH 0265/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 31a00e6..46d1464 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { From f63023d6f7ca9960aa79e1ae0cc06103a979a2e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 10 Jan 2025 02:39:42 +0300 Subject: [PATCH 0266/1768] formatting --- common/concentration.nix | 2 +- hosts/tartarus/configuration.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/concentration.nix b/common/concentration.nix index 8fa9bc4..961f01f 100644 --- a/common/concentration.nix +++ b/common/concentration.nix @@ -37,4 +37,4 @@ ''; }) ]; -} \ No newline at end of file +} diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index c2a7c5f..ef9b144 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -24,7 +24,6 @@ blockYoutube = true; blockTwitter = true; - services.vscode-server.enable = true; home-manager.useGlobalPkgs = true; From df37b71671f68bd159f86b9d05500d1af8754446 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 10 Jan 2025 13:57:44 +0300 Subject: [PATCH 0267/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 46d1464..75dd40d 100644 --- a/flake.lock +++ b/flake.lock @@ -345,11 +345,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { From 3347e9c9b641ca04e204a7ef73a5df118d0485b0 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 10 Jan 2025 13:58:39 +0300 Subject: [PATCH 0268/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 75dd40d..d37002a 100644 --- a/flake.lock +++ b/flake.lock @@ -420,11 +420,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736292108, - "narHash": "sha256-0mGe0okcNDKp0A9lS/birSP0Z5oheqgrXzQeolHM9U8=", + "lastModified": 1736374433, + "narHash": "sha256-oziJ5klXSS/wTJaoyL6oSYmRGpRFCYpJhq8Jl6q6NRU=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ebc64a2328fc0a0532f9544eb6c6e297135962e", + "rev": "83153e96c25d989020d028af51cf947aa843dc3c", "type": "github" }, "original": { @@ -496,11 +496,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1736312005, - "narHash": "sha256-vJ21hyKhmk0HOM3os0MdJdklDf/5jMDWsewLgP+y8CE=", + "lastModified": 1736428814, + "narHash": "sha256-MWYBZe0KpMiMOE7ODLutkkOeSX20Di5DM3YGtlXsgS8=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "0914453481cdafe08495976625f923c6edf3762c", + "rev": "ca1959e41e2b16d8693950bf1bcfb3d35377a500", "type": "github" }, "original": { From b079fb9e7bf75e642591fc3e4668c1b071db7184 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 10 Jan 2025 17:41:47 +0300 Subject: [PATCH 0269/1768] unblock youtube --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ef9b144..1d94e91 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -21,7 +21,7 @@ ../../common/concentration.nix ]; - blockYoutube = true; + blockYoutube = false; blockTwitter = true; services.vscode-server.enable = true; From 745c69ba0e1cb17718f1b706a851e5367a755cdc Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 11 Jan 2025 02:50:18 +0300 Subject: [PATCH 0270/1768] add bsky and delete them by default --- common/concentration.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/common/concentration.nix b/common/concentration.nix index 961f01f..9545c58 100644 --- a/common/concentration.nix +++ b/common/concentration.nix @@ -7,14 +7,19 @@ options = { blockYoutube = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = "Disables youtube using /etc/hosts file"; }; blockTwitter = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = "Disables twitter using /etc/hosts file"; }; + blockBluesky = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Disables bluesky using /etc/hosts file"; + }; }; config = lib.mkMerge [ @@ -36,5 +41,14 @@ ::0 www.twitter.com ''; }) + (lib.mkIf config.blockBluesky { + networking.extraHosts = '' + 0.0.0.0 bsky.app + ::0 bsky.app + + 0.0.0.0 www.bsky.app + ::0 www.bsky.app + ''; + }) ]; } From ae9ff0656683c628779a1c47969ce2e5bfcc23ae Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 11 Jan 2025 03:28:43 +0300 Subject: [PATCH 0271/1768] enable concentration --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a646b45..6306528 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -18,7 +18,7 @@ ../../common/arduino.nix ../../common/firefox.nix ../../common/common-packages.nix - # ../../common/concentration.nix + ../../common/concentration.nix ../../common/secrets.nix ]; From 76aa088cafe7c9af426db5dfa2cec4ca2cc7ec5e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 12 Jan 2025 01:45:10 +0300 Subject: [PATCH 0272/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d37002a..0d077b0 100644 --- a/flake.lock +++ b/flake.lock @@ -361,11 +361,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", "type": "github" }, "original": { From 56eaf3fe52d991e2bebe55209b97a50ba11fdec8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 12 Jan 2025 20:13:07 +0300 Subject: [PATCH 0273/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0d077b0..b6e843d 100644 --- a/flake.lock +++ b/flake.lock @@ -345,11 +345,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { From 2a64282a30cf9678f5000ae555317f4a094d677a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 14:49:50 +0300 Subject: [PATCH 0274/1768] move to nixpkgs-unstable --- common/common-packages.nix | 3 +-- common/i18n.nix | 3 +-- flake.nix | 22 ++++++---------------- hosts/tartarus/configuration.nix | 9 ++++----- hosts/ymir/configuration.nix | 7 +++---- 5 files changed, 15 insertions(+), 29 deletions(-) diff --git a/common/common-packages.nix b/common/common-packages.nix index 0804fb2..572ca45 100644 --- a/common/common-packages.nix +++ b/common/common-packages.nix @@ -1,6 +1,5 @@ { pkgs, - pkgs-unstable, lib, config, ... @@ -21,7 +20,7 @@ tlrc wakeonlan # neovim - pkgs-unstable.ani-cli + ani-cli btop pciutils nodePackages.npm diff --git a/common/i18n.nix b/common/i18n.nix index 5de8971..bd9fd87 100644 --- a/common/i18n.nix +++ b/common/i18n.nix @@ -2,7 +2,6 @@ pkgs, lib, config, - pkgs-unstable, ... }: { time.timeZone = "Europe/Istanbul"; @@ -31,7 +30,7 @@ type = "fcitx5"; enable = true; fcitx5.addons = with pkgs; [ - pkgs-unstable.fcitx5-mozc #TODO revert back to stable once its updated + fcitx5-mozc fcitx5-gtk fcitx5-nord # a color theme ]; diff --git a/flake.nix b/flake.nix index 1d83ebf..62f5701 100644 --- a/flake.nix +++ b/flake.nix @@ -10,18 +10,14 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; vscode-server.url = "github:nix-community/nixos-vscode-server"; vscode-server.inputs.nixpkgs.follows = "nixpkgs"; - # sops-nix.url = "github:Mic92/sops-nix"; - # sops-nix.inputs.nixpkgs.follows = "nixpkgs"; - agenix.url = "github:ryantm/agenix"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; osbm-nvim.url = "github:osbm/osbm-nvim"; @@ -30,7 +26,6 @@ outputs = { self, nixpkgs, - nixpkgs-unstable, vscode-server, agenix, osbm-nvim, @@ -38,15 +33,10 @@ ... }: { nixosConfigurations = let - system = "x86_64-linux"; - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; in { tartarus = nixpkgs.lib.nixosSystem rec { - inherit system; + system = "x86_64-linux"; modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default @@ -57,11 +47,11 @@ } ]; specialArgs = { - inherit pkgs-unstable system-label osbm-nvim; + inherit system-label osbm-nvim; }; }; ymir = nixpkgs.lib.nixosSystem rec { - inherit system; + system = "x86_64-linux"; modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default @@ -72,7 +62,7 @@ } ]; specialArgs = { - inherit pkgs-unstable system-label osbm-nvim; + inherit system-label osbm-nvim; }; }; }; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 1d94e91..46c2685 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -4,7 +4,6 @@ { config, pkgs, - pkgs-unstable, system-label, osbm-nvim, ... @@ -83,9 +82,9 @@ packages = with pkgs; [ kdePackages.kate vscode - pkgs-unstable.discord # discord sucks + discord # discord sucks alacritty - pkgs-unstable.obsidian + obsidian mpv libreoffice blender @@ -93,8 +92,8 @@ kitty obs-studio audacity - pkgs-unstable.qbittorrent - pkgs-unstable.arduino-ide + qbittorrent + arduino-ide ]; }; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 6306528..727b5c4 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -4,7 +4,6 @@ { config, pkgs, - pkgs-unstable, system-label, osbm-nvim, ... @@ -141,9 +140,9 @@ packages = with pkgs; [ kdePackages.kate vscode - pkgs-unstable.discord # discord sucks + discord # discord sucks alacritty - pkgs-unstable.obsidian + obsidian mpv libreoffice blender @@ -151,7 +150,7 @@ kitty obs-studio audacity - pkgs-unstable.qbittorrent + qbittorrent arduino-ide prismlauncher ]; From a30bf1a7e44528d838cd4985008ac0a54af71c11 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 14:51:30 +0300 Subject: [PATCH 0275/1768] update flake.lock --- flake.lock | 74 +++++++++++++++++++++--------------------------------- 1 file changed, 28 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index b6e843d..ca158a5 100644 --- a/flake.lock +++ b/flake.lock @@ -216,16 +216,15 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -239,11 +238,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -291,11 +290,11 @@ ] }, "locked": { - "lastModified": 1736085891, - "narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -343,13 +342,13 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_2": { "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", + "lastModified": 1736701207, + "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", + "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", "type": "github" }, "original": { @@ -359,29 +358,13 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1736549401, - "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736523798, + "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "130595eba61081acde9001f43de3248d8888ac4a", "type": "github" }, "original": { @@ -393,11 +376,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -420,11 +403,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736374433, - "narHash": "sha256-oziJ5klXSS/wTJaoyL6oSYmRGpRFCYpJhq8Jl6q6NRU=", + "lastModified": 1736598781, + "narHash": "sha256-Y0o9ahm6Kk0DumTo80/vKspkHOkbtFgKCNiICyRjhMs=", "owner": "nix-community", "repo": "nixvim", - "rev": "83153e96c25d989020d028af51cf947aa843dc3c", + "rev": "2fc2132a78753fc3d7ec732044eff7ad69530055", "type": "github" }, "original": { @@ -496,11 +479,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1736428814, - "narHash": "sha256-MWYBZe0KpMiMOE7ODLutkkOeSX20Di5DM3YGtlXsgS8=", + "lastModified": 1736701995, + "narHash": "sha256-JVUWc04VebAzVXdaUtStm5pzMuirYSdKkXwY44EDUa8=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "ca1959e41e2b16d8693950bf1bcfb3d35377a500", + "rev": "8dc1f974d3582030a427ea7c5d1b6725766cf21e", "type": "github" }, "original": { @@ -514,7 +497,6 @@ "agenix": "agenix", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable", "osbm-nvim": "osbm-nvim", "vscode-server": "vscode-server" } @@ -573,11 +555,11 @@ ] }, "locked": { - "lastModified": 1736115332, - "narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { From 1144aa96d45fe9120847eab4c18e653797c559b6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 14:59:50 +0300 Subject: [PATCH 0276/1768] apply pulseaudo and nerd-font changes --- common/fonts.nix | 3 ++- hosts/tartarus/configuration.nix | 2 +- hosts/ymir/configuration.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/fonts.nix b/common/fonts.nix index 3017f52..c865f4e 100644 --- a/common/fonts.nix +++ b/common/fonts.nix @@ -13,7 +13,8 @@ fira-code-symbols mplus-outline-fonts.githubRelease dina-font - nerdfonts + nerd-fonts.fira-code + nerd-fonts.ubuntu proggyfonts source-sans source-sans-pro diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 46c2685..8519882 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -58,7 +58,7 @@ services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 727b5c4..259611e 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -90,7 +90,7 @@ services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; From 1794f6becf86476b9e6bba75a5c8cca9fce06409 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 15:45:10 +0300 Subject: [PATCH 0277/1768] add initial code for harmonica --- flake.nix | 6 ++ hosts/harmonica/configuration.nix | 123 ++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 hosts/harmonica/configuration.nix diff --git a/flake.nix b/flake.nix index 62f5701..2f80fd8 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,12 @@ inherit system-label osbm-nvim; }; }; + harmonica = nixpkgs.lib.nixosSystem { + modules = [ + "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" + ./hosts/harmonica/configuration.nix + ]; + }; }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; }; diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix new file mode 100644 index 0000000..2e4d17e --- /dev/null +++ b/hosts/harmonica/configuration.nix @@ -0,0 +1,123 @@ +{ + lib, + modulesPath, + pkgs, + ... +}: { + imports = [ + ./sd-image.nix + ]; + + # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 + nixpkgs.overlays = [ + (final: super: { + makeModulesClosure = x: + super.makeModulesClosure (x // { allowMissing = true; }); + }) + ]; + + nixpkgs.hostPlatform = "aarch64-linux"; + # ! Need a trusted user for deploy-rs. + nix.settings.trusted-users = ["@wheel"]; + system.stateVersion = "24.11"; + + zramSwap = { + enable = true; + algorithm = "zstd"; + }; + + sdImage = { + # bzip2 compression takes loads of time with emulation, skip it. Enable this if you're low on space. + compressImage = false; + imageName = "zero2.img"; + + extraFirmwareConfig = { + # Give up VRAM for more Free System Memory + # - Disable camera which automatically reserves 128MB VRAM + start_x = 0; + # - Reduce allocation of VRAM to 16MB minimum for non-rotated (32MB for rotated) + gpu_mem = 16; + + # Configure display to 800x600 so it fits on most screens + # * See: https://elinux.org/RPi_Configuration + hdmi_group = 2; + hdmi_mode = 8; + }; + }; + + hardware = { + enableRedistributableFirmware = lib.mkForce false; + firmware = [pkgs.raspberrypiWirelessFirmware]; # Keep this to make sure wifi works + i2c.enable = true; + deviceTree.filter = "bcm2837-rpi-zero*.dtb"; + deviceTree.overlays = [ + { + name = "enable-i2c"; + dtsText = '' + /dts-v1/; + /plugin/; + / { + compatible = "brcm,bcm2837"; + fragment@0 { + target = <&i2c1>; + __overlay__ { + status = "okay"; + }; + }; + }; + ''; + } + ]; + }; + + boot = { + kernelPackages = pkgs.linuxPackages_rpi02w; + + initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage"]; + loader = { + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; + + # Avoids warning: mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash. + # See: https://github.com/NixOS/nixpkgs/issues/254807 + swraid.enable = lib.mkForce false; + }; + + networking = { + interfaces."wlan0".useDHCP = true; + wireless = { + enable = true; + interfaces = ["wlan0"]; + # ! Change the following to connect to your own network + networks = { + "" = { + psk = ""; + }; + }; + }; + }; + + # Enable OpenSSH out of the box. + services.sshd.enable = true; + + # NTP time sync. + services.timesyncd.enable = true; + + # ! Change the following configuration + users.users.bob = { + isNormalUser = true; + home = "/home/bob"; + description = "Bob"; + extraGroups = ["wheel" "networkmanager"]; + # ! Be sure to put your own public key here + openssh.authorizedKeys.keys = ["a public key"]; + }; + + security.sudo = { + enable = true; + wheelNeedsPassword = false; + }; + # ! Be sure to change the autologinUser. + services.getty.autologinUser = "bob"; +} \ No newline at end of file From bdac402735b26056d06b1d005fb65e5e11499336 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 15:46:59 +0300 Subject: [PATCH 0278/1768] add wifi pswd and ssid --- common/secrets.nix | 2 ++ secrets/home-wifi-password.age | 7 +++++++ secrets/home-wifi-ssid.age | 7 +++++++ secrets/secrets.nix | 10 ++++++++++ 4 files changed, 26 insertions(+) create mode 100644 secrets/home-wifi-password.age create mode 100644 secrets/home-wifi-ssid.age diff --git a/common/secrets.nix b/common/secrets.nix index 645e1cb..d0d2897 100644 --- a/common/secrets.nix +++ b/common/secrets.nix @@ -1,4 +1,6 @@ { age.secrets = { + home-wifi-ssid = ../secrets/home-wifi-ssid.age; + home-wifi-password = ../secrets/home-wifi-password.age; }; } diff --git a/secrets/home-wifi-password.age b/secrets/home-wifi-password.age new file mode 100644 index 0000000..081eeba --- /dev/null +++ b/secrets/home-wifi-password.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 kHqLyg woA6xpvXAda0BzF/R+2/CnZk7lUzxMQn5b9dVZk0UDk +MmzfOkibx20SnEVA1tlWFwVRt2TPy8+vE4SBr/6HEvc +-> ssh-ed25519 a9zBzw zZ1/d0mP0cdz6WDcXMNwBOPtqavuIgxkofVCReISNH8 +wjNiKNYRzIeUdoznqftVWF8cO1sj7xIqS8MEqpNtqNU +--- /iuuEaPzfH39OiUpNLiXLIcCeTYLV6KPAByem7oZ7EU +{? Q c"+6TC6RDon K" F \ No newline at end of file diff --git a/secrets/home-wifi-ssid.age b/secrets/home-wifi-ssid.age new file mode 100644 index 0000000..717e107 --- /dev/null +++ b/secrets/home-wifi-ssid.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 kHqLyg PvHw7QO60UMsgCzcUeQrB9AtgZqXXujpJBBST66FqDY +PxwgZ4nF+fLPvQz+TcL0G02RET1AMCZ9sgFeWebXiOk +-> ssh-ed25519 a9zBzw gNppgNrAFO0wb/iNOfkGFhagqRe32Mh9AGOYmkslJlU +ARjjZQxfnH2r4feytbVSVEfnWf2AKa8psIfl+HtN2oM +--- GtCIl90bG/BhaBAHkYE6wml2KPOm4/IN/X5zQxcZRXo +"(IB,wds`'NNݏaF _쩜 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 67adabf..5c1416f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,5 +1,15 @@ let ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxc1ycxtzO2u4bHas71pi5CpR8Zzcj6GXjx1lLWMOHq"; + tartarus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxbIyQnQFA1RFQKH4eHHWcT7Z0tCumerCsRMjlHgSPd"; + + machines = [ + ymir + tartarus + ]; in { ymir = ymir; + tartarus = tartarus; + + "home-wifi-ssid.age".publicKeys = machines; + "home-wifi-password.age".publicKeys = machines; } From efcc85cd44e3c754fb6cb16292f70b1c1a1d1b2b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 15:48:58 +0300 Subject: [PATCH 0279/1768] hotfix --- common/secrets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/secrets.nix b/common/secrets.nix index d0d2897..9e7cc39 100644 --- a/common/secrets.nix +++ b/common/secrets.nix @@ -1,6 +1,6 @@ { age.secrets = { - home-wifi-ssid = ../secrets/home-wifi-ssid.age; - home-wifi-password = ../secrets/home-wifi-password.age; + home-wifi-ssid.file = ../secrets/home-wifi-ssid.age; + home-wifi-password.file = ../secrets/home-wifi-password.age; }; } From f2a22e7a8bba4da2c79bb48f37f7c5d1747152e5 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 16:21:17 +0300 Subject: [PATCH 0280/1768] sd-image add --- hosts/harmonica/sd-image.nix | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 hosts/harmonica/sd-image.nix diff --git a/hosts/harmonica/sd-image.nix b/hosts/harmonica/sd-image.nix new file mode 100644 index 0000000..91fe156 --- /dev/null +++ b/hosts/harmonica/sd-image.nix @@ -0,0 +1,40 @@ +# This module extends the official sd-image.nix with the following: +# - ability to add options to the config.txt firmware +{ + config, + lib, + pkgs, + ... +}: { + options.sdImage = with lib; { + extraFirmwareConfig = mkOption { + type = types.attrs; + default = {}; + description = lib.mdDoc '' + Extra configuration to be added to config.txt. + ''; + }; + }; + + config = { + sdImage.populateFirmwareCommands = + lib.mkIf ((lib.length (lib.attrValues config.sdImage.extraFirmwareConfig)) > 0) + ( + let + # Convert the set into a string of lines of "key=value" pairs. + keyValueMap = name: value: name + "=" + toString value; + keyValueList = lib.mapAttrsToList keyValueMap config.sdImage.extraFirmwareConfig; + extraFirmwareConfigString = lib.concatStringsSep "\n" keyValueList; + in + lib.mkAfter + '' + config=firmware/config.txt + # The initial file has just been created without write permissions. Add them to be able to append the file. + chmod u+w $config + echo "\n# Extra configuration" >> $config + echo "${extraFirmwareConfigString}" >> $config + chmod u-w $config + '' + ); + }; +} \ No newline at end of file From f417983e5b918dd0f4079b2e19c52ae9f930b75d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 16:21:47 +0300 Subject: [PATCH 0281/1768] use secrets --- hosts/harmonica/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 2e4d17e..e546587 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -91,8 +91,8 @@ interfaces = ["wlan0"]; # ! Change the following to connect to your own network networks = { - "" = { - psk = ""; + "${secrets.home-wifi-ssid.age}" = { + psk = "${secrets.home-wifi-password.age}"; }; }; }; From 79116ad45a10e1d1b4075c664e5bcf6af8af29b0 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 16:26:55 +0300 Subject: [PATCH 0282/1768] add agenix to harmonica --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 2f80fd8..ab945f3 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,7 @@ harmonica = nixpkgs.lib.nixosSystem { modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" + agenix.nixosModules.default ./hosts/harmonica/configuration.nix ]; }; From d57cef0741abbe7acfb091f6123faf415aef2e1d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 16:47:05 +0300 Subject: [PATCH 0283/1768] use different wifi solution --- common/secrets.nix | 3 +- hosts/harmonica/configuration.nix | 70 +++++++++++++++++++++++++++---- secrets/home-wifi-password.age | 7 ---- secrets/home-wifi-ssid.age | 7 ---- secrets/network-manager.age | 8 ++++ secrets/secrets.nix | 6 +-- 6 files changed, 71 insertions(+), 30 deletions(-) delete mode 100644 secrets/home-wifi-password.age delete mode 100644 secrets/home-wifi-ssid.age create mode 100644 secrets/network-manager.age diff --git a/common/secrets.nix b/common/secrets.nix index 9e7cc39..1716cb1 100644 --- a/common/secrets.nix +++ b/common/secrets.nix @@ -1,6 +1,5 @@ { age.secrets = { - home-wifi-ssid.file = ../secrets/home-wifi-ssid.age; - home-wifi-password.file = ../secrets/home-wifi-password.age; + network-manager.file = ../secrets/network-manager.age; }; } diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index e546587..6e7c07a 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -1,4 +1,5 @@ { + config, lib, modulesPath, pkgs, @@ -84,20 +85,71 @@ swraid.enable = lib.mkForce false; }; - networking = { - interfaces."wlan0".useDHCP = true; - wireless = { - enable = true; - interfaces = ["wlan0"]; - # ! Change the following to connect to your own network - networks = { - "${secrets.home-wifi-ssid.age}" = { - psk = "${secrets.home-wifi-password.age}"; + # networking = { + # interfaces."wlan0".useDHCP = true; + # wireless = { + # enable = true; + # interfaces = ["wlan0"]; + # # ! Change the following to connect to your own network + # networks = { + # "${config.age.secrets.home-wifi-ssid.}" = { + # psk = "${secrets.home-wifi-password.age}"; + # }; + # }; + # }; + # }; + networking.networkmanager.ensureProfiles = { + environmentFiles = [ + config.age.secrets.nm-secrets.path + ]; + + profiles = { + House_Bayram = { + connection = { + id = "House_Bayram"; + type = "wifi"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + method = "auto"; + }; + wifi = { + mode = "infrastructure"; + ssid = "House_Bayram"; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "$HOME_WIFI"; + }; + }; + it_hurts_when_IP = { + connection = { + id = "it_hurts_when_IP"; + type = "ethernet"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + method = "auto"; + }; + wifi = { + mode = "infrastructure"; + ssid = "it_hurts_when_IP"; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "$HOME_WIFI"; }; }; }; }; + # Enable OpenSSH out of the box. services.sshd.enable = true; diff --git a/secrets/home-wifi-password.age b/secrets/home-wifi-password.age deleted file mode 100644 index 081eeba..0000000 --- a/secrets/home-wifi-password.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 kHqLyg woA6xpvXAda0BzF/R+2/CnZk7lUzxMQn5b9dVZk0UDk -MmzfOkibx20SnEVA1tlWFwVRt2TPy8+vE4SBr/6HEvc --> ssh-ed25519 a9zBzw zZ1/d0mP0cdz6WDcXMNwBOPtqavuIgxkofVCReISNH8 -wjNiKNYRzIeUdoznqftVWF8cO1sj7xIqS8MEqpNtqNU ---- /iuuEaPzfH39OiUpNLiXLIcCeTYLV6KPAByem7oZ7EU -{? Q c"+6TC6RDon K" F \ No newline at end of file diff --git a/secrets/home-wifi-ssid.age b/secrets/home-wifi-ssid.age deleted file mode 100644 index 717e107..0000000 --- a/secrets/home-wifi-ssid.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 kHqLyg PvHw7QO60UMsgCzcUeQrB9AtgZqXXujpJBBST66FqDY -PxwgZ4nF+fLPvQz+TcL0G02RET1AMCZ9sgFeWebXiOk --> ssh-ed25519 a9zBzw gNppgNrAFO0wb/iNOfkGFhagqRe32Mh9AGOYmkslJlU -ARjjZQxfnH2r4feytbVSVEfnWf2AKa8psIfl+HtN2oM ---- GtCIl90bG/BhaBAHkYE6wml2KPOm4/IN/X5zQxcZRXo -"(IB,wds`'NNݏaF _쩜 \ No newline at end of file diff --git a/secrets/network-manager.age b/secrets/network-manager.age new file mode 100644 index 0000000..ca8c3f3 --- /dev/null +++ b/secrets/network-manager.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 kHqLyg zm3tVSNUKnNIT/vSGBf8kG2E86swC+6AkU//FkJxayc +v0VwkFG0ILrcUMg5d32a/PTS1fcGFtKM/ykF0SRdtv8 +-> ssh-ed25519 a9zBzw REq2BogyBTL9BTsiyMf6+Qr3nl7YeOMAi8xcljzVGDI +OdVlIN6wD7oHEBiej+DF3mY7n0PLVGjFdazCuPIbQX0 +--- b3RQD0vvnCCDVLRRHPdY73sKeogzp+r9X0kn65H7clQ +wCC3殢$F؈=8Ye-lBǧ +ne2{$8KocbM0HWrwi#~ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5c1416f..edf4293 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,9 +7,5 @@ let tartarus ]; in { - ymir = ymir; - tartarus = tartarus; - - "home-wifi-ssid.age".publicKeys = machines; - "home-wifi-password.age".publicKeys = machines; + "network-manager.age".publicKeys = machines; } From 4616fc7d5c8dc234a1bc77214fd144e94aca8d7e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 16:50:08 +0300 Subject: [PATCH 0284/1768] add justfile recipe for tartarus sd image --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index b136a91..d6d802b 100644 --- a/justfile +++ b/justfile @@ -26,3 +26,6 @@ clean: sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old # home-manager expire-generations now sudo nix-collect-garbage --delete-older-than 3d + +build-sd-image-harmonica: check-git + nix build -L .#nixosConfigurations.harmonica.config.system.build.sdImage \ No newline at end of file From b8fb7834655a599f35a66397838e2632c4a6a4d9 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 16:50:32 +0300 Subject: [PATCH 0285/1768] enable binfmt aarh64 build on tartarus --- hosts/tartarus/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 8519882..28a57dd 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -23,6 +23,10 @@ blockYoutube = false; blockTwitter = true; + boot.binfmt.emulatedSystems = ["aarch64-linux"]; + nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; + + services.vscode-server.enable = true; home-manager.useGlobalPkgs = true; From cf7f61ebc3532fb5c94458746a3faf083c2efd52 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:28:03 +0300 Subject: [PATCH 0286/1768] add new todo --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 34cca54..a95f9f0 100644 --- a/README.md +++ b/README.md @@ -27,3 +27,5 @@ I didnt get these setup yet. - [ ] see which derivations will be built and which will be downloaded from cache or which is already present in the nix store. - [ ] see which python packages are giving build errors. - [ ] home-manager setup +- [ ] make a development environment nix repository + From 338d23388b784dfd1a0f7b51831419a5078586e1 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:28:22 +0300 Subject: [PATCH 0287/1768] delete python module --- common/python.nix | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 common/python.nix diff --git a/common/python.nix b/common/python.nix deleted file mode 100644 index 88e9374..0000000 --- a/common/python.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - environment.systemPackages = with pkgs; [ - (pkgs.python312.withPackages (ppkgs: [ - python312Packages.pip - python312Packages.torch - python312Packages.ipython - python312Packages.numpy - python312Packages.pandas - python312Packages.seaborn - python312Packages.matplotlib - python312Packages.jax - python312Packages.huggingface-hub - python312Packages.datasets - python312Packages.transformers - python312Packages.diffusers - python312Packages.jupyter - ])) - pyenv - ]; -} From ebea7dbe632690a9347a44352411c7b29fb4d12d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:30:02 +0300 Subject: [PATCH 0288/1768] bring neovim to flake --- flake.nix | 14 ++++++++++---- hosts/tartarus/configuration.nix | 2 -- hosts/ymir/configuration.nix | 2 -- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index ab945f3..c7c58e0 100644 --- a/flake.nix +++ b/flake.nix @@ -43,11 +43,14 @@ agenix.nixosModules.default home-manager.nixosModules.home-manager { - environment.systemPackages = [agenix.packages.${system}.default]; + environment.systemPackages = [ + agenix.packages.${system}.default + osbm-nvim.packages.${system}.default + ]; } ]; specialArgs = { - inherit system-label osbm-nvim; + inherit system-label; }; }; ymir = nixpkgs.lib.nixosSystem rec { @@ -58,11 +61,14 @@ agenix.nixosModules.default home-manager.nixosModules.home-manager { - environment.systemPackages = [agenix.packages.${system}.default]; + environment.systemPackages = [ + agenix.packages.${system}.default + osbm-nvim.packages.${system}.default + ]; } ]; specialArgs = { - inherit system-label osbm-nvim; + inherit system-label; }; }; harmonica = nixpkgs.lib.nixosSystem { diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 28a57dd..8e64dda 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -5,7 +5,6 @@ config, pkgs, system-label, - osbm-nvim, ... }: { imports = [ @@ -102,7 +101,6 @@ }; environment.systemPackages = with pkgs; [ - osbm-nvim.packages.${system}.default ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 259611e..4a6e4ef 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -5,7 +5,6 @@ config, pkgs, system-label, - osbm-nvim, ... }: { imports = [ @@ -176,7 +175,6 @@ environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit - osbm-nvim.packages.${system}.default ]; services.ollama = { From 669bee21d6dd48493d54db101e67c434375c6086 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:30:15 +0300 Subject: [PATCH 0289/1768] remove comment --- hosts/ymir/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 4a6e4ef..a7bfd3f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -170,8 +170,6 @@ nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: - # $ nix search wget environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit From 28cf319bc0c40f298cc10c4f8e153a185d3b6bd9 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:30:39 +0300 Subject: [PATCH 0290/1768] fix my username --- hosts/harmonica/configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 6e7c07a..b3eaf68 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -157,10 +157,10 @@ services.timesyncd.enable = true; # ! Change the following configuration - users.users.bob = { + users.users.osbm = { isNormalUser = true; - home = "/home/bob"; - description = "Bob"; + home = "/home/osbm"; + description = "osbm"; extraGroups = ["wheel" "networkmanager"]; # ! Be sure to put your own public key here openssh.authorizedKeys.keys = ["a public key"]; @@ -171,5 +171,5 @@ wheelNeedsPassword = false; }; # ! Be sure to change the autologinUser. - services.getty.autologinUser = "bob"; + services.getty.autologinUser = "osbm"; } \ No newline at end of file From 99b32d3b9724e82940eb5dc9b3679f3b63acc37a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:33:04 +0300 Subject: [PATCH 0291/1768] add home configurations --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index c7c58e0..1e11ae6 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,12 @@ ]; }; }; + homeConfigurations = { + osbm = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + modules = [./modules/home.nix]; + }; + }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; }; } From bf58de823384259318edf550cf6e2ec93c900bb3 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:33:18 +0300 Subject: [PATCH 0292/1768] add formatter --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 1e11ae6..5b2ffc3 100644 --- a/flake.nix +++ b/flake.nix @@ -86,5 +86,6 @@ }; }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; + formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; }; } From 3c058360c7bc84c617e62431446e699bacc830dd Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:37:43 +0300 Subject: [PATCH 0293/1768] add system and agenix to harmonica --- flake.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5b2ffc3..d0ed17e 100644 --- a/flake.nix +++ b/flake.nix @@ -71,11 +71,17 @@ inherit system-label; }; }; - harmonica = nixpkgs.lib.nixosSystem { + harmonica = nixpkgs.lib.nixosSystem rec { + system = "aarch64-linux"; modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" agenix.nixosModules.default ./hosts/harmonica/configuration.nix + { + environment.systemPackages = [ + agenix.packages.${system}.default + ]; + } ]; }; }; From 6ffafdca8e29f40a1c3a786cb1d25c45d078da46 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:38:04 +0300 Subject: [PATCH 0294/1768] add home manager to ymir --- hosts/ymir/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a7bfd3f..4bbbc64 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -28,6 +28,11 @@ networking.hostName = "ymir"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.osbm = import ../../modules/home.nix { stateVersion = "24.11"; }; + # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; From 6a446ff6f9fe8471e84c173f6480b9affac33fb6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:38:17 +0300 Subject: [PATCH 0295/1768] remove arduino-ide from ymir configuration --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 4bbbc64..1f0bc26 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -155,7 +155,6 @@ obs-studio audacity qbittorrent - arduino-ide prismlauncher ]; }; From 2ba8b835dfaf0f6df339d72dd6f9e838c24c52ad Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:38:47 +0300 Subject: [PATCH 0296/1768] update home-manager configuration for osbm to use stateVersion --- hosts/tartarus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 8e64dda..25613fe 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -30,7 +30,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.osbm = import ./home.nix; + home-manager.users.osbm = import ../../modules/home.nix { stateVersion = "24.05"; }; virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; From 69ab40797708e300fe7ca05aa2eecab8b6e25b14 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:40:29 +0300 Subject: [PATCH 0297/1768] add option to arduino --- common/arduino.nix | 15 --------------- modules/arduino.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 15 deletions(-) delete mode 100644 common/arduino.nix create mode 100644 modules/arduino.nix diff --git a/common/arduino.nix b/common/arduino.nix deleted file mode 100644 index 6be9e8d..0000000 --- a/common/arduino.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - environment.systemPackages = with pkgs; [ - # arduino-ide - adafruit-nrfutil - ]; - - services.udev.extraRules = '' - KERNEL=="ttyUSB0", MODE="0666" - ''; -} diff --git a/modules/arduino.nix b/modules/arduino.nix new file mode 100644 index 0000000..3960c87 --- /dev/null +++ b/modules/arduino.nix @@ -0,0 +1,31 @@ +{ + pkgs, + lib, + config, + ... +}: { + + + options = { + arduinoSetup = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Installs arduino-ide and adafruit-nrfutil and sets udev rules"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.arduino { + environment.systemPackages = with pkgs; [ + arduino-ide + adafruit-nrfutil + python3 # some arduino libraries require python3 + ]; + + services.udev.extraRules = '' + KERNEL=="ttyUSB[0-9]*",MODE="0666" + KERNEL=="ttyACM[0-9]*",MODE="0666" + ''; + }) + ]; +} From 7a0bf61d06b5288a29926acf3eb13f457868e653 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:40:38 +0300 Subject: [PATCH 0298/1768] use modules --- hosts/tartarus/configuration.nix | 10 +--------- hosts/ymir/configuration.nix | 10 +--------- {common => modules}/common-packages.nix | 0 {common => modules}/concentration.nix | 0 modules/default.nix | 12 ++++++++++++ {common => modules}/firefox.nix | 0 {common => modules}/fonts.nix | 0 {hosts/tartarus => modules}/home.nix | 6 +++--- {common => modules}/i18n.nix | 0 {common => modules}/nix-settings.nix | 2 +- {common => modules}/secrets.nix | 0 11 files changed, 18 insertions(+), 22 deletions(-) rename {common => modules}/common-packages.nix (100%) rename {common => modules}/concentration.nix (100%) create mode 100644 modules/default.nix rename {common => modules}/firefox.nix (100%) rename {common => modules}/fonts.nix (100%) rename {hosts/tartarus => modules}/home.nix (93%) rename {common => modules}/i18n.nix (100%) rename {common => modules}/nix-settings.nix (84%) rename {common => modules}/secrets.nix (100%) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 25613fe..1f89768 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -9,14 +9,7 @@ }: { imports = [ ./hardware-configuration.nix - ../../common/fonts.nix - ../../common/nix-settings.nix - ../../common/i18n.nix - ../../common/python.nix - ../../common/arduino.nix - ../../common/firefox.nix - ../../common/common-packages.nix - ../../common/concentration.nix + ../../modules ]; blockYoutube = false; @@ -96,7 +89,6 @@ obs-studio audacity qbittorrent - arduino-ide ]; }; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 1f0bc26..642dcb0 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -9,15 +9,7 @@ }: { imports = [ ./hardware-configuration.nix - ../../common/fonts.nix - ../../common/nix-settings.nix - ../../common/i18n.nix - ../../common/python.nix - ../../common/arduino.nix - ../../common/firefox.nix - ../../common/common-packages.nix - ../../common/concentration.nix - ../../common/secrets.nix + ../../modules ]; # Bootloader. diff --git a/common/common-packages.nix b/modules/common-packages.nix similarity index 100% rename from common/common-packages.nix rename to modules/common-packages.nix diff --git a/common/concentration.nix b/modules/concentration.nix similarity index 100% rename from common/concentration.nix rename to modules/concentration.nix diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..28e915f --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,12 @@ +{ + imports = [ + ./arduino.nix + ./common-packages.nix + ./concentration.nix + ./firefox.nix + ./fonts.nix + ./i18n.nix + ./nix-settings.nix + ./secrets.nix + ]; +} \ No newline at end of file diff --git a/common/firefox.nix b/modules/firefox.nix similarity index 100% rename from common/firefox.nix rename to modules/firefox.nix diff --git a/common/fonts.nix b/modules/fonts.nix similarity index 100% rename from common/fonts.nix rename to modules/fonts.nix diff --git a/hosts/tartarus/home.nix b/modules/home.nix similarity index 93% rename from hosts/tartarus/home.nix rename to modules/home.nix index 5c8e294..3d9df91 100644 --- a/hosts/tartarus/home.nix +++ b/modules/home.nix @@ -1,6 +1,7 @@ { config, pkgs, + stateVersion ... }: { # Home Manager needs a bit of information about you and the @@ -10,8 +11,6 @@ # Packages that should be installed to the user profile. home.packages = [ - pkgs.htop - pkgs.fortune ]; programs.git = { @@ -20,6 +19,7 @@ userName = "osbm"; }; + # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards @@ -28,7 +28,7 @@ # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "24.11"; + home.stateVersion = stateVersion; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/common/i18n.nix b/modules/i18n.nix similarity index 100% rename from common/i18n.nix rename to modules/i18n.nix diff --git a/common/nix-settings.nix b/modules/nix-settings.nix similarity index 84% rename from common/nix-settings.nix rename to modules/nix-settings.nix index aa87967..a99dc44 100644 --- a/common/nix-settings.nix +++ b/modules/nix-settings.nix @@ -5,7 +5,7 @@ ... }: { # Allow unfree packages - nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfree = true; # TODO: replace this with allowUnfreePredicate # enable nix flakes nix.settings.experimental-features = ["nix-command" "flakes"]; diff --git a/common/secrets.nix b/modules/secrets.nix similarity index 100% rename from common/secrets.nix rename to modules/secrets.nix From 919308d1502c7ca6a13f2937bef1e73ebcdbb1d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:41:28 +0300 Subject: [PATCH 0299/1768] =?UTF-8?q?i=20forgor=20=F0=9F=92=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home.nix b/modules/home.nix index 3d9df91..7500ee1 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,7 +1,7 @@ { config, pkgs, - stateVersion + stateVersion, ... }: { # Home Manager needs a bit of information about you and the From 2f74c68a4ffeaa20393882da39c90e987eb2906c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:47:31 +0300 Subject: [PATCH 0300/1768] add comments --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d0ed17e..72ac24b 100644 --- a/flake.nix +++ b/flake.nix @@ -89,8 +89,9 @@ osbm = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance modules = [./modules/home.nix]; + # get state version from the current hosts' configuration.nix + # specialArgs = { stateVersion = "24.05"; }; }; - }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; }; From f010992710454554a62ac331761b2f35a47fb060 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:48:32 +0300 Subject: [PATCH 0301/1768] i am a dumb fuck --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 72ac24b..e1fe9b6 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,7 @@ # get state version from the current hosts' configuration.nix # specialArgs = { stateVersion = "24.05"; }; }; + }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; }; From 39f565127994a3e082a98585df1ec91dbcc160df Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:55:43 +0300 Subject: [PATCH 0302/1768] call home manager properly --- hosts/tartarus/configuration.nix | 12 +++++++----- hosts/ymir/configuration.nix | 11 +++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 1f89768..fd99b82 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -6,7 +6,9 @@ pkgs, system-label, ... -}: { +}: let + stateVersion = "24.05"; +in { imports = [ ./hardware-configuration.nix ../../modules @@ -18,13 +20,13 @@ boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - services.vscode-server.enable = true; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../modules/home.nix { stateVersion = "24.05"; }; - + home-manager.users.osbm = import ../../modules/home.nix { + inherit config pkgs stateVersion; + }; virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; @@ -117,5 +119,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = stateVersion; # Did you read the comment? } diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 642dcb0..6b24796 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -6,7 +6,9 @@ pkgs, system-label, ... -}: { +}: let + stateVersion = "24.11"; +in { imports = [ ./hardware-configuration.nix ../../modules @@ -20,10 +22,11 @@ networking.hostName = "ymir"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../modules/home.nix { stateVersion = "24.11"; }; + home-manager.users.osbm = import ../../modules/home.nix { + inherit config pkgs stateVersion; + }; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -204,5 +207,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.11"; # Did you read the comment? + system.stateVersion = stateVersion; # Did you read the comment? } From 71460684ba5d5424350a61cdd904be3b9aa659f2 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 20:56:16 +0300 Subject: [PATCH 0303/1768] formatting --- hosts/harmonica/configuration.nix | 5 ++--- hosts/harmonica/sd-image.nix | 2 +- modules/arduino.nix | 2 -- modules/default.nix | 2 +- modules/home.nix | 1 - 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index b3eaf68..ad65e61 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -13,7 +13,7 @@ nixpkgs.overlays = [ (final: super: { makeModulesClosure = x: - super.makeModulesClosure (x // { allowMissing = true; }); + super.makeModulesClosure (x // {allowMissing = true;}); }) ]; @@ -149,7 +149,6 @@ }; }; - # Enable OpenSSH out of the box. services.sshd.enable = true; @@ -172,4 +171,4 @@ }; # ! Be sure to change the autologinUser. services.getty.autologinUser = "osbm"; -} \ No newline at end of file +} diff --git a/hosts/harmonica/sd-image.nix b/hosts/harmonica/sd-image.nix index 91fe156..9c38bde 100644 --- a/hosts/harmonica/sd-image.nix +++ b/hosts/harmonica/sd-image.nix @@ -37,4 +37,4 @@ '' ); }; -} \ No newline at end of file +} diff --git a/modules/arduino.nix b/modules/arduino.nix index 3960c87..dac5cb1 100644 --- a/modules/arduino.nix +++ b/modules/arduino.nix @@ -4,8 +4,6 @@ config, ... }: { - - options = { arduinoSetup = lib.mkOption { type = lib.types.bool; diff --git a/modules/default.nix b/modules/default.nix index 28e915f..057a18c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,4 +9,4 @@ ./nix-settings.nix ./secrets.nix ]; -} \ No newline at end of file +} diff --git a/modules/home.nix b/modules/home.nix index 7500ee1..8df65a4 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -19,7 +19,6 @@ userName = "osbm"; }; - # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards From d9ee14b6930b49321177491d04af84ca7bf21f74 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 21:02:17 +0300 Subject: [PATCH 0304/1768] fix option --- modules/arduino.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/arduino.nix b/modules/arduino.nix index dac5cb1..34a86f6 100644 --- a/modules/arduino.nix +++ b/modules/arduino.nix @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.arduino { + (lib.mkIf config.arduinoSetup { environment.systemPackages = with pkgs; [ arduino-ide adafruit-nrfutil From 040e77e45a565a4be3a24f13e3e5128141bda042 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 21:09:20 +0300 Subject: [PATCH 0305/1768] rename just recipe --- justfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index d6d802b..854d63d 100644 --- a/justfile +++ b/justfile @@ -1,12 +1,10 @@ _default: @just --list --unsorted - check-git: # git must be clean test -z "$(git status --porcelain)" - [linux] build *args: check-git sudo nixos-rebuild build --flake . {{args}} |& nom @@ -23,6 +21,9 @@ check: nix flake check clean: + rm result + +collect-garbage: sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old # home-manager expire-generations now sudo nix-collect-garbage --delete-older-than 3d From bb7dca31443521804d5e54f05717bbe9a4df25d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 21:15:31 +0300 Subject: [PATCH 0306/1768] ITS 2025 RAAAGHHHH --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 6a8223b..0a54b1a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Osman F Bayram +Copyright (c) 2025 Osman F Bayram Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 64cc78a2bdfecea4290f511c532095e06417d078 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 22:19:04 +0300 Subject: [PATCH 0307/1768] try this for ssh keys --- modules/secrets.nix | 10 ++++++++++ secrets/secrets.nix | 2 ++ secrets/ssh-key-private.age | Bin 0 -> 721 bytes secrets/ssh-key-public.age | Bin 0 -> 403 bytes 4 files changed, 12 insertions(+) create mode 100644 secrets/ssh-key-private.age create mode 100644 secrets/ssh-key-public.age diff --git a/modules/secrets.nix b/modules/secrets.nix index 1716cb1..684b394 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -1,5 +1,15 @@ { age.secrets = { network-manager.file = ../secrets/network-manager.age; + ssh-key-private = { + file = ../secrets/ssh-key-private.age; + path = "/home/osbm/.ssh/id_ed25519"; + mode = "0600"; + }; + ssh-key-public = { + file = ../secrets/ssh-key-public.age; + path = "/home/osbm/.ssh/id_ed25519.pub"; + mode = "0644"; + }; }; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index edf4293..3e1005f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -8,4 +8,6 @@ let ]; in { "network-manager.age".publicKeys = machines; + "ssh-key-private.age".publicKeys = machines; + "ssh-key-public.age".publicKeys = machines; } diff --git a/secrets/ssh-key-private.age b/secrets/ssh-key-private.age new file mode 100644 index 0000000000000000000000000000000000000000..04e6d70b4b7eb30bb37f2ac010e3de34062d465c GIT binary patch literal 721 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7_9*nJOjoG%Dl9Gt z$?;D&4$jgKN-ZxdE;jdY^Y^Oqc5%%pFp2W<%JR$$GD{Cjx8MqMsVX!o@l5nLugEfY z&#m(D@GADL$Z#vL3`w!j&vDO;G&0Zd%gs-73q-dq(Xz^^s$8M4u-w3`(j=?UwahTW zFv-Fv-QCH>Ei}-?E4jqUNINkx*eTC1pe)eUIh!lrJ2${Tz|k}?tTH`0CAl&;+$b+9 zJixaqCotbXva;N;!q+r8B+=5Vz>`Z?S69KpFtxHEG`~17&C9vSI90zi(j>UpG155D zB2hmm(%q*jCn6%x&^OA`$dfDZ;OjV%G+C2P6XH*H#xlHB&3)7z(5&s2RZ%r*_1w&z z+-nZmH#GL_oR_IuViWq{?}4-vLQ_`H^LhSGO0%}4T<=%$FU~Wu)e(=5)pDB0h$~g5 zUikX?^_qj6T}EH_hB?lIj`;4-ko&)#)R8Wwap?A^ndw0(l5x< z|9I}BlwItrQ}08}CT70ye=mG%`g?VyxAC(#Q^IyU5B;*~&mP;xpt9HQEa|sqq#cq~ z`J%t%xy#K>{;_ literal 0 HcmV?d00001 diff --git a/secrets/ssh-key-public.age b/secrets/ssh-key-public.age new file mode 100644 index 0000000000000000000000000000000000000000..05ffd850db207a4263ee3c77d3c0c3527b74f15f GIT binary patch literal 403 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7_9*nJOjn3zt1`-^ zBDgR!E7je}$FHI=B)25ju++k^Ael>7S69I!r6@DoG}zH6!ZR!**wDw=(ZkZo*vHJ* zsJy(?*h1T_B&{H$yfDkrub6Ay(}JT?fm3VZ-}#Gt5YU?NN~_`G&cOML<7+gvr_8EQ z6lFH&^Y0AkYRq@lX??{|x^K>o_g0UW&knymU;3HblKBseB+V{o-acRZV?OVBqaTOo mhdfU0Q}N+1FOqz&9(}xh{;AXsr3Werr!su^oQW>FGY Date: Mon, 13 Jan 2025 22:24:09 +0300 Subject: [PATCH 0308/1768] add ownership --- modules/secrets.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/secrets.nix b/modules/secrets.nix index 684b394..84fe2a2 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -4,11 +4,13 @@ ssh-key-private = { file = ../secrets/ssh-key-private.age; path = "/home/osbm/.ssh/id_ed25519"; + owner = "osbm"; mode = "0600"; }; ssh-key-public = { file = ../secrets/ssh-key-public.age; path = "/home/osbm/.ssh/id_ed25519.pub"; + owner = "osbm"; mode = "0644"; }; }; From d3ddc8df9a5fc09a74d5b11027d9e8c4bcac95fa Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 22:55:09 +0300 Subject: [PATCH 0309/1768] add ssh config for ymir and tartarus --- modules/home.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/home.nix b/modules/home.nix index 8df65a4..6a6baa3 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -19,6 +19,24 @@ userName = "osbm"; }; + programs.ssh = { + enable = true; + hashKnownHosts = true; + compression = true; + + matchBlocks = { + "tartarus" = { + hostname = "192.168.0.4"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + }; + "ymir" = { + hostname = "192.168.0.2"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + }; + }; + }; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards From 4cc8e1339cc8db0e2913ab40e26282eb61a0beea Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 23:19:39 +0300 Subject: [PATCH 0310/1768] move out openssh and docker and configure openssh --- hosts/tartarus/configuration.nix | 4 ---- hosts/ymir/configuration.nix | 5 +---- modules/common-packages.nix | 25 +++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index fd99b82..58f21f7 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -70,7 +70,6 @@ in { # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; - virtualisation.docker.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.osbm = { @@ -103,9 +102,6 @@ in { # List services that you want to enable: - # Enable the OpenSSH daemon. - services.openssh.enable = true; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 6b24796..760d0eb 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -128,8 +128,6 @@ in { # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - virtualisation.docker.enable = true; users.users = { osbm = { @@ -192,8 +190,7 @@ in { # List services that you want to enable: - # Enable the OpenSSH daemon. - services.openssh.enable = true; + # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 572ca45..9c9e5af 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -75,4 +75,29 @@ package = pkgs.nix-direnv; }; }; + + virtualisation.docker.enable = true; + + # Enable the OpenSSH daemon. + services.openssh = { + enable = true; + startWhenNeeded = true; + settings = { + PermitRootLogin = "no"; + + # only allow key based logins and not password + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + AuthenticationMethods = "publickey"; + PubkeyAuthentication = "yes"; + ChallengeResponseAuthentication = "no"; + UsePAM = false; + + + # kick out inactive sessions + ClientAliveCountMax = 5; + ClientAliveInterval = 60; + }; + }; + } From ee9f96d563a2056d9599e2e2a0812dd5709b8195 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 23:47:00 +0300 Subject: [PATCH 0311/1768] move vscode server --- hosts/tartarus/configuration.nix | 2 +- modules/common-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 58f21f7..39038d0 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -20,7 +20,7 @@ in { boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - services.vscode-server.enable = true; + home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 9c9e5af..d812f0c 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -100,4 +100,5 @@ }; }; + services.vscode-server.enable = true; } From b4499201108731ffae977434b5f4b36ae77df88d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 23:48:52 +0300 Subject: [PATCH 0312/1768] remove sops --- modules/common-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index d812f0c..aa867fc 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -34,7 +34,6 @@ cmatrix inxi age - sops jq onefetch just From 4bdb9e5fe68bfc3332acb4bd8270e01a38ba5150 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 23:49:03 +0300 Subject: [PATCH 0313/1768] add space --- hosts/tartarus/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 39038d0..e393625 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -27,6 +27,8 @@ in { home-manager.users.osbm = import ../../modules/home.nix { inherit config pkgs stateVersion; }; + + virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; From 97437b0c3cd6fb0dfbf9366a859638046e9182d3 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 23:49:55 +0300 Subject: [PATCH 0314/1768] collect graphical interface code --- hosts/tartarus/configuration.nix | 27 ++------------- hosts/ymir/configuration.nix | 29 ---------------- modules/common-packages.nix | 12 +------ modules/graphical-interface.nix | 58 ++++++++++++++++++++++++++++++++ secrets/secrets.nix | 9 +++-- 5 files changed, 68 insertions(+), 67 deletions(-) create mode 100644 modules/graphical-interface.nix diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index e393625..25574d3 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -46,17 +46,6 @@ in { # Enable networking networking.networkmanager.enable = true; - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; - # Enable sound with pipewire. services.pulseaudio.enable = false; security.rtkit.enable = true; @@ -79,19 +68,9 @@ in { description = "osbm"; extraGroups = ["networkmanager" "wheel" "docker"]; packages = with pkgs; [ - kdePackages.kate - vscode - discord # discord sucks - alacritty - obsidian - mpv - libreoffice - blender - gimp - kitty - obs-studio - audacity - qbittorrent + ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; }; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 760d0eb..2ce668d 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -77,17 +77,6 @@ in { package = config.boot.kernelPackages.nvidiaPackages.beta; }; - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; - # Enable sound with pipewire. services.pulseaudio.enable = false; security.rtkit.enable = true; @@ -135,20 +124,6 @@ in { description = "osbm"; extraGroups = ["networkmanager" "wheel" "docker"]; packages = with pkgs; [ - kdePackages.kate - vscode - discord # discord sucks - alacritty - obsidian - mpv - libreoffice - blender - gimp - kitty - obs-studio - audacity - qbittorrent - prismlauncher ]; }; bayram = { @@ -157,10 +132,6 @@ in { initialPassword = "changeme"; extraGroups = ["networkmanager"]; packages = with pkgs; [ - vlc - ungoogled-chromium - prismlauncher - qbittorrent ]; }; }; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index aa867fc..feda342 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -20,7 +20,7 @@ tlrc wakeonlan # neovim - ani-cli + btop pciutils nodePackages.npm @@ -48,16 +48,6 @@ comma ]; - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - dedicatedServer.openFirewall = true; - # Open ports in the firewall for Steam Local Network Game Transfers - localNetworkGameTransfers.openFirewall = true; - }; - programs.gnupg.agent = { enable = true; enableSSHSupport = true; diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix new file mode 100644 index 0000000..f2c319f --- /dev/null +++ b/modules/graphical-interface.nix @@ -0,0 +1,58 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + enableKDE = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable KDE Plasma Desktop Environment with my favorite packages"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.enableKDE { + + # Enable the X11 windowing system. + # You can disable this if you're only using the Wayland session. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + + # Enable CUPS to print documents. + services.printing.enable = true; + + environment.systemPackages = with pkgs; [ + vscode + discord # discord sucks + alacritty + obsidian + mpv + libreoffice + blender + gimp + kitty + obs-studio + audacity + qbittorrent + ani-cli + prismlauncher + qbittorrent + ]; + + programs.steam = { + enable = true; + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; + }; + }) + ]; +} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 3e1005f..9fa9ee5 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,12 +2,15 @@ let ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxc1ycxtzO2u4bHas71pi5CpR8Zzcj6GXjx1lLWMOHq"; tartarus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxbIyQnQFA1RFQKH4eHHWcT7Z0tCumerCsRMjlHgSPd"; + osbm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"; + machines = [ ymir tartarus ]; + in { - "network-manager.age".publicKeys = machines; - "ssh-key-private.age".publicKeys = machines; - "ssh-key-public.age".publicKeys = machines; + "network-manager.age".publicKeys = machines ++ [osbm]; + "ssh-key-private.age".publicKeys = machines ++ [osbm]; + "ssh-key-public.age".publicKeys = machines ++ [osbm]; } From 9b58e51b36d4853bcd0316bfa8a4db6a65e4e402 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 23:51:23 +0300 Subject: [PATCH 0315/1768] add module --- modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default.nix b/modules/default.nix index 057a18c..0c24b5e 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,6 +5,7 @@ ./concentration.nix ./firefox.nix ./fonts.nix + ./graphical-interface.nix ./i18n.nix ./nix-settings.nix ./secrets.nix From 55fc9d45a57fe79c3e7db933545e44326207a990 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 13 Jan 2025 23:57:31 +0300 Subject: [PATCH 0316/1768] users users usersssssss --- hosts/tartarus/configuration.nix | 18 ++---------------- hosts/ymir/configuration.nix | 27 +++++---------------------- modules/default.nix | 1 + modules/users.nix | 27 +++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 modules/users.nix diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 25574d3..9a10baa 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -17,11 +17,11 @@ in { blockYoutube = false; blockTwitter = true; + enableKDE = true; + boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ../../modules/home.nix { @@ -59,20 +59,6 @@ in { hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.osbm = { - isNormalUser = true; - description = "osbm"; - extraGroups = ["networkmanager" "wheel" "docker"]; - packages = with pkgs; [ - ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" - ]; - }; environment.systemPackages = with pkgs; [ ]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 2ce668d..41aba55 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,6 +14,11 @@ in { ../../modules ]; + blockYoutube = false; + blockTwitter = true; + + enableKDE = true; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -114,28 +119,6 @@ in { }; }; - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - - users.users = { - osbm = { - isNormalUser = true; - description = "osbm"; - extraGroups = ["networkmanager" "wheel" "docker"]; - packages = with pkgs; [ - ]; - }; - bayram = { - isNormalUser = true; - description = "bayram"; - initialPassword = "changeme"; - extraGroups = ["networkmanager"]; - packages = with pkgs; [ - ]; - }; - }; - nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ diff --git a/modules/default.nix b/modules/default.nix index 0c24b5e..a49bfd1 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,5 +9,6 @@ ./i18n.nix ./nix-settings.nix ./secrets.nix + ./users.nix ]; } diff --git a/modules/users.nix b/modules/users.nix new file mode 100644 index 0000000..471385a --- /dev/null +++ b/modules/users.nix @@ -0,0 +1,27 @@ +{ + pkgs, + lib, + config, + ... +}: { + users.users = { + osbm = { + isNormalUser = true; + description = "osbm"; + extraGroups = ["networkmanager" "wheel" "docker"]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" + ]; + packages = with pkgs; [ + ]; + }; + bayram = { + isNormalUser = true; + description = "bayram"; + initialPassword = "changeme"; + extraGroups = ["networkmanager"]; + packages = with pkgs; [ + ]; + }; + }; +} From ba8d429eef13f8b7ba32034a10889f5d3a430d3f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 00:23:13 +0300 Subject: [PATCH 0317/1768] use fisshhhhhhh --- modules/home.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/home.nix b/modules/home.nix index 6a6baa3..a303660 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -29,11 +29,17 @@ hostname = "192.168.0.4"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; + extraOptions = { + "RemoteCommand" = "fish"; + } }; "ymir" = { hostname = "192.168.0.2"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; + extraOptions = { + "RemoteCommand" = "fish"; + } }; }; }; From 9c66e81dd98b83fc9501bbeda8b9f2bc1f41b133 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 00:24:29 +0300 Subject: [PATCH 0318/1768] all time favorite semicolon error --- modules/home.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home.nix b/modules/home.nix index a303660..a2735aa 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -31,7 +31,7 @@ identityFile = "/home/osbm/.ssh/id_ed25519"; extraOptions = { "RemoteCommand" = "fish"; - } + }; }; "ymir" = { hostname = "192.168.0.2"; @@ -39,7 +39,7 @@ identityFile = "/home/osbm/.ssh/id_ed25519"; extraOptions = { "RemoteCommand" = "fish"; - } + }; }; }; }; From bcb68835398a0e21f001a441cdb56f64a804bdd5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 00:51:38 +0300 Subject: [PATCH 0319/1768] disable for now --- modules/home.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/home.nix b/modules/home.nix index a2735aa..24fbc63 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -29,17 +29,17 @@ hostname = "192.168.0.4"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - extraOptions = { - "RemoteCommand" = "fish"; - }; + # extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). + # "RemoteCommand" = "fish"; + # }; }; "ymir" = { hostname = "192.168.0.2"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - extraOptions = { - "RemoteCommand" = "fish"; - }; + # extraOptions = { # TODO fix the damn starship error + # "RemoteCommand" = "fish"; + # }; }; }; }; From 0fabea9c6db43748fe7941c51e796ecc2c852d90 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 01:19:02 +0300 Subject: [PATCH 0320/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ca158a5..f85b8de 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { From 8de06d65c69207f9d2c617b210a6ca3721b2b63c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 01:42:03 +0300 Subject: [PATCH 0321/1768] add rpi inputs --- flake.lock | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 9 +++ 2 files changed, 223 insertions(+) diff --git a/flake.lock b/flake.lock index f85b8de..4a19f6f 100644 --- a/flake.lock +++ b/flake.lock @@ -281,6 +281,40 @@ "type": "github" } }, + "libcamera-src": { + "flake": false, + "locked": { + "lastModified": 1725630279, + "narHash": "sha256-KH30jmHfxXq4j2CL7kv18DYECJRp9ECuWNPnqPZajPA=", + "owner": "raspberrypi", + "repo": "libcamera", + "rev": "69a894c4adad524d3063dd027f5c4774485cf9db", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "repo": "libcamera", + "rev": "69a894c4adad524d3063dd027f5c4774485cf9db", + "type": "github" + } + }, + "libpisp-src": { + "flake": false, + "locked": { + "lastModified": 1724944683, + "narHash": "sha256-Fo2UJmQHS855YSSKKmGrsQnJzXog1cdpkIOO72yYAM4=", + "owner": "raspberrypi", + "repo": "libpisp", + "rev": "28196ed6edcfeda88d23cc5f213d51aa6fa17bb3", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "ref": "v1.0.7", + "repo": "libpisp", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -326,6 +360,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -492,15 +542,166 @@ "type": "github" } }, + "raspberry-pi-nix": { + "inputs": { + "libcamera-src": "libcamera-src", + "libpisp-src": "libpisp-src", + "nixpkgs": [ + "nixpkgs" + ], + "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", + "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", + "rpi-firmware-src": "rpi-firmware-src", + "rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", + "rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src", + "rpi-linux-stable-src": "rpi-linux-stable-src", + "rpicam-apps-src": "rpicam-apps-src", + "u-boot-src": "u-boot-src" + }, + "locked": { + "lastModified": 1736358780, + "narHash": "sha256-t8++2QSK+8Ed506NUmSG588wZKoBkJ+dlDxuFxNAF4Y=", + "owner": "nix-community", + "repo": "raspberry-pi-nix", + "rev": "628e512d60fa99f8f49e73e39b7cedf9b968c282", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "raspberry-pi-nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "osbm-nvim": "osbm-nvim", + "raspberry-pi-nix": "raspberry-pi-nix", "vscode-server": "vscode-server" } }, + "rpi-bluez-firmware-src": { + "flake": false, + "locked": { + "lastModified": 1708969706, + "narHash": "sha256-KakKnOBeWxh0exu44beZ7cbr5ni4RA9vkWYb9sGMb8Q=", + "owner": "RPi-Distro", + "repo": "bluez-firmware", + "rev": "78d6a07730e2d20c035899521ab67726dc028e1c", + "type": "github" + }, + "original": { + "owner": "RPi-Distro", + "ref": "bookworm", + "repo": "bluez-firmware", + "type": "github" + } + }, + "rpi-firmware-nonfree-src": { + "flake": false, + "locked": { + "lastModified": 1723266537, + "narHash": "sha256-T7eTKXqY9cxEMdab8Snda4CEOrEihy5uOhA6Fy+Mhnw=", + "owner": "RPi-Distro", + "repo": "firmware-nonfree", + "rev": "4b356e134e8333d073bd3802d767a825adec3807", + "type": "github" + }, + "original": { + "owner": "RPi-Distro", + "ref": "bookworm", + "repo": "firmware-nonfree", + "type": "github" + } + }, + "rpi-firmware-src": { + "flake": false, + "locked": { + "lastModified": 1728405098, + "narHash": "sha256-4gnK0KbqFnjBmWia9Jt2gveVWftmHrprpwBqYVqE/k0=", + "owner": "raspberrypi", + "repo": "firmware", + "rev": "7bbb5f80d20a2335066a8781459c9f33e5eebc64", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "ref": "1.20241008", + "repo": "firmware", + "type": "github" + } + }, + "rpi-linux-6_10_12-src": { + "flake": false, + "locked": { + "lastModified": 1728305462, + "narHash": "sha256-LtvNmGD1D5YYv+C9xxxddAeHw69o3OX/H9M7F663L74=", + "owner": "raspberrypi", + "repo": "linux", + "rev": "26ee50d56618c2d98100b1bc672fd201aed4d00f", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "ref": "rpi-6.10.y", + "repo": "linux", + "type": "github" + } + }, + "rpi-linux-6_6_67-src": { + "flake": false, + "locked": { + "lastModified": 1734790986, + "narHash": "sha256-q9swM2TmmuzbUuQnbLZk5PseKWD7/SNPwtth6bpGIqE=", + "owner": "raspberrypi", + "repo": "linux", + "rev": "811ff707533bcd67cdcd368bbd46223082009b12", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "ref": "rpi-6.6.y", + "repo": "linux", + "type": "github" + } + }, + "rpi-linux-stable-src": { + "flake": false, + "locked": { + "lastModified": 1728403745, + "narHash": "sha256-phCxkuO+jUGZkfzSrBq6yErQeO2Td+inIGHxctXbD5U=", + "owner": "raspberrypi", + "repo": "linux", + "rev": "5aeecea9f4a45248bcf564dec924965e066a7bfd", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "ref": "stable_20241008", + "repo": "linux", + "type": "github" + } + }, + "rpicam-apps-src": { + "flake": false, + "locked": { + "lastModified": 1727515047, + "narHash": "sha256-qCYGrcibOeGztxf+sd44lD6VAOGoUNwRqZDdAmcTa/U=", + "owner": "raspberrypi", + "repo": "rpicam-apps", + "rev": "a8ccf9f3cd9df49875dfb834a2b490d41d226031", + "type": "github" + }, + "original": { + "owner": "raspberrypi", + "ref": "v1.5.2", + "repo": "rpicam-apps", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -568,6 +769,19 @@ "type": "github" } }, + "u-boot-src": { + "flake": false, + "locked": { + "lastModified": 1719857238, + "narHash": "sha256-mJ2TBy0Y5ZtcGFgtU5RKr0UDUp5FWzojbFb+o/ebRJU=", + "type": "tarball", + "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2" + }, + "original": { + "type": "tarball", + "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", diff --git a/flake.nix b/flake.nix index e1fe9b6..957f566 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,15 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; osbm-nvim.url = "github:osbm/osbm-nvim"; + + raspberry-pi-nix = { + url = "github:nix-community/raspberry-pi-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixos-hardware = { + url = "github:NixOS/nixos-hardware/master"; + }; }; outputs = { From 837ce855ab3270aa0e76833ac44efd098f3c29af Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 01:42:24 +0300 Subject: [PATCH 0322/1768] add pochita --- flake.nix | 13 ++ hosts/pochita/configuration.nix | 208 ++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) create mode 100644 hosts/pochita/configuration.nix diff --git a/flake.nix b/flake.nix index 957f566..c40c748 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,8 @@ agenix, osbm-nvim, home-manager, + raspberry-pi-nix, + nixos-hardware, ... }: { nixosConfigurations = let @@ -93,8 +95,19 @@ } ]; }; + pochita = nixpkgs.lib.nixosSystem rec { + system = "aarch64-linux"; + modules = [ + ./hosts/pochita/configuration.nix + agenix.nixosModules.default + raspberry-pi-nix.nixosModules.raspberry-pi + nixos-hardware.nixosModules.raspberry-pi-5 + ]; + }; }; homeConfigurations = { + # doesnt work because my different systems have different stateVersions + # i dont know how to get the stateVersion from the current host osbm = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance modules = [./modules/home.nix]; diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix new file mode 100644 index 0000000..fb28059 --- /dev/null +++ b/hosts/pochita/configuration.nix @@ -0,0 +1,208 @@ +# This is the SD image initial configuration + +{ config, pkgs, lib, ... }: + +let + stateVersion = "25.05"; +in { + + imports = [ + ../../modules + ]; + + enableKDE = false; + + blockYoutube = false; + blockTwitter = false; + + # Comment this line if you want a recent kernel, but + # if it's not in the community cache the builder will compile it +# boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_rpi4; +# console = { +# font = "Lat2-Terminus16"; +# keyMap = lib.mkForce "fr"; +# useXkbConfig = true; # use xkb.options in tty. +# }; + + + security.sudo.wheelNeedsPassword = false; + +# # Initial network configuration +# networking = { +# hostName = "pixos"; +# useDHCP = false; +# interfaces = { +# wlan0.useDHCP = false; +# eth0.useDHCP = true; +# }; +# }; + networking.networkmanager.ensureProfiles = { + environmentFiles = [ + config.age.secrets.nm-secrets.path + ]; + + profiles = { + House_Bayram = { + connection = { + id = "House_Bayram"; + type = "wifi"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + method = "auto"; + }; + wifi = { + mode = "infrastructure"; + ssid = "House_Bayram"; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "$HOME_WIFI"; + }; + }; + it_hurts_when_IP = { + connection = { + id = "it_hurts_when_IP"; + type = "ethernet"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "stable-privacy"; + method = "auto"; + }; + wifi = { + mode = "infrastructure"; + ssid = "it_hurts_when_IP"; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "$HOME_WIFI"; + }; + }; + }; + }; + + + +# # Some programs + environment.systemPackages = with pkgs; [ +# vim +# wget +# git +# htop + ]; + + # Experimental features must be activated +# nix.settings = { +# trusted-users = [ "@wheel" ]; +# experimental-features = [ "nix-command" "flakes" ]; +# keep-outputs = true; +# keep-derivations = true; +# }; + + + # The board and wanted kernel version + raspberry-pi-nix = { + board = "bcm2712"; + #kernel-version = "v6_10_12"; + }; + + # PI Hardware configuration + hardware = { + bluetooth.enable = true; + raspberry-pi = { + config = { + all = { + base-dt-params = { + BOOT_UART = { + enable = false; + value = 1; + }; + uart_2ndstage = { + enable = false; + value = 1; + }; + audio = { + enable = true; + value = "off"; + }; + sd_poll_once = { + enable = true; + }; + + # NVME disk access + #pciex1 = { + # enable = true; + #}; + #pciex1_gen = { + # enable = true; + # value = 3; + #}; + #nvme = { + # enable = true; + #}; + + }; + dt-overlays = { + vc4-kms-v3d-pi5 = { + enable = true; + params = { }; + }; + }; + options = { + hdmi_blanking = { + enable = true; + value = 1; + }; + disable_overscan = { + enable = true; + value = 1; + }; + gpu_mem_256 = { + enable = true; + value = 76; + }; + gpu_mem_512 = { + enable = true; + value = 76; + }; + gpu_mem_1024 = { + enable = true; + value = 76; + }; + disable_splash = { + enable = true; + value = 1; + }; + temp_limit = { + enable = true; + value = 75; + }; + initial_turbo = { + enable = true; + value = 20; + }; + }; + }; + }; + }; + }; + + # You can put another features here, for example: + #security.rtkit.enable = true; + #services.pipewire = { + # enable = true; + # alsa.enable = true; + # alsa.support32Bit = true; + # pulse.enable = true; + #}; + services.getty.autologinUser = "osbm"; + + # DO NOT TOUCH THIS + system.stateVersion = stateVersion; +} \ No newline at end of file From 4e6b2cb413c26bfc6030cb59c7f1d007b3210d2a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 01:42:37 +0300 Subject: [PATCH 0323/1768] initial password for me --- modules/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/users.nix b/modules/users.nix index 471385a..6acc7c6 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -8,6 +8,7 @@ osbm = { isNormalUser = true; description = "osbm"; + initialPassword = "changeme"; extraGroups = ["networkmanager" "wheel" "docker"]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" From 8e57f421fd39f89295d9a6691c588f867862b17d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 01:45:39 +0300 Subject: [PATCH 0324/1768] also mention vscode server --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index c40c748..02d5acb 100644 --- a/flake.nix +++ b/flake.nix @@ -102,6 +102,7 @@ agenix.nixosModules.default raspberry-pi-nix.nixosModules.raspberry-pi nixos-hardware.nixosModules.raspberry-pi-5 + vscode-server.nixosModules.default ]; }; }; From 449be007a869073784847c59f6d8e93b55651a73 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 01:46:30 +0300 Subject: [PATCH 0325/1768] formatting --- hosts/pochita/configuration.nix | 74 +++++++++++++++----------------- hosts/tartarus/configuration.nix | 2 - hosts/ymir/configuration.nix | 2 - modules/common-packages.nix | 1 - modules/graphical-interface.nix | 69 +++++++++++++++-------------- secrets/secrets.nix | 1 - 6 files changed, 69 insertions(+), 80 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index fb28059..ed588c1 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -1,11 +1,12 @@ # This is the SD image initial configuration - -{ config, pkgs, lib, ... }: - -let +{ + config, + pkgs, + lib, + ... +}: let stateVersion = "25.05"; in { - imports = [ ../../modules ]; @@ -13,29 +14,28 @@ in { enableKDE = false; blockYoutube = false; - blockTwitter = false; + blockTwitter = false; # Comment this line if you want a recent kernel, but # if it's not in the community cache the builder will compile it -# boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_rpi4; -# console = { -# font = "Lat2-Terminus16"; -# keyMap = lib.mkForce "fr"; -# useXkbConfig = true; # use xkb.options in tty. -# }; - + # boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_rpi4; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = lib.mkForce "fr"; + # useXkbConfig = true; # use xkb.options in tty. + # }; security.sudo.wheelNeedsPassword = false; -# # Initial network configuration -# networking = { -# hostName = "pixos"; -# useDHCP = false; -# interfaces = { -# wlan0.useDHCP = false; -# eth0.useDHCP = true; -# }; -# }; + # # Initial network configuration + # networking = { + # hostName = "pixos"; + # useDHCP = false; + # interfaces = { + # wlan0.useDHCP = false; + # eth0.useDHCP = true; + # }; + # }; networking.networkmanager.ensureProfiles = { environmentFiles = [ config.age.secrets.nm-secrets.path @@ -87,24 +87,21 @@ in { }; }; - - -# # Some programs + # # Some programs environment.systemPackages = with pkgs; [ -# vim -# wget -# git -# htop + # vim + # wget + # git + # htop ]; # Experimental features must be activated -# nix.settings = { -# trusted-users = [ "@wheel" ]; -# experimental-features = [ "nix-command" "flakes" ]; -# keep-outputs = true; -# keep-derivations = true; -# }; - + # nix.settings = { + # trusted-users = [ "@wheel" ]; + # experimental-features = [ "nix-command" "flakes" ]; + # keep-outputs = true; + # keep-derivations = true; + # }; # The board and wanted kernel version raspberry-pi-nix = { @@ -146,12 +143,11 @@ in { #nvme = { # enable = true; #}; - }; dt-overlays = { vc4-kms-v3d-pi5 = { enable = true; - params = { }; + params = {}; }; }; options = { @@ -205,4 +201,4 @@ in { # DO NOT TOUCH THIS system.stateVersion = stateVersion; -} \ No newline at end of file +} diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 9a10baa..d43bef9 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -28,7 +28,6 @@ in { inherit config pkgs stateVersion; }; - virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; @@ -59,7 +58,6 @@ in { hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - environment.systemPackages = with pkgs; [ ]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 41aba55..591710d 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -144,8 +144,6 @@ in { # List services that you want to enable: - - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index feda342..232379a 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -82,7 +82,6 @@ ChallengeResponseAuthentication = "no"; UsePAM = false; - # kick out inactive sessions ClientAliveCountMax = 5; ClientAliveInterval = 60; diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index f2c319f..1004480 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -14,45 +14,44 @@ config = lib.mkMerge [ (lib.mkIf config.enableKDE { + # Enable the X11 windowing system. + # You can disable this if you're only using the Wayland session. + services.xserver.enable = true; - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; + # Enable the KDE Plasma Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + # Enable CUPS to print documents. + services.printing.enable = true; - # Enable CUPS to print documents. - services.printing.enable = true; + environment.systemPackages = with pkgs; [ + vscode + discord # discord sucks + alacritty + obsidian + mpv + libreoffice + blender + gimp + kitty + obs-studio + audacity + qbittorrent + ani-cli + prismlauncher + qbittorrent + ]; - environment.systemPackages = with pkgs; [ - vscode - discord # discord sucks - alacritty - obsidian - mpv - libreoffice - blender - gimp - kitty - obs-studio - audacity - qbittorrent - ani-cli - prismlauncher - qbittorrent - ]; - - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - dedicatedServer.openFirewall = true; - # Open ports in the firewall for Steam Local Network Game Transfers - localNetworkGameTransfers.openFirewall = true; - }; + programs.steam = { + enable = true; + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; + }; }) ]; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 9fa9ee5..d21dda9 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -8,7 +8,6 @@ let ymir tartarus ]; - in { "network-manager.age".publicKeys = machines ++ [osbm]; "ssh-key-private.age".publicKeys = machines ++ [osbm]; From 9f8515b23cb042b29c4f9726ecc3837999e95c76 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 02:16:00 +0300 Subject: [PATCH 0326/1768] disable pochita for now --- flake.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 02d5acb..d88776d 100644 --- a/flake.nix +++ b/flake.nix @@ -95,16 +95,16 @@ } ]; }; - pochita = nixpkgs.lib.nixosSystem rec { - system = "aarch64-linux"; - modules = [ - ./hosts/pochita/configuration.nix - agenix.nixosModules.default - raspberry-pi-nix.nixosModules.raspberry-pi - nixos-hardware.nixosModules.raspberry-pi-5 - vscode-server.nixosModules.default - ]; - }; + # pochita = nixpkgs.lib.nixosSystem rec { + # system = "aarch64-linux"; + # modules = [ + # ./hosts/pochita/configuration.nix + # agenix.nixosModules.default + # raspberry-pi-nix.nixosModules.raspberry-pi + # nixos-hardware.nixosModules.raspberry-pi-5 + # vscode-server.nixosModules.default + # ]; + # }; }; homeConfigurations = { # doesnt work because my different systems have different stateVersions From 28dc20aa36fcf28361465b408f466427d3deceb5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 14:15:30 +0300 Subject: [PATCH 0327/1768] try this for now --- modules/home.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/home.nix b/modules/home.nix index 24fbc63..44442fe 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -24,22 +24,30 @@ hashKnownHosts = true; compression = true; + + matchBlocks = { "tartarus" = { hostname = "192.168.0.4"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - # extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). - # "RemoteCommand" = "fish"; - # }; + setEnv = { + "TERM" = "xterm-256color"; + }; + extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). + "RemoteCommand" = "fish"; + }; }; "ymir" = { hostname = "192.168.0.2"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - # extraOptions = { # TODO fix the damn starship error - # "RemoteCommand" = "fish"; - # }; + setEnv = { + "TERM" = "xterm-256color"; + }; + extraOptions = { # TODO fix the damn starship error + "RemoteCommand" = "fish"; + }; }; }; }; From 75de8d117525f7320bef794aa378dcf151040e65 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 14:23:43 +0300 Subject: [PATCH 0328/1768] tackle this later --- modules/home.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/home.nix b/modules/home.nix index 44442fe..d2f5622 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -31,23 +31,23 @@ hostname = "192.168.0.4"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - setEnv = { - "TERM" = "xterm-256color"; - }; - extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). - "RemoteCommand" = "fish"; - }; + # setEnv = { + # "TERM" = "xterm-256color"; + # }; + # extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). + # "RemoteCommand" = "fish"; + # }; }; "ymir" = { hostname = "192.168.0.2"; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - setEnv = { - "TERM" = "xterm-256color"; - }; - extraOptions = { # TODO fix the damn starship error - "RemoteCommand" = "fish"; - }; + # setEnv = { + # "TERM" = "xterm-256color"; + # }; + # extraOptions = { # TODO fix the damn starship error + # "RemoteCommand" = "fish"; + # }; }; }; }; From b6aca6a61541af4f4b582435b5fc3955a5194e45 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 23:57:26 +0300 Subject: [PATCH 0329/1768] add pochita initial sh image --- hosts/pochita-sd/configuration.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 hosts/pochita-sd/configuration.nix diff --git a/hosts/pochita-sd/configuration.nix b/hosts/pochita-sd/configuration.nix new file mode 100644 index 0000000..bf99a7b --- /dev/null +++ b/hosts/pochita-sd/configuration.nix @@ -0,0 +1,38 @@ +{ pkgs, lib, ... }: { + # bcm2711 for rpi 3, 3+, 4, zero 2 w + # bcm2712 for rpi 5 + # See the docs at: + # https://www.raspberrypi.com/documentation/computers/linux_kernel.html#native-build-configuration + raspberry-pi-nix.board = "bcm2712"; + time.timeZone = "America/Chicago"; + users.users.root = { + initialPassword = "root"; + }; + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.osbm = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + initialPassword = "changeme"; + }; + + networking = { + hostName = "pochita"; + }; + environment.systemPackages = with pkgs; [ + neovim + git-lfs + git + wakeonlan + htop + unzip + zip + wget + ]; + + nix.settings.experimental-features = ["nix-command" "flakes"]; + + services.openssh = { + enable = true; + }; + system.stateVersion = "25.05"; + } From e49f5d5455e047b3f58aaa181c06b30cef8ec199 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 23:58:39 +0300 Subject: [PATCH 0330/1768] damn rpi --- flake.nix | 34 +++++++--- hosts/pochita/configuration.nix | 117 ++++---------------------------- 2 files changed, 36 insertions(+), 115 deletions(-) diff --git a/flake.nix b/flake.nix index d88776d..42b6ae3 100644 --- a/flake.nix +++ b/flake.nix @@ -95,16 +95,30 @@ } ]; }; - # pochita = nixpkgs.lib.nixosSystem rec { - # system = "aarch64-linux"; - # modules = [ - # ./hosts/pochita/configuration.nix - # agenix.nixosModules.default - # raspberry-pi-nix.nixosModules.raspberry-pi - # nixos-hardware.nixosModules.raspberry-pi-5 - # vscode-server.nixosModules.default - # ]; - # }; + pochita = nixpkgs.lib.nixosSystem rec { + system = "aarch64-linux"; + modules = [ + ./hosts/pochita/configuration.nix + raspberry-pi-nix.nixosModules.raspberry-pi + vscode-server.nixosModules.default + agenix.nixosModules.default + home-manager.nixosModules.home-manager + { + environment.systemPackages = [ + agenix.packages.${system}.default + osbm-nvim.packages.${system}.default + ]; + } + ]; + }; + pochita-sd = nixpkgs.lib.nixosSystem rec { + system = "aarch64-linux"; + modules = [ + ./hosts/pochita-sd/configuration.nix + raspberry-pi-nix.nixosModules.raspberry-pi + raspberry-pi-nix.nixosModules.sd-image + ]; + }; }; homeConfigurations = { # doesnt work because my different systems have different stateVersions diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index ed588c1..4bd79be 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -16,26 +16,6 @@ in { blockYoutube = false; blockTwitter = false; - # Comment this line if you want a recent kernel, but - # if it's not in the community cache the builder will compile it - # boot.kernelPackages = lib.mkForce pkgs.linuxKernel.packages.linux_rpi4; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = lib.mkForce "fr"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - security.sudo.wheelNeedsPassword = false; - - # # Initial network configuration - # networking = { - # hostName = "pixos"; - # useDHCP = false; - # interfaces = { - # wlan0.useDHCP = false; - # eth0.useDHCP = true; - # }; - # }; networking.networkmanager.ensureProfiles = { environmentFiles = [ config.age.secrets.nm-secrets.path @@ -103,91 +83,6 @@ in { # keep-derivations = true; # }; - # The board and wanted kernel version - raspberry-pi-nix = { - board = "bcm2712"; - #kernel-version = "v6_10_12"; - }; - - # PI Hardware configuration - hardware = { - bluetooth.enable = true; - raspberry-pi = { - config = { - all = { - base-dt-params = { - BOOT_UART = { - enable = false; - value = 1; - }; - uart_2ndstage = { - enable = false; - value = 1; - }; - audio = { - enable = true; - value = "off"; - }; - sd_poll_once = { - enable = true; - }; - - # NVME disk access - #pciex1 = { - # enable = true; - #}; - #pciex1_gen = { - # enable = true; - # value = 3; - #}; - #nvme = { - # enable = true; - #}; - }; - dt-overlays = { - vc4-kms-v3d-pi5 = { - enable = true; - params = {}; - }; - }; - options = { - hdmi_blanking = { - enable = true; - value = 1; - }; - disable_overscan = { - enable = true; - value = 1; - }; - gpu_mem_256 = { - enable = true; - value = 76; - }; - gpu_mem_512 = { - enable = true; - value = 76; - }; - gpu_mem_1024 = { - enable = true; - value = 76; - }; - disable_splash = { - enable = true; - value = 1; - }; - temp_limit = { - enable = true; - value = 75; - }; - initial_turbo = { - enable = true; - value = 20; - }; - }; - }; - }; - }; - }; # You can put another features here, for example: #security.rtkit.enable = true; @@ -197,7 +92,19 @@ in { # alsa.support32Bit = true; # pulse.enable = true; #}; + security.sudo = { + enable = true; + wheelNeedsPassword = false; + }; + + services.getty.autologinUser = "osbm"; + networking.hostname = "pochita"; + # The board and wanted kernel version + raspberry-pi-nix = { + board = "bcm2712"; + #kernel-version = "v6_10_12"; + }; # DO NOT TOUCH THIS system.stateVersion = stateVersion; From d81c48e5787bbf48a050f50acefa0105bf434097 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 23:58:52 +0300 Subject: [PATCH 0331/1768] remove comment --- modules/common-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 232379a..bd7cefe 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -19,8 +19,6 @@ unzip tlrc wakeonlan - # neovim - btop pciutils nodePackages.npm From 9744b8891630103aa2a2b09645ba0e8a579e969a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Jan 2025 23:59:08 +0300 Subject: [PATCH 0332/1768] no need to declare this --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index a99dc44..3219568 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -18,7 +18,7 @@ options = "--delete-older-than 30d"; }; - nix.nixPath = ["nixpkgs=${pkgs.path}"]; + # nix.nixPath = ["nixpkgs=${pkgs.path}"]; # disable the database error TODO add nix-index search programs.command-not-found.enable = false; From 6800ca5557d0a890cf62bb412769190e3154ca1f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 00:04:56 +0300 Subject: [PATCH 0333/1768] nix is not happy to include pochita what a piece of shit racist elitist build system that is historycally systematically keeps refusing to evaluate innocent nixos configurations. dual vector foil dark forest strike is upon us. we should not reveal our location to the cosmos. civilizations die every day. --- flake.nix | 32 ++++++++++++++++---------------- hosts/pochita/configuration.nix | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 42b6ae3..0aa2c56 100644 --- a/flake.nix +++ b/flake.nix @@ -95,22 +95,22 @@ } ]; }; - pochita = nixpkgs.lib.nixosSystem rec { - system = "aarch64-linux"; - modules = [ - ./hosts/pochita/configuration.nix - raspberry-pi-nix.nixosModules.raspberry-pi - vscode-server.nixosModules.default - agenix.nixosModules.default - home-manager.nixosModules.home-manager - { - environment.systemPackages = [ - agenix.packages.${system}.default - osbm-nvim.packages.${system}.default - ]; - } - ]; - }; + # pochita = nixpkgs.lib.nixosSystem rec { + # system = "aarch64-linux"; + # modules = [ + # ./hosts/pochita/configuration.nix + # raspberry-pi-nix.nixosModules.raspberry-pi + # vscode-server.nixosModules.default + # agenix.nixosModules.default + # home-manager.nixosModules.home-manager + # { + # environment.systemPackages = [ + # agenix.packages.${system}.default + # osbm-nvim.packages.${system}.default + # ]; + # } + # ]; + # }; pochita-sd = nixpkgs.lib.nixosSystem rec { system = "aarch64-linux"; modules = [ diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 4bd79be..b038010 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -99,7 +99,7 @@ in { services.getty.autologinUser = "osbm"; - networking.hostname = "pochita"; + # networking.hostname = "pochita"; # The board and wanted kernel version raspberry-pi-nix = { board = "bcm2712"; From 8d54b13aeb8141f3ffd57aefb36690414d6f68e1 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 13:04:47 +0300 Subject: [PATCH 0334/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4a19f6f..b8437c3 100644 --- a/flake.lock +++ b/flake.lock @@ -394,11 +394,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { From bf1721917fc22347508f4dfa73cf16d1a9829036 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 14:33:07 +0300 Subject: [PATCH 0335/1768] add my user to sd image --- hosts/pochita-sd/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/pochita-sd/configuration.nix b/hosts/pochita-sd/configuration.nix index bf99a7b..48e04b2 100644 --- a/hosts/pochita-sd/configuration.nix +++ b/hosts/pochita-sd/configuration.nix @@ -31,6 +31,9 @@ nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.trusted-users = ["root" "osbm"]; + + services.openssh = { enable = true; }; From a1897e396b2177dcca7f7a208ef9959567112ac4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 14:33:39 +0300 Subject: [PATCH 0336/1768] there is ethernet connection lets leave this out for now --- hosts/pochita/configuration.nix | 50 --------------------------------- 1 file changed, 50 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index b038010..7c68ed1 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -16,56 +16,6 @@ in { blockYoutube = false; blockTwitter = false; - networking.networkmanager.ensureProfiles = { - environmentFiles = [ - config.age.secrets.nm-secrets.path - ]; - - profiles = { - House_Bayram = { - connection = { - id = "House_Bayram"; - type = "wifi"; - }; - ipv4 = { - method = "auto"; - }; - ipv6 = { - addr-gen-mode = "stable-privacy"; - method = "auto"; - }; - wifi = { - mode = "infrastructure"; - ssid = "House_Bayram"; - }; - wifi-security = { - key-mgmt = "wpa-psk"; - psk = "$HOME_WIFI"; - }; - }; - it_hurts_when_IP = { - connection = { - id = "it_hurts_when_IP"; - type = "ethernet"; - }; - ipv4 = { - method = "auto"; - }; - ipv6 = { - addr-gen-mode = "stable-privacy"; - method = "auto"; - }; - wifi = { - mode = "infrastructure"; - ssid = "it_hurts_when_IP"; - }; - wifi-security = { - key-mgmt = "wpa-psk"; - psk = "$HOME_WIFI"; - }; - }; - }; - }; # # Some programs environment.systemPackages = with pkgs; [ From f778118fe5059ef1bd830dfb943925d7c62a2e7d Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 14:38:50 +0300 Subject: [PATCH 0337/1768] secrets add pochita and rekey --- secrets/network-manager.age | 18 +++++++++++------- secrets/secrets.nix | 2 ++ secrets/ssh-key-private.age | Bin 721 -> 941 bytes secrets/ssh-key-public.age | Bin 403 -> 623 bytes 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/secrets/network-manager.age b/secrets/network-manager.age index ca8c3f3..8aab756 100644 --- a/secrets/network-manager.age +++ b/secrets/network-manager.age @@ -1,8 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 kHqLyg zm3tVSNUKnNIT/vSGBf8kG2E86swC+6AkU//FkJxayc -v0VwkFG0ILrcUMg5d32a/PTS1fcGFtKM/ykF0SRdtv8 --> ssh-ed25519 a9zBzw REq2BogyBTL9BTsiyMf6+Qr3nl7YeOMAi8xcljzVGDI -OdVlIN6wD7oHEBiej+DF3mY7n0PLVGjFdazCuPIbQX0 ---- b3RQD0vvnCCDVLRRHPdY73sKeogzp+r9X0kn65H7clQ -wCC3殢$F؈=8Ye-lBǧ -ne2{$8KocbM0HWrwi#~ \ No newline at end of file +-> ssh-ed25519 kHqLyg otKPDfmng7YFgqURdnof7crUCRfQq+Ce1lAuVPoXnQY +xUSjdMFZT0znIqnHknNem6McaGVzNXyHDv2WHmm7PXI +-> ssh-ed25519 a9zBzw cUl75neFJqwHxWh4nRtnJk9n44LfN9jCzBNZVS6utTg +xHpE0yG4DNOZDNLZvidvoDMJr787WEJTpXB1U+wVqvE +-> ssh-ed25519 lB8z1g 1CybJoKwJbJDDjUm5aLsqdvB4kZc2o1ddzRWtz8xcG0 +o7yHqvsom8nQRWoI1XvHYWry3JFqPjlD/YPfS3qqqtg +-> ssh-ed25519 Ws1uag 29w3WFgtBhZ6fCeg7S9UNgk3b1leDAVGWkvwhLyInno +0GwW3A2LRfH4J6FS/9vIuxFhtFoSPFJs7/KHmNI7cFQ +--- fgNFzm+MbLZldf+rmmXSqouF2MnTNfA/+UXvv5MuUus +^N9UV5EǏr + y˱֟÷ܥ63Q ֘;QDl({Eڒ]kIDѸ)V#p \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index d21dda9..61d3569 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,12 +1,14 @@ let ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxc1ycxtzO2u4bHas71pi5CpR8Zzcj6GXjx1lLWMOHq"; tartarus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxbIyQnQFA1RFQKH4eHHWcT7Z0tCumerCsRMjlHgSPd"; + pochita = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICZIeS3r55uBJS1sXyVNlGsVY1wxqgy0lsoFBQo4ZD/F"; osbm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"; machines = [ ymir tartarus + pochita ]; in { "network-manager.age".publicKeys = machines ++ [osbm]; diff --git a/secrets/ssh-key-private.age b/secrets/ssh-key-private.age index 04e6d70b4b7eb30bb37f2ac010e3de34062d465c..98c18a8532618703a764997057bf3d7eda117e80 100644 GIT binary patch delta 911 zcmcb}x|V%{PQ81sXGuy?QDI<^Nr`7(k%eW5o2O-dl&51sNJ(WziiN(LQDjJ2u6JQo zF_(E{ZlZ6#XJ|-7L_u+gkz=-Vj+=gjS)QxAi?fkak#AsjxJ5~&rIUWLE0?aFLUD11 zZfc5=si~o*LZW4rQ&qWwc5XpVzL%$yVU$^ht9C$eM18SIK(R@>S4C;DrE5fJl)iq1 zS&E-gl3|1=S5IAo$v%li`eBCk#_67^sYU^g zzFa{SA)fx0evw%P0Y16mk^Yrt`lV_9js}ronYmtOQSSQ1nc6|Qt{GLHCg|3M7aNu) zrYn>Mo9JgoWg8SE`$r}j`&+nYg=Kr|7nm31n`&F+xI}qm`B_91C*?Y4mUB7g`uZoE z7}SS*7Ngp<(nmPx2>t`AS zdAStjCkBO-x+gp5X89T98fs@5`T1q$<{B55_-O}4dFOLAE!TW_qF6~cQT$kc(?2EM z{z%#T0&_DH7m=k1)I zpp|o6q}~{%hsQXL}3+-#o}N-O(Xxd}wR@dB(N{b`QeuOl6teul!i7Y3Ty# zITk*%&Z_-ccWH_S_vgir1!r7|Sy=e|O0wtwKDYG57a5wWZ|lz}PUSK7`Lm2q^1;&g z4W_3a#%R1<+NG_#PHf>!CEx4efBtC}FNl9`B#~5PzIShW$dqRic@bM@8jAHEo+5vW zCGnYET<5W;@9ZB~9ufR=BsKYbevx&8PJN|UVR1o7j(@swaF%{hYI#|4vAKtvzgLyFi)%)KNtBOQmSSH5>{fPa9aX<%4odU8r~Wp21pUQ~F1Z&glUzJFw8xnYH`X>v%SrB{I` zm#(g^f`wsfWkG0uabTL4bCGeXercphaIs^gaiB$_eo&;lPgPDtM4q8A(PYZq8(zskLTvYP4KX=@xB??;AJx-9G;-ql|l-Yct!S?k)wlv+lp;r#!CT*p?>n z(ASnn;VXyququ352qq|9ax#3)^QGJfr@Y|6cgk z^!MsYZ{ufgriATy9{Ocd{hvLyjX`Cv-C5Fa%}6^WtMWyE$#a?KTfJxYZ+)BRA8*|J zb*r$lE~_-pyQavL(?0xR8~c|m`cb!$GohiRbi>T$y^4*j)_=5bm5XmRynnA?!^HVb zI$oScvH9m-e`{M@6&k;H-n`PEe}pX`>NQF@6}z3Axx89d$(n0s-)+U*^sid4?bAzp s8Nzh7OqrFS&m-8g^0napU7YbRYlXO!mcDv(c;e){_174@T2EdC0J|_Rb^rhX diff --git a/secrets/ssh-key-public.age b/secrets/ssh-key-public.age index 05ffd850db207a4263ee3c77d3c0c3527b74f15f..d12eb84ea0f7cd280ffae61e4847b6a3b98fd3ac 100644 GIT binary patch delta 590 zcmbQt{GMfkPJL>Uwo^{AhkJ;ZqlHs?xM7HQj*CgKXL+)du}4~!zjInjm|I$yXGm6F zK39%@d7_bW}I+w1ULUD11 zZfc5=si~o*LZW4rQ&qV_R;0UGgk_RpMrc}oM5ueBZ+(_qlxJRKxKmL^m7!&XagKAU zyRU(NNL7XjS3#K0lC?}l}V0O z$y{X>VMf|P#c8RLZf4=$75)K%5m{#G8O}zI`kuytX_;PLjzNX~J{~5n$>`RF7aNu) zrYpEcWE&-W2PZ~_7MKPGmKJ)rr&)MLnwR?~dncI$2Kc%eTY9GW7FH%@<#TCA6gq|G zTGp3_7$s#T`GlF37Q2Ug<)(xtm8AIO8JUK;XCxN}TV&=I>F0Cl>gp=wSo)`=R(Lu2 zIHwdl1!((678GV#7@FpI7`j@fSQb}RxH)Gzd3qP-m055#AL*N+$l1uaxb&pj4vA8a z{oG&foLAvFtf1qwu4-=S-vjYUYvX2x7tKEE-gKZ=BzMP#Fu~3n+ZTR6cI3eVz4HWnYXcbZkc74etBt1p+QcbTWW5Rr(bZGCzr0BLUD11 zZfc5=si~o*LZW4rQ&qV_Xh2YDq+xDyrMHV~MWBy?QN4##mam_Yg+ZpdhqH%qL1iA6=SS3yybg{zmBafDZ8luJc$VP;mUyOWP!MPW#8Nv>h3g<(N5 zm#(g^f=5bGX0~atqfdlqSVpj+kFleNrIWFbnXgfKd8x65wp&SBK}LCDmZM)W*Se<# zN2LO%)?~)N^B4Ibpf%x@R>Q@ef%6x~*Jx@_nN^`E%52W(-x<)=nD467`ih}+-<%!q ztsXC*9e#Vh^fR|5^B)*VnqAJkeZKa`eBSd$KMv0id7Rp(;=^BFB>7xD`gr^NQ>h(F R4^$FPW%%wn6J2y?9sop#ic|mq From 0b590694a7f998ea0b44eb1c1d4fbdd6d89fc8f8 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 15:27:09 +0300 Subject: [PATCH 0338/1768] pochita --- flake.nix | 36 ++++++++++++---------- hosts/pochita/configuration.nix | 34 ++++++++------------- hosts/pochita/hardware-configuration.nix | 38 ++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 38 deletions(-) create mode 100644 hosts/pochita/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 0aa2c56..8028656 100644 --- a/flake.nix +++ b/flake.nix @@ -95,22 +95,26 @@ } ]; }; - # pochita = nixpkgs.lib.nixosSystem rec { - # system = "aarch64-linux"; - # modules = [ - # ./hosts/pochita/configuration.nix - # raspberry-pi-nix.nixosModules.raspberry-pi - # vscode-server.nixosModules.default - # agenix.nixosModules.default - # home-manager.nixosModules.home-manager - # { - # environment.systemPackages = [ - # agenix.packages.${system}.default - # osbm-nvim.packages.${system}.default - # ]; - # } - # ]; - # }; + pochita = nixpkgs.lib.nixosSystem rec { + system = "aarch64-linux"; + modules = [ + ./hosts/pochita/configuration.nix + raspberry-pi-nix.nixosModules.raspberry-pi + nixos-hardware.nixosModules.raspberry-pi-5 + vscode-server.nixosModules.default + agenix.nixosModules.default + home-manager.nixosModules.home-manager + { + environment.systemPackages = [ + agenix.packages.${system}.default + osbm-nvim.packages.${system}.default + ]; + } + ]; + specialArgs = { + inherit system-label; + }; + }; pochita-sd = nixpkgs.lib.nixosSystem rec { system = "aarch64-linux"; modules = [ diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 7c68ed1..461af98 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -3,11 +3,13 @@ config, pkgs, lib, + system-label, ... }: let stateVersion = "25.05"; in { imports = [ + ./hardware-configuration.nix ../../modules ]; @@ -16,46 +18,34 @@ in { blockYoutube = false; blockTwitter = false; + # networking.hostname = "pochita"; # why setting hostname gives me an error? + + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.osbm = import ../../modules/home.nix { + inherit config pkgs stateVersion; + }; # # Some programs environment.systemPackages = with pkgs; [ - # vim - # wget - # git - # htop + ]; - # Experimental features must be activated - # nix.settings = { - # trusted-users = [ "@wheel" ]; - # experimental-features = [ "nix-command" "flakes" ]; - # keep-outputs = true; - # keep-derivations = true; - # }; - - # You can put another features here, for example: - #security.rtkit.enable = true; - #services.pipewire = { - # enable = true; - # alsa.enable = true; - # alsa.support32Bit = true; - # pulse.enable = true; - #}; security.sudo = { enable = true; wheelNeedsPassword = false; }; - services.getty.autologinUser = "osbm"; - # networking.hostname = "pochita"; + # The board and wanted kernel version raspberry-pi-nix = { board = "bcm2712"; #kernel-version = "v6_10_12"; }; + system.nixos.label = system-label; # DO NOT TOUCH THIS system.stateVersion = stateVersion; } diff --git a/hosts/pochita/hardware-configuration.nix b/hosts/pochita/hardware-configuration.nix new file mode 100644 index 0000000..195f999 --- /dev/null +++ b/hosts/pochita/hardware-configuration.nix @@ -0,0 +1,38 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; + + fileSystems."/boot/firmware" = + { device = "/dev/disk/by-uuid/2178-694E"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.end0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; +} \ No newline at end of file From e6fb13e4ceb248dfd671b892a1c79c4f6af920a8 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 15:27:25 +0300 Subject: [PATCH 0339/1768] redundant option --- hosts/ymir/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 591710d..cc427b7 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -119,8 +119,6 @@ in { }; }; - nixpkgs.config.allowUnfree = true; - environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit From a6681472ab878499ba0e7700dac35080bc1dfdba Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 15:53:02 +0300 Subject: [PATCH 0340/1768] make fonts an option --- modules/fonts.nix | 51 ++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index c865f4e..feed1dc 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -4,23 +4,38 @@ config, ... }: { - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk-sans - noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - nerd-fonts.fira-code - nerd-fonts.ubuntu - proggyfonts - source-sans - source-sans-pro - source-serif-pro - font-awesome - font-awesome_5 - roboto + + options = { + enableFonts = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable my favorite fonts"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.enableFonts { + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + nerd-fonts.fira-code + nerd-fonts.ubuntu + proggyfonts + source-sans + source-sans-pro + source-serif-pro + font-awesome + font-awesome_5 + roboto + ]; + }) ]; + + } From 139804b63bef94578fe5d09dc612f35f10cf6df0 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 15:53:20 +0300 Subject: [PATCH 0341/1768] we also dont need some of these --- hosts/pochita/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 461af98..d8b094d 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -14,10 +14,14 @@ in { ]; enableKDE = false; + enableFonts = false; blockYoutube = false; blockTwitter = false; + i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method + programs.firefox.enable = lib.mkForce false; # no need for firefox + # networking.hostname = "pochita"; # why setting hostname gives me an error? home-manager.useGlobalPkgs = true; From 35a7da242bf1ee0885ee97e82e48dc79bb82feb3 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 19:01:35 +0300 Subject: [PATCH 0342/1768] set hostname --- hosts/pochita/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index d8b094d..49501e8 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -22,7 +22,8 @@ in { i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method programs.firefox.enable = lib.mkForce false; # no need for firefox - # networking.hostname = "pochita"; # why setting hostname gives me an error? + networking.hostName = "pochita"; + # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; From a71674f8f409d296ebae0757328dceab1da1f071 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 19:26:06 +0300 Subject: [PATCH 0343/1768] add pochita to the list --- modules/home.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/home.nix b/modules/home.nix index d2f5622..ad2c1eb 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -49,6 +49,11 @@ # "RemoteCommand" = "fish"; # }; }; + "pochita" = { + hostname = "192.168.0.9"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + }; }; }; # This value determines the Home Manager release that your From b78deec49f973f50219737a4c24066174b6c14c4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 19:54:37 +0300 Subject: [PATCH 0344/1768] mark the things i done --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a95f9f0..981ed31 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,11 @@ The nix configuration of mine. My intentions are just to maintain my configurati Here i have 4 machines. - Laptop **tartarus** (faulty hardware, nvidia gpu doesnt work) - Desktop **ymir** (beast, my most prized possesion as of now) +- Raspberry Pi 5 **pochita** (a server that i experiment with) +- Raspberry Pi 5 SD image **pochita-sd** (produces an sd image that could be used to flash the sd card of a rpi-5) I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) -- Raspberry Pi 5 **pochita** (a server that i experiment with) (not setup yet) - Android phone (termux) **android** (not setup yet) # To-do list @@ -22,10 +23,10 @@ I didnt get these setup yet. - [ ] build my qmk keyboard with nix - agenix - [ ] add my gpg keys - - [ ] add ssh keys so that machines can connect to each other -- [ ] module system with options + - [x] add ssh keys so that machines can connect to each other +- [x] module system with options - [ ] see which derivations will be built and which will be downloaded from cache or which is already present in the nix store. - [ ] see which python packages are giving build errors. -- [ ] home-manager setup +- [x] home-manager setup - [ ] make a development environment nix repository From 01068357adebeca0de4005c6e93c54f0039f2321 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 19:57:11 +0300 Subject: [PATCH 0345/1768] leave out some lines --- hosts/pochita/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 49501e8..bf7e788 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -31,12 +31,9 @@ in { inherit config pkgs stateVersion; }; - # # Some programs environment.systemPackages = with pkgs; [ - ]; - security.sudo = { enable = true; wheelNeedsPassword = false; From fe7dc6088dbc77538820c0541a59ea52f8d93abd Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:24:19 +0300 Subject: [PATCH 0346/1768] in isabel we trust --- flake.nix | 5 ----- hosts/pochita-sd/configuration.nix | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 8028656..96d6f74 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,6 @@ system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; in { tartarus = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default @@ -65,7 +64,6 @@ }; }; ymir = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default @@ -83,7 +81,6 @@ }; }; harmonica = nixpkgs.lib.nixosSystem rec { - system = "aarch64-linux"; modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" agenix.nixosModules.default @@ -96,7 +93,6 @@ ]; }; pochita = nixpkgs.lib.nixosSystem rec { - system = "aarch64-linux"; modules = [ ./hosts/pochita/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi @@ -116,7 +112,6 @@ }; }; pochita-sd = nixpkgs.lib.nixosSystem rec { - system = "aarch64-linux"; modules = [ ./hosts/pochita-sd/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi diff --git a/hosts/pochita-sd/configuration.nix b/hosts/pochita-sd/configuration.nix index 48e04b2..8c6ddeb 100644 --- a/hosts/pochita-sd/configuration.nix +++ b/hosts/pochita-sd/configuration.nix @@ -33,6 +33,7 @@ nix.settings.trusted-users = ["root" "osbm"]; + nixpkgs.hostPlatform = "aarch64-linux"; services.openssh = { enable = true; From ac28b07ba78a626cf60f3716eaf38041400decff Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:25:18 +0300 Subject: [PATCH 0347/1768] reformat --- flake.nix | 18 +++--- hosts/pochita-sd/configuration.nix | 78 +++++++++++++----------- hosts/pochita/configuration.nix | 2 +- hosts/pochita/hardware-configuration.nix | 44 +++++++------ modules/fonts.nix | 3 - modules/home.nix | 2 - 6 files changed, 74 insertions(+), 73 deletions(-) diff --git a/flake.nix b/flake.nix index 96d6f74..c967c5b 100644 --- a/flake.nix +++ b/flake.nix @@ -27,9 +27,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-hardware = { - url = "github:NixOS/nixos-hardware/master"; - }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; outputs = { @@ -54,8 +52,8 @@ home-manager.nixosModules.home-manager { environment.systemPackages = [ - agenix.packages.${system}.default - osbm-nvim.packages.${system}.default + agenix.packages.x86_64-linux.default + osbm-nvim.packages.x86_64-linux.default ]; } ]; @@ -71,8 +69,8 @@ home-manager.nixosModules.home-manager { environment.systemPackages = [ - agenix.packages.${system}.default - osbm-nvim.packages.${system}.default + agenix.packages.x86_64-linux.default + osbm-nvim.packages.x86_64-linux.default ]; } ]; @@ -87,7 +85,7 @@ ./hosts/harmonica/configuration.nix { environment.systemPackages = [ - agenix.packages.${system}.default + agenix.packages.aarch64-linux.default ]; } ]; @@ -102,8 +100,8 @@ home-manager.nixosModules.home-manager { environment.systemPackages = [ - agenix.packages.${system}.default - osbm-nvim.packages.${system}.default + agenix.packages.aarch64-linux.default + osbm-nvim.packages.aarch64-linux.default ]; } ]; diff --git a/hosts/pochita-sd/configuration.nix b/hosts/pochita-sd/configuration.nix index 8c6ddeb..f09ae4b 100644 --- a/hosts/pochita-sd/configuration.nix +++ b/hosts/pochita-sd/configuration.nix @@ -1,42 +1,46 @@ -{ pkgs, lib, ... }: { - # bcm2711 for rpi 3, 3+, 4, zero 2 w - # bcm2712 for rpi 5 - # See the docs at: - # https://www.raspberrypi.com/documentation/computers/linux_kernel.html#native-build-configuration - raspberry-pi-nix.board = "bcm2712"; - time.timeZone = "America/Chicago"; - users.users.root = { - initialPassword = "root"; - }; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.osbm = { - isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - initialPassword = "changeme"; - }; +{ + pkgs, + lib, + ... +}: { + # bcm2711 for rpi 3, 3+, 4, zero 2 w + # bcm2712 for rpi 5 + # See the docs at: + # https://www.raspberrypi.com/documentation/computers/linux_kernel.html#native-build-configuration + raspberry-pi-nix.board = "bcm2712"; + time.timeZone = "America/Chicago"; + users.users.root = { + initialPassword = "root"; + }; + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.osbm = { + isNormalUser = true; + extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. + initialPassword = "changeme"; + }; - networking = { - hostName = "pochita"; - }; - environment.systemPackages = with pkgs; [ - neovim - git-lfs - git - wakeonlan - htop - unzip - zip - wget - ]; + networking = { + hostName = "pochita"; + }; + environment.systemPackages = with pkgs; [ + neovim + git-lfs + git + wakeonlan + htop + unzip + zip + wget + ]; - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.experimental-features = ["nix-command" "flakes"]; - nix.settings.trusted-users = ["root" "osbm"]; + nix.settings.trusted-users = ["root" "osbm"]; - nixpkgs.hostPlatform = "aarch64-linux"; + nixpkgs.hostPlatform = "aarch64-linux"; - services.openssh = { - enable = true; - }; - system.stateVersion = "25.05"; - } + services.openssh = { + enable = true; + }; + system.stateVersion = "25.05"; +} diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index bf7e788..1741424 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -41,7 +41,7 @@ in { services.getty.autologinUser = "osbm"; - # The board and wanted kernel version + # The board and wanted kernel version raspberry-pi-nix = { board = "bcm2712"; #kernel-version = "v6_10_12"; diff --git a/hosts/pochita/hardware-configuration.nix b/hosts/pochita/hardware-configuration.nix index 195f999..073bec0 100644 --- a/hosts/pochita/hardware-configuration.nix +++ b/hosts/pochita/hardware-configuration.nix @@ -1,30 +1,34 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = []; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; - fileSystems."/boot/firmware" = - { device = "/dev/disk/by-uuid/2178-694E"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; + fileSystems."/boot/firmware" = { + device = "/dev/disk/by-uuid/2178-694E"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -35,4 +39,4 @@ # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; -} \ No newline at end of file +} diff --git a/modules/fonts.nix b/modules/fonts.nix index feed1dc..a8907b1 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -4,7 +4,6 @@ config, ... }: { - options = { enableFonts = lib.mkOption { type = lib.types.bool; @@ -36,6 +35,4 @@ ]; }) ]; - - } diff --git a/modules/home.nix b/modules/home.nix index ad2c1eb..f49d7f1 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -24,8 +24,6 @@ hashKnownHosts = true; compression = true; - - matchBlocks = { "tartarus" = { hostname = "192.168.0.4"; From 115a768329be364fc8fd6c8b8a12f8eb13c05fa6 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:33:39 +0300 Subject: [PATCH 0348/1768] add sd image builder --- .github/workflows/build-sd-image.yml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/build-sd-image.yml diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml new file mode 100644 index 0000000..ec45caa --- /dev/null +++ b/.github/workflows/build-sd-image.yml @@ -0,0 +1,29 @@ +name: Build SD image for Raspberry Pi 5 + +on: + workflow_dispatch: + +jobs: + build-sd-image: + runs-on: ubuntu-24.04 + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Install Nix + uses: cachix/install-nix-action@v16 + + - name: Build SD image + run: nix build -L '.#nixosConfigurations.pochita-sd.config.system.build.sdImage + + - name: Zip the Resulting SD image + run: | + mkdir -p sd-image + cp -r result/* sd-image + zip -r sd-image.zip sd-image + + - name: Upload SD image + uses: actions/upload-artifact@v2 + with: + name: sd-image + From 47c43291c65852700dc9b95ae51753723f4db8ed Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:33:54 +0300 Subject: [PATCH 0349/1768] also test new machines --- .github/workflows/nix.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 58a6814..f721a1e 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -14,6 +14,9 @@ jobs: target-system: - ymir - tartarus + - pochita + - pochita-sd + - harmonica runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v2 @@ -32,4 +35,3 @@ jobs: - uses: actions/checkout@v2 - uses: cachix/install-nix-action@v16 - run: nix shell nixpkgs#alejandra -c alejandra -c . - From 9fb38ada732469ad71b6107b63af35007d8a60cf Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:38:16 +0300 Subject: [PATCH 0350/1768] update upload articact action --- .github/workflows/build-sd-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index ec45caa..07f8966 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -23,7 +23,7 @@ jobs: zip -r sd-image.zip sd-image - name: Upload SD image - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: sd-image From 7c5ee3637da15276849c736022f3fb41bcf1bbfe Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:39:21 +0300 Subject: [PATCH 0351/1768] hotfix --- .github/workflows/build-sd-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index 07f8966..25cae60 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -14,7 +14,7 @@ jobs: uses: cachix/install-nix-action@v16 - name: Build SD image - run: nix build -L '.#nixosConfigurations.pochita-sd.config.system.build.sdImage + run: nix build -L '.#nixosConfigurations.pochita-sd.config.system.build.sdImage' - name: Zip the Resulting SD image run: | From 1034f9e25948c98526760a6b485983eab4e9884e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:45:10 +0300 Subject: [PATCH 0352/1768] try this --- .github/workflows/build-sd-image.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index 25cae60..f11fbc5 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -8,10 +8,16 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 + + - name: Install QEMU + run: sudo apt-get install qemu-user-static - name: Install Nix - uses: cachix/install-nix-action@v16 + uses: cachix/install-nix-action@v21 + with: + extra_nix_config: | + system = aarch64-linux - name: Build SD image run: nix build -L '.#nixosConfigurations.pochita-sd.config.system.build.sdImage' From 7491f60f2d710e296456cbfba9c16b45f6ebf821 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:51:54 +0300 Subject: [PATCH 0353/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b8437c3..21d53d6 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { From 6089162068d277442c4d4035da69818e4692d268 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 20:52:40 +0300 Subject: [PATCH 0354/1768] update cachix version --- .github/workflows/build-sd-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index f11fbc5..8050303 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -14,7 +14,7 @@ jobs: run: sudo apt-get install qemu-user-static - name: Install Nix - uses: cachix/install-nix-action@v21 + uses: cachix/install-nix-action@v30 with: extra_nix_config: | system = aarch64-linux From db2cdb0047e0990faffefaa5a461d32533608bcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?osman=20-=20=E3=82=AA=E3=82=B9=E3=83=9E=E3=83=B3?= <74963545+osbm@users.noreply.github.com> Date: Wed, 15 Jan 2025 20:54:46 +0300 Subject: [PATCH 0355/1768] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..748ec06 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "github-actions" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "daily" From e3df7e929c60413a2e7798ac324d49b09b2903fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:55:24 +0000 Subject: [PATCH 0356/1768] Bump actions/checkout from 2 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-sd-image.yml | 2 +- .github/workflows/nix.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index 8050303..36ea47a 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install QEMU run: sudo apt-get install qemu-user-static diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index f721a1e..8ff4def 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -19,7 +19,7 @@ jobs: - harmonica runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v16 # TODO: add a binary cache # - uses: cachix/cachix-action@v10 @@ -32,6 +32,6 @@ jobs: check-formatting: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v16 - run: nix shell nixpkgs#alejandra -c alejandra -c . From 63c5339ca7cddcb98aae0567dcff3b9e829fad8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:58:39 +0000 Subject: [PATCH 0357/1768] Bump cachix/install-nix-action from 16 to 30 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 16 to 30. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v16...v30) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/nix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 8ff4def..5679e5d 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v30 # TODO: add a binary cache # - uses: cachix/cachix-action@v10 # with: @@ -33,5 +33,5 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v16 + - uses: cachix/install-nix-action@v30 - run: nix shell nixpkgs#alejandra -c alejandra -c . From f0589db96faf1a93593647a7e054e26cc95c9331 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 15 Jan 2025 21:30:50 +0300 Subject: [PATCH 0358/1768] add how-to to readme --- README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 981ed31..241d5a7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # nixos is life The nix configuration of mine. My intentions are just to maintain my configuration and to contribute to the nix community. -Here i have 4 machines. +Here i have 4 machines and 1 sd card image that i maintain. - Laptop **tartarus** (faulty hardware, nvidia gpu doesnt work) - Desktop **ymir** (beast, my most prized possesion as of now) - Raspberry Pi 5 **pochita** (a server that i experiment with) @@ -11,6 +11,28 @@ I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) - Android phone (termux) **android** (not setup yet) +## How to use raspberry pi 5 + +I have 2 configurations for the raspberry pi 5. One is for the sd card (basically bootstraps the system) and the other is for my customized system itself. + +build the image first (this took about 4 hours on ymir (binfmt for aarch64 needs to be enabled if you are building on x86_64)) +```sh +$ nix build -L '.#nixosConfigurations.pochita-sd.config.system.build.sdImage' +``` + +then to flash the image to the sd card enable zstd +```sh +$ nix-shell -p zstd +``` + +then flash the image to the sd card +```sh +$ zstdcat nixos-sd-image-24.05.20241116.e8c38b7-aarch64-linux.img.zst | dd of=/dev/sda status=progress +``` + +and voila! when you plug the sd card to the raspberry pi 5 it will boot up with the configuration that you have built. And then you can ssh into it and further configure it. + + # To-do list - [ ] iso image generator for nixos From b6fa7de98e8ff840ead96677cfd2bb0270346ded Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Jan 2025 01:36:02 +0300 Subject: [PATCH 0359/1768] add new items to to-do list --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 241d5a7..f6e66cf 100644 --- a/README.md +++ b/README.md @@ -51,4 +51,6 @@ and voila! when you plug the sd card to the raspberry pi 5 it will boot up with - [ ] see which python packages are giving build errors. - [x] home-manager setup - [ ] make a development environment nix repository +- [ ] enable swap on pochita +- [ ] learnis it possible to enable swap with sd-image? From 87028c0cd874521c12110ac22c44654fc4e1d9fe Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Jan 2025 01:50:42 +0300 Subject: [PATCH 0360/1768] no need for recursive keyword --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index c967c5b..48fea12 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ nixosConfigurations = let system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; in { - tartarus = nixpkgs.lib.nixosSystem rec { + tartarus = nixpkgs.lib.nixosSystem { modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default @@ -61,7 +61,7 @@ inherit system-label; }; }; - ymir = nixpkgs.lib.nixosSystem rec { + ymir = nixpkgs.lib.nixosSystem { modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default @@ -78,7 +78,7 @@ inherit system-label; }; }; - harmonica = nixpkgs.lib.nixosSystem rec { + harmonica = nixpkgs.lib.nixosSystem { modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" agenix.nixosModules.default @@ -90,7 +90,7 @@ } ]; }; - pochita = nixpkgs.lib.nixosSystem rec { + pochita = nixpkgs.lib.nixosSystem { modules = [ ./hosts/pochita/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi @@ -109,7 +109,7 @@ inherit system-label; }; }; - pochita-sd = nixpkgs.lib.nixosSystem rec { + pochita-sd = nixpkgs.lib.nixosSystem { modules = [ ./hosts/pochita-sd/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi From d4b92ae5c5d86dde3122a1c48b0e19cc33c37d83 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Jan 2025 18:39:09 +0300 Subject: [PATCH 0361/1768] select theme --- modules/graphical-interface.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 1004480..ceea2e9 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -19,7 +19,10 @@ services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; + services.displayManager.sddm = { + enable = true; + theme = "sugar-dark"; + }; services.desktopManager.plasma6.enable = true; # Enable CUPS to print documents. From 914c540588860cddb18f9eedb89033cb4fcfe3a6 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Jan 2025 18:43:51 +0300 Subject: [PATCH 0362/1768] try adding the new package --- modules/graphical-interface.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index ceea2e9..c9bb7a8 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -29,6 +29,7 @@ services.printing.enable = true; environment.systemPackages = with pkgs; [ + sddm-sugar-dark vscode discord # discord sucks alacritty From a8dd6a941c8f45200ae513f27375edaf077fc74b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Jan 2025 22:28:54 +0300 Subject: [PATCH 0363/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 21d53d6..caf2465 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1736883540, + "narHash": "sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "0dfec9deb275854a56c97c356c40ef72e3a2e632", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { From a7b43ff912359a280f8af2d869a00b9489263b97 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 17 Jan 2025 18:22:35 +0300 Subject: [PATCH 0364/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index caf2465..cddb95e 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1736883540, - "narHash": "sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94=", + "lastModified": 1737120639, + "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0dfec9deb275854a56c97c356c40ef72e3a2e632", + "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", "type": "github" }, "original": { From 312bf62b4751668a85bc63ed3fff670a9f8546ba Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 18 Jan 2025 14:55:06 +0300 Subject: [PATCH 0365/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index cddb95e..4244651 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1737120639, - "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", + "lastModified": 1737188535, + "narHash": "sha256-O2ttwW1/dUc/Y+Rf48Njtr4tZpRJhy8FhafikekIjMY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", + "rev": "1e36429705f9af2d00a517ba46a4f21ef8a8194f", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { From edf77a478de84bee30a99fac46c361bd16556364 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 18 Jan 2025 16:55:20 +0300 Subject: [PATCH 0366/1768] disable firefox alt key menu bar --- modules/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/firefox.nix b/modules/firefox.nix index 2a00c8d..afbe37e 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -97,6 +97,7 @@ in { "browser.newtabpage.activity-stream.system.showSponsored" = false; "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "ui.key.menuAccessKeyFocuses" = false; }; }; } From f3af121fcace621228b6d20cae694a392b1edeb0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Jan 2025 00:56:04 +0300 Subject: [PATCH 0367/1768] enable bluesky --- hosts/ymir/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index cc427b7..f06d4b6 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,8 +14,9 @@ in { ../../modules ]; - blockYoutube = false; + blockYoutube = true; blockTwitter = true; + blockBluesky = false; enableKDE = true; From 68709a3386e3eb3b2f1ef20a4659d52319b38763 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Jan 2025 02:24:36 +0300 Subject: [PATCH 0368/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 4244651..b9490ab 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1737188535, - "narHash": "sha256-O2ttwW1/dUc/Y+Rf48Njtr4tZpRJhy8FhafikekIjMY=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e36429705f9af2d00a517ba46a4f21ef8a8194f", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { From e19500e9db8b3fc69a6111a27dd7fac2497e7e99 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Jan 2025 04:11:12 +0300 Subject: [PATCH 0369/1768] hate, hate, hateeeee --- modules/graphical-interface.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index c9bb7a8..b7457d3 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -25,6 +25,11 @@ }; services.desktopManager.plasma6.enable = true; + environment.plasma6.excludePackages = [ + pkgs.kdePackages.kate + pkgs.kdePackages.konsole + ]; + # Enable CUPS to print documents. services.printing.enable = true; From 093442f3f770073d1a02a4ba0cf27d486fe144f4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Jan 2025 23:16:19 +0300 Subject: [PATCH 0370/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b9490ab..c0c7767 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1737221749, - "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", + "lastModified": 1737299337, + "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=", "owner": "nix-community", "repo": "home-manager", - "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", + "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736978406, - "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", + "lastModified": 1737306472, + "narHash": "sha256-+X9KAryvDsIE7lQ0FdfiD1u33nOVgsgufedqspf77N4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b678606690027913f3434dea3864e712b862dde5", + "rev": "cb3173dc5c746fa95bca1f035a7e4d2b588894ac", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1736701995, - "narHash": "sha256-JVUWc04VebAzVXdaUtStm5pzMuirYSdKkXwY44EDUa8=", + "lastModified": 1737293095, + "narHash": "sha256-3TnrehU2mwEK7iHX+H+1dISUDo2e+ae/O8pFMVyBK7M=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8dc1f974d3582030a427ea7c5d1b6725766cf21e", + "rev": "fdedca413f7f682a6d3f97c61cc5b47afe398765", "type": "github" }, "original": { From fc988fcd47c25773dca5d3ed0b7b52553ed9115f Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Jan 2025 00:06:51 +0300 Subject: [PATCH 0371/1768] add bat: a better cat --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index bd7cefe..82d2a97 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -44,6 +44,7 @@ ripgrep nh comma + bat ]; programs.gnupg.agent = { From a27bbea43bfffde29c055533a48a1256527b1d75 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Jan 2025 03:11:42 +0300 Subject: [PATCH 0372/1768] state every unfree package from now on --- modules/nix-settings.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 3219568..0b539bb 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -5,7 +5,21 @@ ... }: { # Allow unfree packages - nixpkgs.config.allowUnfree = true; # TODO: replace this with allowUnfreePredicate + # nixpkgs.config.allowUnfree = true; # TODO: replace this with allowUnfreePredicate + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "vscode" # TODO: remove this + "discord" # TODO: remove this + "obsidian" + "steam" + "steam-unwrapped" + # nvidia related (i have to) + "nvidia-x11" + "cuda_cudart" + "libcublas" + "cuda_cccl" + "cuda_nvcc" + "nvidia-settings" + ]; # enable nix flakes nix.settings.experimental-features = ["nix-command" "flakes"]; From 222fb3bd42e490fc7cca623b523a736fa2844450 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Jan 2025 19:15:48 +0300 Subject: [PATCH 0373/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c0c7767..da3c60f 100644 --- a/flake.lock +++ b/flake.lock @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737306472, - "narHash": "sha256-+X9KAryvDsIE7lQ0FdfiD1u33nOVgsgufedqspf77N4=", + "lastModified": 1737359802, + "narHash": "sha256-utplyRM6pqnN940gfaLFBb9oUCSzkan86IvmkhsVlN8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cb3173dc5c746fa95bca1f035a7e4d2b588894ac", + "rev": "61c79181e77ef774ab0468b28a24bc2647d498d6", "type": "github" }, "original": { From c5d26eee942d1a760c81aae997ea436b921ac16c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Jan 2025 15:58:02 +0300 Subject: [PATCH 0374/1768] alphabetical order of flake inputs --- flake.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 48fea12..8d8a15e 100644 --- a/flake.nix +++ b/flake.nix @@ -10,24 +10,22 @@ }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - - vscode-server.url = "github:nix-community/nixos-vscode-server"; - vscode-server.inputs.nixpkgs.follows = "nixpkgs"; - agenix.url = "github:ryantm/agenix"; - - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; osbm-nvim.url = "github:osbm/osbm-nvim"; - raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + vscode-server = { + url = "github:nix-community/nixos-vscode-server"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { From 2b5906c3934e58164a7fb1920ba3ee5929f5b369 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Jan 2025 19:35:58 +0300 Subject: [PATCH 0375/1768] formatting --- modules/nix-settings.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 0b539bb..b462893 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -6,20 +6,21 @@ }: { # Allow unfree packages # nixpkgs.config.allowUnfree = true; # TODO: replace this with allowUnfreePredicate - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "vscode" # TODO: remove this - "discord" # TODO: remove this - "obsidian" - "steam" - "steam-unwrapped" - # nvidia related (i have to) - "nvidia-x11" - "cuda_cudart" - "libcublas" - "cuda_cccl" - "cuda_nvcc" - "nvidia-settings" - ]; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "vscode" # TODO: remove this + "discord" # TODO: remove this + "obsidian" + "steam" + "steam-unwrapped" + # nvidia related (i have to) + "nvidia-x11" + "cuda_cudart" + "libcublas" + "cuda_cccl" + "cuda_nvcc" + "nvidia-settings" + ]; # enable nix flakes nix.settings.experimental-features = ["nix-command" "flakes"]; From e8f8a9aeda2f57d1ec34a7612d748b604dbb25b1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Jan 2025 10:19:22 +0300 Subject: [PATCH 0376/1768] update flake.lock --- flake.lock | 188 ++++++++++++++--------------------------------------- flake.nix | 17 ++++- 2 files changed, 65 insertions(+), 140 deletions(-) diff --git a/flake.lock b/flake.lock index da3c60f..a4e39b5 100644 --- a/flake.lock +++ b/flake.lock @@ -3,8 +3,12 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { @@ -46,7 +50,6 @@ "devshell": { "inputs": { "nixpkgs": [ - "osbm-nvim", "nixvim", "nixpkgs" ] @@ -67,12 +70,12 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -82,7 +85,6 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "osbm-nvim", "nixvim", "nixpkgs" ] @@ -140,23 +142,21 @@ "git-hooks": { "inputs": { "flake-compat": [ - "osbm-nvim", "nixvim", "flake-compat" ], "gitignore": "gitignore", "nixpkgs": [ - "osbm-nvim", "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -168,7 +168,6 @@ "gitignore": { "inputs": { "nixpkgs": [ - "osbm-nvim", "nixvim", "git-hooks", "nixpkgs" @@ -191,58 +190,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1737575492, + "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737299337, - "narHash": "sha256-0NBrY2A7buujKmeCbieopOMSbLxTu8TFcTLqAbTnQDw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f8ef4541bb8a54a8b52f19b52912119e689529b3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "osbm-nvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", + "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", "type": "github" }, "original": { @@ -254,13 +210,11 @@ "ixx": { "inputs": { "flake-utils": [ - "osbm-nvim", "nixvim", "nuschtosSearch", "flake-utils" ], "nixpkgs": [ - "osbm-nvim", "nixvim", "nuschtosSearch", "nixpkgs" @@ -318,17 +272,16 @@ "nix-darwin": { "inputs": { "nixpkgs": [ - "osbm-nvim", "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1736370755, - "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -362,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737359802, - "narHash": "sha256-utplyRM6pqnN940gfaLFBb9oUCSzkan86IvmkhsVlN8=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61c79181e77ef774ab0468b28a24bc2647d498d6", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -378,59 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1736523798, - "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "130595eba61081acde9001f43de3248d8888ac4a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -446,18 +351,22 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": [ + "home-manager" + ], "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736598781, - "narHash": "sha256-Y0o9ahm6Kk0DumTo80/vKspkHOkbtFgKCNiICyRjhMs=", + "lastModified": 1737578990, + "narHash": "sha256-49M9B1nni54cuOH6qPM90U106VSWhAVqpy6f3sz0q4Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "2fc2132a78753fc3d7ec732044eff7ad69530055", + "rev": "a2a4befdaf825d36a50e2fda4a004682ea6b1a22", "type": "github" }, "original": { @@ -503,17 +412,16 @@ "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ - "osbm-nvim", "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1737372689, + "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", "type": "github" }, "original": { @@ -525,8 +433,12 @@ "osbm-nvim": { "inputs": { "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim" + "nixpkgs": [ + "nixpkgs" + ], + "nixvim": [ + "nixvim" + ] }, "locked": { "lastModified": 1737293095, @@ -575,9 +487,10 @@ "root": { "inputs": { "agenix": "agenix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", + "nixvim": "nixvim", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix", "vscode-server": "vscode-server" @@ -750,17 +663,16 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "osbm-nvim", "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1736154270, - "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8d8a15e..90a5650 100644 --- a/flake.nix +++ b/flake.nix @@ -10,14 +10,27 @@ }; inputs = { - agenix.url = "github:ryantm/agenix"; + agenix = { + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - osbm-nvim.url = "github:osbm/osbm-nvim"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + }; + osbm-nvim = { + url = "github:osbm/osbm-nvim"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixvim.follows = "nixvim"; + }; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; inputs.nixpkgs.follows = "nixpkgs"; From e9f83135a7b37578c1256dd954d5ede1f6ae97e2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 01:28:20 +0300 Subject: [PATCH 0377/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a4e39b5..91658d5 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1737575492, - "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -362,11 +362,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737578990, - "narHash": "sha256-49M9B1nni54cuOH6qPM90U106VSWhAVqpy6f3sz0q4Q=", + "lastModified": 1737600851, + "narHash": "sha256-NUXIty9JPKF8TH/0jlE4S3QlMWAfjP1BZ+z5MzOZusE=", "owner": "nix-community", "repo": "nixvim", - "rev": "a2a4befdaf825d36a50e2fda4a004682ea6b1a22", + "rev": "7dc67410bbfa82d7650b80401219f864fa077542", "type": "github" }, "original": { From 367eae38015319a3a4318ef7ec450176364ac9f3 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 22:17:35 +0300 Subject: [PATCH 0378/1768] add testing workflow --- .github/workflows/test-my-packages.yml | 34 ++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/test-my-packages.yml diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml new file mode 100644 index 0000000..fc5c747 --- /dev/null +++ b/.github/workflows/test-my-packages.yml @@ -0,0 +1,34 @@ +name: Build and test the packages i maintain on Nixpkgs + + +on: + # cron every hour at 3 minutes 00:03 AM, 01:03 AM etc. + schedule: + - cron: '3 * * * *' + - workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-24.04 + matrix: + nixpkgs: [nixos-unstable, nixpkgs-unstable, master] + platform: [x86_64-linux, aarch64-linux] + myPackages: # TODO automate this list + - python313Packages.runstats + - python313Packages.fastmri + - python312Packages.runstats + - python312Packages.fastmri + - python311Packages.runstats + - python311Packages.fastmri + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Nix + uses: cachix/install-nix-action@v30 + with: + extra_nix_config: | + system = ${{ matrix.platform }} + + - name: Build my packages + run: nix build -L "github:nixos/nixpkgs/${{ matrix.nixpkgs }}#${{ matrix.myPackages }}" From 0030179bf060569f1f89d4a559c0bb601b9c2436 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 22:19:14 +0300 Subject: [PATCH 0379/1768] fix: correct indentation for workflow_dispatch in test-my-packages.yml --- .github/workflows/test-my-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index fc5c747..9d094ed 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -5,7 +5,7 @@ on: # cron every hour at 3 minutes 00:03 AM, 01:03 AM etc. schedule: - cron: '3 * * * *' - - workflow_dispatch: + workflow_dispatch: jobs: build: From 00b85132e5767dbd852919bc51a023b31c8a8c24 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 22:20:05 +0300 Subject: [PATCH 0380/1768] fix --- .github/workflows/test-my-packages.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index 9d094ed..f522852 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -10,16 +10,17 @@ on: jobs: build: runs-on: ubuntu-24.04 - matrix: - nixpkgs: [nixos-unstable, nixpkgs-unstable, master] - platform: [x86_64-linux, aarch64-linux] - myPackages: # TODO automate this list - - python313Packages.runstats - - python313Packages.fastmri - - python312Packages.runstats - - python312Packages.fastmri - - python311Packages.runstats - - python311Packages.fastmri + strategy: + matrix: + nixpkgs: [nixos-unstable, nixpkgs-unstable, master] + platform: [x86_64-linux, aarch64-linux] + myPackages: # TODO automate this list + - python313Packages.runstats + - python313Packages.fastmri + - python312Packages.runstats + - python312Packages.fastmri + - python311Packages.runstats + - python311Packages.fastmri steps: - name: Checkout uses: actions/checkout@v4 From 008bc7b85b4fa7423d9976d935aaf4676ef366ca Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 22:28:14 +0300 Subject: [PATCH 0381/1768] log --- .github/workflows/test-my-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index f522852..128cf94 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -32,4 +32,4 @@ jobs: system = ${{ matrix.platform }} - name: Build my packages - run: nix build -L "github:nixos/nixpkgs/${{ matrix.nixpkgs }}#${{ matrix.myPackages }}" + run: nix build --log-lines 300 -L "github:nixos/nixpkgs/${{ matrix.nixpkgs }}#${{ matrix.myPackages }}" From 5f755c1e32993d274891ead6e930f61bd2fd3f4e Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 22:31:11 +0300 Subject: [PATCH 0382/1768] disable aarch64 for now --- .github/workflows/test-my-packages.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index 128cf94..35ad959 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: nixpkgs: [nixos-unstable, nixpkgs-unstable, master] - platform: [x86_64-linux, aarch64-linux] + # platform: [x86_64-linux, aarch64-linux] #TODO: add aarch64-linux myPackages: # TODO automate this list - python313Packages.runstats - python313Packages.fastmri @@ -27,9 +27,9 @@ jobs: - name: Install Nix uses: cachix/install-nix-action@v30 - with: - extra_nix_config: | - system = ${{ matrix.platform }} + # with: + # extra_nix_config: | + # # system = ${{ matrix.platform }} - name: Build my packages - run: nix build --log-lines 300 -L "github:nixos/nixpkgs/${{ matrix.nixpkgs }}#${{ matrix.myPackages }}" + run: nix build -L "github:nixos/nixpkgs/${{ matrix.nixpkgs }}#${{ matrix.myPackages }}" From 768d43b08d2d5ab9cc5ad81ce7141e5067aaefdd Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 23:53:28 +0300 Subject: [PATCH 0383/1768] add todo item --- .github/workflows/test-my-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index 35ad959..cf12967 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - nixpkgs: [nixos-unstable, nixpkgs-unstable, master] + nixpkgs: [nixos-unstable, nixpkgs-unstable, master] # TODO: add stable branch once they are available # platform: [x86_64-linux, aarch64-linux] #TODO: add aarch64-linux myPackages: # TODO automate this list - python313Packages.runstats From 9dc41f22c1b8878c9080c3f579d6c920f7b627d8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 23:56:27 +0300 Subject: [PATCH 0384/1768] add new step to see cache availability --- .github/workflows/test-my-packages.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index cf12967..087bf62 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - nixpkgs: [nixos-unstable, nixpkgs-unstable, master] # TODO: add stable branch once they are available + nixpkgs-branch: [nixos-unstable, nixpkgs-unstable, master] # TODO: add stable branch once they are available # platform: [x86_64-linux, aarch64-linux] #TODO: add aarch64-linux myPackages: # TODO automate this list - python313Packages.runstats @@ -31,5 +31,11 @@ jobs: # extra_nix_config: | # # system = ${{ matrix.platform }} + # i want to create .drv file and check if they exist in the nixos.cache + # if they dont exist, i want to skip the build + + - name: Check if the dependencies are in the cache + run: nix path-info --closure-size --eval-store auto --store https://cache.nixos.org 'github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}${{ matrix.myPackages }}^*' + - name: Build my packages - run: nix build -L "github:nixos/nixpkgs/${{ matrix.nixpkgs }}#${{ matrix.myPackages }}" + run: nix build -L "github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}#${{ matrix.myPackages }}" From f80549c6a6b923cc8b5ec7afab345d11d7cd0b02 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Jan 2025 23:57:47 +0300 Subject: [PATCH 0385/1768] super stupid me super stupid --- .github/workflows/test-my-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index 087bf62..689cbb3 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -35,7 +35,7 @@ jobs: # if they dont exist, i want to skip the build - name: Check if the dependencies are in the cache - run: nix path-info --closure-size --eval-store auto --store https://cache.nixos.org 'github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}${{ matrix.myPackages }}^*' + run: nix path-info --closure-size --eval-store auto --store https://cache.nixos.org 'github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}#${{ matrix.myPackages }}^*' - name: Build my packages run: nix build -L "github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}#${{ matrix.myPackages }}" From cc6476e48a6ffed46da05509f62b30b15eba2c90 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 25 Jan 2025 00:02:46 +0300 Subject: [PATCH 0386/1768] i am this close --- .github/workflows/test-my-packages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index 689cbb3..124bc94 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -4,7 +4,7 @@ name: Build and test the packages i maintain on Nixpkgs on: # cron every hour at 3 minutes 00:03 AM, 01:03 AM etc. schedule: - - cron: '3 * * * *' + - cron: '3 0 * * *' workflow_dispatch: jobs: @@ -20,7 +20,7 @@ jobs: - python312Packages.runstats - python312Packages.fastmri - python311Packages.runstats - - python311Packages.fastmri + # - python311Packages.fastmri # broken for now steps: - name: Checkout uses: actions/checkout@v4 @@ -34,8 +34,8 @@ jobs: # i want to create .drv file and check if they exist in the nixos.cache # if they dont exist, i want to skip the build - - name: Check if the dependencies are in the cache - run: nix path-info --closure-size --eval-store auto --store https://cache.nixos.org 'github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}#${{ matrix.myPackages }}^*' + # - name: Check if the dependencies are in the cache + # run: nix path-info --closure-size --eval-store auto --store https://cache.nixos.org 'github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}#${{ matrix.myPackages }}^*' - name: Build my packages run: nix build -L "github:nixos/nixpkgs/${{ matrix.nixpkgs-branch }}#${{ matrix.myPackages }}" From 94765cb215205eed5e813643e31108fc33adb469 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 26 Jan 2025 14:11:14 +0300 Subject: [PATCH 0387/1768] grammar is important e --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 90a5650..7a511a0 100644 --- a/flake.nix +++ b/flake.nix @@ -130,7 +130,7 @@ }; homeConfigurations = { # doesnt work because my different systems have different stateVersions - # i dont know how to get the stateVersion from the current host + # I dont know how to get the stateVersion from the current host osbm = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance modules = [./modules/home.nix]; From 28f8cac7107acdc44c724f1778920c58f1814461 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 26 Jan 2025 18:19:03 +0300 Subject: [PATCH 0388/1768] enable sddm wayland --- modules/graphical-interface.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index b7457d3..868d13c 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -22,6 +22,7 @@ services.displayManager.sddm = { enable = true; theme = "sugar-dark"; + wayland = true; }; services.desktopManager.plasma6.enable = true; From 5de9c94b4dabd7c1fbcbecb80962872f2dd383bf Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 26 Jan 2025 18:20:56 +0300 Subject: [PATCH 0389/1768] oh right --- modules/graphical-interface.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 868d13c..a0fc81f 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -22,7 +22,7 @@ services.displayManager.sddm = { enable = true; theme = "sugar-dark"; - wayland = true; + wayland.enable = true; }; services.desktopManager.plasma6.enable = true; From 5866ba8cb5627eb313fad2bb6c21e408bcbbf183 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 26 Jan 2025 18:22:09 +0300 Subject: [PATCH 0390/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 91658d5..90b0c32 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1737630279, - "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737590910, - "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737746512, + "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "825479c345a7f806485b7f00dbe3abb50641b083", "type": "github" }, "original": { @@ -362,11 +362,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737600851, - "narHash": "sha256-NUXIty9JPKF8TH/0jlE4S3QlMWAfjP1BZ+z5MzOZusE=", + "lastModified": 1737832569, + "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", "owner": "nix-community", "repo": "nixvim", - "rev": "7dc67410bbfa82d7650b80401219f864fa077542", + "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", "type": "github" }, "original": { From a83c99b2a505bc53d5ca0aa0f24403bb37092a95 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 26 Jan 2025 18:31:40 +0300 Subject: [PATCH 0391/1768] disable sddm theme --- modules/graphical-interface.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index a0fc81f..b3ef62d 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -21,8 +21,8 @@ # Enable the KDE Plasma Desktop Environment. services.displayManager.sddm = { enable = true; - theme = "sugar-dark"; - wayland.enable = true; + # theme = "sugar-dark"; # looks ugly i give up + # wayland.enable = true; }; services.desktopManager.plasma6.enable = true; From 9bfad2364a1313400fdfd1b183df4e57813219b5 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 27 Jan 2025 15:43:02 +0300 Subject: [PATCH 0392/1768] finally my custom iso --- flake.nix | 6 ++++++ hosts/iso/configuration.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 hosts/iso/configuration.nix diff --git a/flake.nix b/flake.nix index 7a511a0..a80bfb0 100644 --- a/flake.nix +++ b/flake.nix @@ -127,6 +127,12 @@ raspberry-pi-nix.nixosModules.sd-image ]; }; + myISO = nixpkgs.lib.nixosSystem { + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + ./hosts/iso/configuration.nix + ]; + }; }; homeConfigurations = { # doesnt work because my different systems have different stateVersions diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix new file mode 100644 index 0000000..6043317 --- /dev/null +++ b/hosts/iso/configuration.nix @@ -0,0 +1,31 @@ +{ + config, + lib, + pkgs, + system, + ... +}: { + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + + nixpkgs.config.allowUnfree = true; + # Set environment variable for allowing non-free packages + environment.sessionVariables = { + NIXPKGS_ALLOW_UNFREE = "1"; + }; + + environment.systemPackages = with pkgs; [ + # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + git + curl + parted + nano + comma + just + age + ]; +} \ No newline at end of file From 19d4bd8e5b567e68c78ba84c105f9b0f3a1a58d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 27 Jan 2025 15:43:11 +0300 Subject: [PATCH 0393/1768] mark iso image generator as complete in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6e66cf..0fa8ad3 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ and voila! when you plug the sd card to the raspberry pi 5 it will boot up with # To-do list -- [ ] iso image generator for nixos +- [x] iso image generator for nixos - Basically the original nixos iso with added packages and tweaks. - [ ] build custom android rom - Or how to run nixos on the phone. From 3171fdb9c5f9cc117a71025a18af1b05a2074df6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 27 Jan 2025 16:18:11 +0300 Subject: [PATCH 0394/1768] formatting --- hosts/iso/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index 6043317..b59ddd8 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -5,7 +5,6 @@ system, ... }: { - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nix.settings.experimental-features = [ "nix-command" @@ -28,4 +27,4 @@ just age ]; -} \ No newline at end of file +} From bebb8673f559884c0cc6d2dabd4305fb17e529c8 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 27 Jan 2025 17:32:25 +0300 Subject: [PATCH 0395/1768] collapsable area --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0fa8ad3..9f6243a 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,9 @@ I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) - Android phone (termux) **android** (not setup yet) +
+ How to bootstrap raspberry pi 5 + ## How to use raspberry pi 5 I have 2 configurations for the raspberry pi 5. One is for the sd card (basically bootstraps the system) and the other is for my customized system itself. @@ -32,6 +35,7 @@ $ zstdcat nixos-sd-image-24.05.20241116.e8c38b7-aarch64-linux.img.zst | dd of=/d and voila! when you plug the sd card to the raspberry pi 5 it will boot up with the configuration that you have built. And then you can ssh into it and further configure it. +
# To-do list From ff9d992d81ceb1d7658a428952b361cd0b3b7a38 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 02:05:28 +0300 Subject: [PATCH 0396/1768] rekey for ymir --- secrets/network-manager.age | Bin 594 -> 594 bytes secrets/secrets.nix | 2 +- secrets/ssh-key-private.age | Bin 941 -> 941 bytes secrets/ssh-key-public.age | Bin 623 -> 623 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/network-manager.age b/secrets/network-manager.age index 8aab75632bbeb853c96c8c8a0e71c2e12d5f3f16..7ab96e26f99d809a2ed3aa18b08c01226efbeb1b 100644 GIT binary patch delta 528 zcmcb_a*1VvYJFr_vbS%bf@xW}VT8F$ra^9KaeA1cagKRtX;y@*vr~zef1zh`sDWvj zab{AOQ<$+Qms3Puu1`vGg`;z2nqNhVMYwZvl4WFOaG_DCQ%Pk(xldk5fR}H6nrCJ{ zm#&>cadC!jYKoDmsiCDpqGgp+Rk?zHpnH^muth;tfKR5UOTK?nR$^pfR%%2+PNI28 zX!3LHARn8$9K7JOC$!W&LPU!(biD4oB0p{8129x6%#q0G; zO^jS~N{UL$N-|2FA_FW9jPjlGA`8>q{QMKmgI%-pq5}PWQj#q~lDP_fa>7cIB9hXa za~u}w7`y8=*SHI73b4lG+jzwdPp?P`FUH3!=e1ZaD~t!{iW=; TgV}1;uM|DLw|jO{tMPdN{ExZz delta 528 zcmcb_a*1VvYJIjxp-*MHLVk&NfJ<6#Ub=atTY6z=P)c5Ynt5_jsB=(SV4=2is$q^} zX;?shL|$MdS4C)WR*J7%RER-Uo@Zg6M|PfHYOa}Ya-w@!m0v`qhfA4JxJPcTc|e3G zm#&>cadC!jYKoDmsiCDpqGgp+Rk=cPXpXsQUaFf{p-;I-MR0ZiN9^IWGE<0cpX;g@uJB>67Cb#p{hM z%Zt_w5eIPQA9|4zLtH0YJFr_vbS%bf_7=TbEt7zhpNW@GMzK+Da;3YQUqL{i zPiabIU|4V{SFnYCzPo8gh;dcadC!jYKoDmsiCDpqGgp+Rk=cnzE_reSe1Etj&DSHV1~A*k%f;@dSQ5Cez13u zp=E}*nSN$KqIY(oLAnW-rN4G~dai$&t8r9rx@SP7xl4$4u)e3amx-6Qdqq-_nNeO~ zX?R(7igDz`kK*CRVXmbfx%sJudH!DMIffxd2BCq$hQ7{*d6wP<#!iJrCZ3gn8Ac_c zVcA@f&K{=8o+d@vSz*3Gx&8)j#!1Fzg-#~k?&ZGuRk=Ryer{zIhE>i*6|R%x8O7^M zlG9T3ox)O!O;hr!DvbjzE3#b5OZ`&IEYkz@y+X`E)RUb(hyegNr^H(GPy8m+oC! zcs0Gmitn^VJoCvZ%vEdS4^5kS`uHQ0-F4GvJeb19@1GO9L*$&`i>t@-*7Ia8mR)dj z?%Dc|xPG=$mt>jhI=86gxmGRFG4~o{1*SjpS50R0Yg?Y(&v-AQ$#9>}`$??47aoV1 zwe0!%_UyI`%?Dk$w3f{e*|xj%s#xXeN%DG25AH~~AMN&7rtjmAzVgrhn}juDjI8IX z?{R$EoRih~RMoAgcxOdSoA%v*uYU$yo2TgHaW*o%eqwEwVDY|2-iE+R_Q3o6%_-{- z>C`+u(_GF20KXwe0%K0JW*iOP4M_^lo#h-*kyZHBMSNXP4?t;SHSp aRsZWBKe>5v`utDVEN`y={kcT>mK6Z)z-;LN delta 879 zcmZ3>zLtH0YJIjxp-*MHf_tuKNlH;sVPKF+iDzDsg=L7Fr)7SWr(;1#No7Wgg}$3n zWJp=AcVSgAmw9AvqHn%uXh=jvL2-zYW43dSn|_2@o~yfyvyoGgZ(w$~MMcadC!jYKoDmsiCDpqGgp+Rk?z8Zb44Im#33ql&@Kat9C$eM6pRgu}QjDMQO36 zYeZ<2zJ7#Ril0%EVT31FRe5N0?#hKbcxvm*io+gvy8O7_% zf=%=@qp}SOlKmr-jQuU#v%<2y^$W}k@=diZa$KT3vivL}ij#7kGt0RgbAA1jO$@?4 zi&G;?J)GQ31C27>GXp|Av@3k8Li7v$v&yqQEb^ktEwZ_Eb#)a?O`U_i^)n5Eyj+U% z6N5rZ-IJYjv-}Kl4Yjk3{QNR=bB*hZOZ>EhqP+9DnwD!mJW;Hqn<##)zv-WnZhxfg zeSx`|3G$JRTb_pApWL@+W920`AvTrBOLJoHz1w}w;=fDDny2fv6@D#AT=~UCSVS-L zG`qw%*OW}FojJeL`BGX-C4_^v%-?;IZ|<3bwg0!fUi+|H)7Wv6>A$qO^LEZp(8@V3 zQh!p9uh9R`7V{jZ$0Ci_!(0~LUdHh4+qIuYT5?A_Y68}I@x0j8V0cpK#7_O@gFKwE z3Wg^p7^oD4Zt5srXtVa#2j8|=FFiTWe2nnhsKd{8kdLXe%d;@cLh;wr=fzdG+V7oA znPs6hi7B5g|F!buvpoiZZyscs?&uITKD0IdJY!q^0=oy{cc!vT?pJ;+*0gki^c)MH zS!dP$th+QtgZuO1$AUAi#4Id)ekIxSf1g`=;)@JT)wgF9r}7y4{8`2)`C#e$2Gdgy zV>I3_?b6m=C$?~=lJE8KKmRm~7sNj|l1M5t-@7+GWXdy%yojwc4aIs7Pmw>xlK9Ln zuJhQ_clHk~j|f`-Ig*-uK63XBizWSA;&1-`mw9MXMAn&2`bn1C+f#NuE1zw3MMYEe a(W%J#S-x|Ai2F?0Wcko`#h0*B(|G`uh-fna diff --git a/secrets/ssh-key-public.age b/secrets/ssh-key-public.age index d12eb84ea0f7cd280ffae61e4847b6a3b98fd3ac..1b86365fbc2f5b10f84f06f41d4ab0a18ad103a4 100644 GIT binary patch delta 558 zcmaFQ@}6aaYJFr_vbS%bf?1|>Nrk1Kn~ATlL4=t>zD15@g-b+cqIbDlL}g@ZzII@R zpM_&~W>laFS9VaSk!w|CZd8>|fU#R?s6laHWKKqvc6w-5N}+3!VPHf>m8EmCQHrGr zm#&>cadC!jYKoDmsiCDpqGgp+Rk=cCa6wh6rD=snnr~Q_SaH(&0PGqF7ud`Wb zfODo{g_+63kK*AbWoAiXKKTXCA!e@H`XNPb72yWS24?P+!Cr2`Rb{C~c|n#&iT=)E zVFp~4shNhRX#uI)fe~IFk)aV`z8)zRXE(n3PQvV)Rci&FzkO*5VKjg6|Z{7ZdILdv;Ed?LAYb#)b-@?9K#D)UXlib^U9 zBZ}QD6Vrn|yj}f#B26oNQ_K_f3rwmaj14oK)0`r?PD_5fdN7M~!^U9!+w#w4<_7r& z@8`JNz|P+0#vFFd$Z+vV*0h4Q?(DY}5l1gwm{k>Cf67HBQ||Iy+fQGTO}_HzX+CVZ z;Jy69l67pSgj1T%FWUB@sqdWU8Sd~IQ=A034EfdOb&F<->28aCronTOL2)Ah)4jx^ delta 558 zcmaFQ@}6aaYJIjxp-*MHLTZw>Q%cadC!jYKoDmsiCDpqGgp+Rk=b|q`O&!Ws+e=sBc<+M5ueBZXI^BuQ&C2h zp=E?|j&rKJuYrF^RfY*yL8^O!ey&$`dQz@oYOa4uxNAegg^?;RX7U{$(L4DFM0JzLiOi zRmogs6=6o&LB(mQk#1(;-WC1y@L~@LJLd-14|1%+|w*PBhAZwlf9En0t0;Aj4eG=dY6Cj7-DaGm;B~Ei!Y9^z*rNb#)bTEd5hbE4-Y1oKuRO z0<`@j3ktI=3{7)93|%c#EQ_lu+?=bjoIJe?^U5r^nve9&P~>c6TwHomZHGju$A0cF zch0Nu99GcrSywf;^zVWAq_uIg!i#1fZ8}gZlDlI=m|*9P?F+vjJMv(G-g$|Qvuth@ z*Ii2&V885qNUu@x{5FTl*=FyeB3;}5ZEd^2`gZRdo%1tx?i4-${e@T5WaZo>03d(N AfB*mh From 9db1eec3a33fd2f1747cb7e7ae0a213305601825 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 02:40:07 +0300 Subject: [PATCH 0397/1768] new installation does not going well --- hosts/ymir/configuration.nix | 2 +- hosts/ymir/hardware-configuration.nix | 48 ++++++++++++--------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index f06d4b6..9107092 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -7,7 +7,7 @@ system-label, ... }: let - stateVersion = "24.11"; + stateVersion = "25.05"; in { imports = [ ./hardware-configuration.nix diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/ymir/hardware-configuration.nix index e51ea49..a56e005 100644 --- a/hosts/ymir/hardware-configuration.nix +++ b/hosts/ymir/hardware-configuration.nix @@ -1,38 +1,32 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/bfbd04d5-49bb-4571-8897-d36b2c679a6c"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/fd6792b4-d1ec-493c-a686-64dbeaac3371"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."luks-58144581-4049-4169-b8a9-4da19129416a".device = "/dev/disk/by-uuid/58144581-4049-4169-b8a9-4da19129416a"; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/383D-1E8A"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/7F17-2E5B"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/a07d03b7-c2fb-40f9-89b0-d8f6db9d0e0e";} - ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/33c6277d-eb0a-487d-8be0-829829a8a308"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From f08a1398f08506b223e89fdea4a60e37ffc683f1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 02:44:23 +0300 Subject: [PATCH 0398/1768] i am a moron --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 9107092..e41bd33 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -24,7 +24,7 @@ in { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.initrd.luks.devices."luks-b84e6223-825f-4944-a6fe-16368b75c6de".device = "/dev/disk/by-uuid/b84e6223-825f-4944-a6fe-16368b75c6de"; + #boot.initrd.luks.devices."luks-b84e6223-825f-4944-a6fe-16368b75c6de".device = "/dev/disk/by-uuid/b84e6223-825f-4944-a6fe-16368b75c6de"; networking.hostName = "ymir"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. From 051dbdb678b4066df38683bbdba1f0d2e1e8e04a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 03:19:28 +0300 Subject: [PATCH 0399/1768] enable WOL on ymir --- hosts/ymir/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index e41bd33..515ef6c 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -41,6 +41,8 @@ in { # Enable networking networking.networkmanager.enable = true; + networking.interfaces.enp3s0.wakeOnLan.enable = true; + hardware.nvidia-container-toolkit.enable = true; # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; From 8d5e9a79b7822b911995a9477127eb3b0c0ce18c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 03:34:22 +0300 Subject: [PATCH 0400/1768] add systemd thingy --- hosts/ymir/configuration.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 515ef6c..ced6ccd 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -42,6 +42,18 @@ in { networking.networkmanager.enable = true; networking.interfaces.enp3s0.wakeOnLan.enable = true; + # The services doesn't actually work atm, define an additional service + # see https://github.com/NixOS/nixpkgs/issues/91352 + systemd.services.wakeonlan = { + description = "Reenable wake on lan every boot"; + after = [ "network.target" ]; + serviceConfig = { + Type = "simple"; + RemainAfterExit = "true"; + ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp3s0 wol g"; + }; + wantedBy = [ "default.target" ]; + }; hardware.nvidia-container-toolkit.enable = true; From ed33dc8a769bffa2982fd384e4e5d0725c87c4a2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 13:02:52 +0300 Subject: [PATCH 0401/1768] lets see if this helps --- hosts/pochita/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 1741424..e4a7854 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -47,6 +47,8 @@ in { #kernel-version = "v6_10_12"; }; + services.openssh.settings.GatewayPorts = "yes"; + system.nixos.label = system-label; # DO NOT TOUCH THIS system.stateVersion = stateVersion; From 08bfae70463fbc670e384ebb413fe043a55e3fe1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 13:26:26 +0300 Subject: [PATCH 0402/1768] try remote builds --- hosts/pochita/configuration.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index e4a7854..d7ba93b 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -13,6 +13,17 @@ in { ../../modules ]; + nix.distributedBuilds = true; + nix.buildMachines = [ + { + hostname = "ymir"; + systems = [ "x86_64-linux" "aarch64-linux" ]; + supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; + sshKey = "/home/osbm/.ssh/id_ed25519"; + sshUser = "osbm"; + } + ]; + enableKDE = false; enableFonts = false; From 16499001139b8c20abbfb60259d587fd26445501 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 13:27:46 +0300 Subject: [PATCH 0403/1768] typo --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index d7ba93b..336959e 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -16,7 +16,7 @@ in { nix.distributedBuilds = true; nix.buildMachines = [ { - hostname = "ymir"; + hostName = "ymir"; systems = [ "x86_64-linux" "aarch64-linux" ]; supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; sshKey = "/home/osbm/.ssh/id_ed25519"; From a17ae9b699aabe053d80dcd244a3c1f82bcf3c17 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 13:36:11 +0300 Subject: [PATCH 0404/1768] disable some features this time --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 336959e..c913b0f 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -18,7 +18,7 @@ in { { hostName = "ymir"; systems = [ "x86_64-linux" "aarch64-linux" ]; - supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; + supportedFeatures = [ "big-parallel" "kvm"]; sshKey = "/home/osbm/.ssh/id_ed25519"; sshUser = "osbm"; } From f6decd434d084c39dd08ab247743973bee57f923 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 13:39:10 +0300 Subject: [PATCH 0405/1768] is ip ok? --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index c913b0f..1a4acb5 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -16,7 +16,7 @@ in { nix.distributedBuilds = true; nix.buildMachines = [ { - hostName = "ymir"; + hostName = "192.168.0.2"; systems = [ "x86_64-linux" "aarch64-linux" ]; supportedFeatures = [ "big-parallel" "kvm"]; sshKey = "/home/osbm/.ssh/id_ed25519"; From b2fbf87ba154d1a1e1c2c3c04ad9fefc8f021752 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 14:47:14 +0300 Subject: [PATCH 0406/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 90b0c32..bc09795 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1737968762, + "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1737504076, - "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", + "lastModified": 1737926801, + "narHash": "sha256-un7IETRNjUm83jM5Gd/7BO4rCzzkom46O0FDMo5toaI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", + "rev": "62ba0a22426721c94e08f0779ed8235d5672869b", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737746512, - "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "825479c345a7f806485b7f00dbe3abb50641b083", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -362,11 +362,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737832569, - "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", + "lastModified": 1738051551, + "narHash": "sha256-HIKvX5ofJMJCQ4CS7ZbL3kEmBjhoc34qOwG4s4Bxvio=", "owner": "nix-community", "repo": "nixvim", - "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", + "rev": "a64048e9f5f323c9bc5de29e759ff0531a114604", "type": "github" }, "original": { @@ -417,11 +417,11 @@ ] }, "locked": { - "lastModified": 1737372689, - "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", + "lastModified": 1737924095, + "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", "owner": "NuschtOS", "repo": "search", - "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", + "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", "type": "github" }, "original": { From 1649c951a5cfd23aa24885ecc80c577fd1fee0ac Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Jan 2025 17:01:52 +0300 Subject: [PATCH 0407/1768] try regressing the nixpkgs for pochita --- flake.lock | 31 ++++++++++++++++++++++++------- flake.nix | 8 +++++--- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index bc09795..22ade5a 100644 --- a/flake.lock +++ b/flake.lock @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1737926801, - "narHash": "sha256-un7IETRNjUm83jM5Gd/7BO4rCzzkom46O0FDMo5toaI=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "62ba0a22426721c94e08f0779ed8235d5672869b", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -345,6 +345,22 @@ "type": "github" } }, + "nixpkgs-rpi": { + "locked": { + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", @@ -362,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738051551, - "narHash": "sha256-HIKvX5ofJMJCQ4CS7ZbL3kEmBjhoc34qOwG4s4Bxvio=", + "lastModified": 1738066434, + "narHash": "sha256-XnXAOrbwa46w/hjYe2+OmRMWJZTD+DuzXxBx0Osfw3Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "a64048e9f5f323c9bc5de29e759ff0531a114604", + "rev": "635adc07fa3c09c0c9aa9e43ebb0874abe002292", "type": "github" }, "original": { @@ -459,7 +475,7 @@ "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", "nixpkgs": [ - "nixpkgs" + "nixpkgs-rpi" ], "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", @@ -490,6 +506,7 @@ "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "nixpkgs-rpi": "nixpkgs-rpi", "nixvim": "nixvim", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix", diff --git a/flake.nix b/flake.nix index a80bfb0..09ad3dc 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-rpi.url = "github:NixOS/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8"; # TODO: fix this later nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; @@ -33,7 +34,7 @@ }; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-rpi"; }; vscode-server = { url = "github:nix-community/nixos-vscode-server"; @@ -50,6 +51,7 @@ home-manager, raspberry-pi-nix, nixos-hardware, + nixpkgs-rpi, ... }: { nixosConfigurations = let @@ -101,7 +103,7 @@ } ]; }; - pochita = nixpkgs.lib.nixosSystem { + pochita = nixpkgs-rpi.lib.nixosSystem { modules = [ ./hosts/pochita/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi @@ -120,7 +122,7 @@ inherit system-label; }; }; - pochita-sd = nixpkgs.lib.nixosSystem { + pochita-sd = nixpkgs-rpi.lib.nixosSystem { modules = [ ./hosts/pochita-sd/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi From 6395ec3a16a34014d83dd5c040a6d76b769b00d4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 30 Jan 2025 21:19:55 +0300 Subject: [PATCH 0408/1768] enable this awesome option --- hosts/ymir/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ced6ccd..d9c6d98 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -59,6 +59,9 @@ in { # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; # Enable OpenGL + + programs.nix-required-mounts.presets.nvidia-gpu.enable = true; + hardware.graphics = { enable = true; }; From cba68b00e49e4bd20f1936f7b75bd35e5ea8599d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 30 Jan 2025 21:20:31 +0300 Subject: [PATCH 0409/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 22ade5a..df1b2c6 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1737968762, - "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", + "lastModified": 1738261073, + "narHash": "sha256-469d7Sr5vKYEXmm5z+o+NoWFZvoTd9djv9JqDtc0AAg=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", + "rev": "a5e196d61f6e564f7fdeeb4a92cef92e1785d3f5", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738066434, - "narHash": "sha256-XnXAOrbwa46w/hjYe2+OmRMWJZTD+DuzXxBx0Osfw3Q=", + "lastModified": 1738255431, + "narHash": "sha256-n0NCyg7JYGl7AcfDkYpB7RwtUGSxnX6WCqLqjaGMFU0=", "owner": "nix-community", "repo": "nixvim", - "rev": "635adc07fa3c09c0c9aa9e43ebb0874abe002292", + "rev": "e4ed227f99be42cd0ce28b6ae0c85c306ef70d40", "type": "github" }, "original": { @@ -685,11 +685,11 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1738070913, + "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", "type": "github" }, "original": { From ce9baa954b68c66e0950a1f4bdb675e51ded7f89 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 30 Jan 2025 21:45:00 +0300 Subject: [PATCH 0410/1768] enable nix required mounts --- hosts/ymir/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index d9c6d98..f00264f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -60,8 +60,10 @@ in { # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; # Enable OpenGL + programs.nix-required-mounts.enable = true; programs.nix-required-mounts.presets.nvidia-gpu.enable = true; + hardware.graphics = { enable = true; }; From 4d4832a1af43b70ebd6b70be1ac048225a7c0d67 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Jan 2025 00:08:24 +0300 Subject: [PATCH 0411/1768] i want to watch videos --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index f00264f..9dfec9e 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -14,7 +14,7 @@ in { ../../modules ]; - blockYoutube = true; + blockYoutube = false; blockTwitter = true; blockBluesky = false; From f20dd8506332d408a043410fc172587f92fa8a31 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Jan 2025 14:29:06 +0300 Subject: [PATCH 0412/1768] allow ssh port --- hosts/pochita/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 1a4acb5..e5f4bb4 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -58,6 +58,8 @@ in { #kernel-version = "v6_10_12"; }; + networking.firewall.allowedTCPPorts = [ 22 ]; + services.openssh.settings.GatewayPorts = "yes"; system.nixos.label = system-label; From 0a2a9143fde56ee46ebead6f47c52355f562572d Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Jan 2025 14:29:35 +0300 Subject: [PATCH 0413/1768] try setting the open previous windows on firefox --- modules/firefox.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/firefox.nix b/modules/firefox.nix index afbe37e..f4fa9c7 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -78,6 +78,8 @@ in { */ # Check about:config for options. preferences = { + # "Open previous windows and tabs" + "browser.startup.page" = 3; "browser.contentblocking.category" = true; "extensions.pocket.enabled" = false; "extensions.screenshots.disabled" = true; From 6f0788175d30ac98078f070acb0a05dded111569 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Jan 2025 15:15:01 +0300 Subject: [PATCH 0414/1768] enable ssh in ymir --- hosts/ymir/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 9dfec9e..29c34ef 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -167,7 +167,9 @@ in { # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; + networking.firewall.allowedTCPPorts = [ 22 ]; + services.openssh.settings.GatewayPorts = "yes"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave From 5e4cd941dae9676e487ad954843339a1dded5f82 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Jan 2025 18:22:33 +0300 Subject: [PATCH 0415/1768] add tailscale --- hosts/pochita/configuration.nix | 5 ++--- hosts/ymir/configuration.nix | 11 ++--------- modules/default.nix | 1 + modules/tailscale.nix | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 modules/tailscale.nix diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index e5f4bb4..e79c0b3 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -30,6 +30,8 @@ in { blockYoutube = false; blockTwitter = false; + enableTailscale = true; + i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method programs.firefox.enable = lib.mkForce false; # no need for firefox @@ -58,9 +60,6 @@ in { #kernel-version = "v6_10_12"; }; - networking.firewall.allowedTCPPorts = [ 22 ]; - - services.openssh.settings.GatewayPorts = "yes"; system.nixos.label = system-label; # DO NOT TOUCH THIS diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 29c34ef..b9e9fb3 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -20,6 +20,8 @@ in { enableKDE = true; + enableTailscale = true; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -160,16 +162,7 @@ in { boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - # List services that you want to enable: - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - networking.firewall.allowedTCPPorts = [ 22 ]; - - services.openssh.settings.GatewayPorts = "yes"; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/modules/default.nix b/modules/default.nix index a49bfd1..966daaf 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,6 +9,7 @@ ./i18n.nix ./nix-settings.nix ./secrets.nix + ./tailscale.nix ./users.nix ]; } diff --git a/modules/tailscale.nix b/modules/tailscale.nix new file mode 100644 index 0000000..ac33a43 --- /dev/null +++ b/modules/tailscale.nix @@ -0,0 +1,32 @@ +{ + config, + lib, + pkgs, + ... + }: { + options = { + enableTailscale = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Tailscale VPN"; + }; + }; + + # i have 4 machines, 2 of them are always at home + # pochita (raspberry pi 5) and ymir (desktop) + # pochita will be on all the time, ymir can be wake on lan + + # and i have a laptop named tartarus + + config = lib.mkMerge [ + (lib.mkIf config.enableTailscale { + services.tailscale = { + enable = true; + port = 51513; + }; + + networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ]; + environment.systemPackages = [ pkgs.tailscale ]; + }) + ]; +} \ No newline at end of file From 86c92b9aa479a0f9d40c0fc4e8a1f58a690c264e Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Jan 2025 21:56:33 +0300 Subject: [PATCH 0416/1768] enable tailscale on tartarus --- hosts/tartarus/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index d43bef9..fab73fa 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -19,6 +19,8 @@ in { enableKDE = true; + enableTailscale = true; + boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; From 281fafe1d7a01f26c17e6db36a46307e4c471ba2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Feb 2025 15:30:49 +0300 Subject: [PATCH 0417/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index df1b2c6..fa74732 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1738261073, - "narHash": "sha256-469d7Sr5vKYEXmm5z+o+NoWFZvoTd9djv9JqDtc0AAg=", + "lastModified": 1738407251, + "narHash": "sha256-IDrc1qvFolaEDST/dWKgDcmJsemlfP4Yw6kh5O9TMVs=", "owner": "nix-community", "repo": "home-manager", - "rev": "a5e196d61f6e564f7fdeeb4a92cef92e1785d3f5", + "rev": "055c67056d87577a39af4144ad5eadb093cfb97d", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1738033138, - "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", + "lastModified": 1738277753, + "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", + "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1738391520, + "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738255431, - "narHash": "sha256-n0NCyg7JYGl7AcfDkYpB7RwtUGSxnX6WCqLqjaGMFU0=", + "lastModified": 1738366771, + "narHash": "sha256-nyEBrP5t1g4vmy7YBkiGaIu19eG8zV3T4IQLQbJsVU8=", "owner": "nix-community", "repo": "nixvim", - "rev": "e4ed227f99be42cd0ce28b6ae0c85c306ef70d40", + "rev": "c75e4ea37f25ec98aa6f2035e03e748e7369662c", "type": "github" }, "original": { From dec08be98b0a7dbd882ddf4f4bfcf02643e2e627 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Feb 2025 16:14:57 +0300 Subject: [PATCH 0418/1768] enable bluesky --- hosts/tartarus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index fab73fa..b82884a 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -16,6 +16,7 @@ in { blockYoutube = false; blockTwitter = true; + blockBluesky = false; enableKDE = true; From 0fb3129d03342c5c547ce467bd115d24547d384b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Feb 2025 18:16:55 +0300 Subject: [PATCH 0419/1768] formatting --- hosts/pochita/configuration.nix | 5 ++- hosts/ymir/configuration.nix | 6 ++-- hosts/ymir/hardware-configuration.nix | 46 +++++++++++++----------- modules/tailscale.nix | 52 +++++++++++++-------------- 4 files changed, 55 insertions(+), 54 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index e79c0b3..e4b3ee3 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -17,8 +17,8 @@ in { nix.buildMachines = [ { hostName = "192.168.0.2"; - systems = [ "x86_64-linux" "aarch64-linux" ]; - supportedFeatures = [ "big-parallel" "kvm"]; + systems = ["x86_64-linux" "aarch64-linux"]; + supportedFeatures = ["big-parallel" "kvm"]; sshKey = "/home/osbm/.ssh/id_ed25519"; sshUser = "osbm"; } @@ -60,7 +60,6 @@ in { #kernel-version = "v6_10_12"; }; - system.nixos.label = system-label; # DO NOT TOUCH THIS system.stateVersion = stateVersion; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index b9e9fb3..97f2288 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -48,13 +48,13 @@ in { # see https://github.com/NixOS/nixpkgs/issues/91352 systemd.services.wakeonlan = { description = "Reenable wake on lan every boot"; - after = [ "network.target" ]; + after = ["network.target"]; serviceConfig = { Type = "simple"; RemainAfterExit = "true"; ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp3s0 wol g"; }; - wantedBy = [ "default.target" ]; + wantedBy = ["default.target"]; }; hardware.nvidia-container-toolkit.enable = true; @@ -65,7 +65,6 @@ in { programs.nix-required-mounts.enable = true; programs.nix-required-mounts.presets.nvidia-gpu.enable = true; - hardware.graphics = { enable = true; }; @@ -162,7 +161,6 @@ in { boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/ymir/hardware-configuration.nix index a56e005..2c07fa7 100644 --- a/hosts/ymir/hardware-configuration.nix +++ b/hosts/ymir/hardware-configuration.nix @@ -1,32 +1,36 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/fd6792b4-d1ec-493c-a686-64dbeaac3371"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/fd6792b4-d1ec-493c-a686-64dbeaac3371"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/383D-1E8A"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/383D-1E8A"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/33c6277d-eb0a-487d-8be0-829829a8a308"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/33c6277d-eb0a-487d-8be0-829829a8a308";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/modules/tailscale.nix b/modules/tailscale.nix index ac33a43..0c1a9e7 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -1,32 +1,32 @@ { - config, - lib, - pkgs, - ... - }: { - options = { - enableTailscale = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Tailscale VPN"; - }; + config, + lib, + pkgs, + ... +}: { + options = { + enableTailscale = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Tailscale VPN"; }; + }; - # i have 4 machines, 2 of them are always at home - # pochita (raspberry pi 5) and ymir (desktop) - # pochita will be on all the time, ymir can be wake on lan + # i have 4 machines, 2 of them are always at home + # pochita (raspberry pi 5) and ymir (desktop) + # pochita will be on all the time, ymir can be wake on lan - # and i have a laptop named tartarus + # and i have a laptop named tartarus - config = lib.mkMerge [ - (lib.mkIf config.enableTailscale { - services.tailscale = { - enable = true; - port = 51513; - }; + config = lib.mkMerge [ + (lib.mkIf config.enableTailscale { + services.tailscale = { + enable = true; + port = 51513; + }; - networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ]; - environment.systemPackages = [ pkgs.tailscale ]; - }) - ]; -} \ No newline at end of file + networking.firewall.allowedUDPPorts = [config.services.tailscale.port]; + environment.systemPackages = [pkgs.tailscale]; + }) + ]; +} From 01c75c9193d3608f00da81f5bb7d67dbeb9703a5 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Feb 2025 13:13:56 +0300 Subject: [PATCH 0420/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index fa74732..2fedae7 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1738407251, - "narHash": "sha256-IDrc1qvFolaEDST/dWKgDcmJsemlfP4Yw6kh5O9TMVs=", + "lastModified": 1738448366, + "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "owner": "nix-community", "repo": "home-manager", - "rev": "055c67056d87577a39af4144ad5eadb093cfb97d", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738391520, - "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", + "lastModified": 1738471961, + "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", + "rev": "537286c3c59b40311e5418a180b38034661d2536", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738366771, - "narHash": "sha256-nyEBrP5t1g4vmy7YBkiGaIu19eG8zV3T4IQLQbJsVU8=", + "lastModified": 1738468832, + "narHash": "sha256-+YOdIULLio6C6mlZvW3cg1oHLLbuNh0Hx82zFTaP9SM=", "owner": "nix-community", "repo": "nixvim", - "rev": "c75e4ea37f25ec98aa6f2035e03e748e7369662c", + "rev": "8104356af6536df366eea4b8bcc409320323b959", "type": "github" }, "original": { From 784e64b99a875bf1fdd71d3b66494d834362d65d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 3 Feb 2025 11:55:29 +0300 Subject: [PATCH 0421/1768] i added description to my flake --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 09ad3dc..facf517 100644 --- a/flake.nix +++ b/flake.nix @@ -148,5 +148,7 @@ }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; + + description = "My system configuration"; }; } From 5cec74b8fb3ad98e744664eab6cfb5e6e3890069 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 01:12:13 +0300 Subject: [PATCH 0422/1768] add more shit to the iso --- hosts/iso/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index b59ddd8..9e1a04a 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -26,5 +26,10 @@ comma just age + neovim + wget ]; + + services.openssh.enable = true; + } From 137572e1719e32af6e8a310a17e3db8fe98f89e7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 01:19:38 +0300 Subject: [PATCH 0423/1768] try enabling tmux this way --- modules/home.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/home.nix b/modules/home.nix index f49d7f1..cbc668f 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -54,6 +54,12 @@ }; }; }; + programs.tmux = { + enable = true; + historyLimit = 100000; + plugins = with pkgs; [ + ]; + }; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage # when a new Home Manager release introduces backwards From 3bd0ddeae30b74a92da81e13a6c03ec8b5341f62 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 01:55:42 +0300 Subject: [PATCH 0424/1768] approximating towards my dotfile --- modules/home.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/home.nix b/modules/home.nix index cbc668f..1afa66d 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -57,7 +57,10 @@ programs.tmux = { enable = true; historyLimit = 100000; + baseIndex = 1; plugins = with pkgs; [ + tmuxPlugins.sensible + tmuxPlugins.dracula ]; }; # This value determines the Home Manager release that your From 9a0e907c6524213b60c0769403733eb3cbbb579f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 02:02:04 +0300 Subject: [PATCH 0425/1768] add my dracula settings --- modules/home.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/home.nix b/modules/home.nix index 1afa66d..54bc36b 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -60,7 +60,18 @@ baseIndex = 1; plugins = with pkgs; [ tmuxPlugins.sensible - tmuxPlugins.dracula + # tmuxPlugins.dracula + { + plugin = pkgs.tmuxPlugins.dracula; + extraConfig = '' + set -g @dracula-plugins "cpu-usage ram-usage gpu-usage battery time" + set -g @dracula-show-left-icon hostname + set -g @dracula-git-show-current-symbol ✓ + set -g @dracula-git-no-repo-message "no-git" + set -g @dracula-show-timezone false + set -g @dracula-ignore-lspci true + ''; + } ]; }; # This value determines the Home Manager release that your From 7b963c0074665fbf9363cad05ac8e9499a920179 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 02:03:44 +0300 Subject: [PATCH 0426/1768] try setting shortcut --- modules/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home.nix b/modules/home.nix index 54bc36b..292f7fe 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -58,6 +58,7 @@ enable = true; historyLimit = 100000; baseIndex = 1; + shortcut = "s"; plugins = with pkgs; [ tmuxPlugins.sensible # tmuxPlugins.dracula From 144434799703c6fc55ac3ac11b0dc74ba4c7c0ae Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 02:09:43 +0300 Subject: [PATCH 0427/1768] add final touches --- modules/home.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/home.nix b/modules/home.nix index 292f7fe..96c5de4 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -59,8 +59,10 @@ historyLimit = 100000; baseIndex = 1; shortcut = "s"; + mouse = true; plugins = with pkgs; [ tmuxPlugins.sensible + tmuxPlugins.better-mouse-mode # tmuxPlugins.dracula { plugin = pkgs.tmuxPlugins.dracula; @@ -74,6 +76,10 @@ ''; } ]; + extraConfig = '' + # Automatically renumber windows + set -g renumber-windows on + ''; }; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage From 522b2b636389172e906e764bb220d70e49c6bbea Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 02:11:14 +0300 Subject: [PATCH 0428/1768] add fish shell --- modules/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home.nix b/modules/home.nix index 96c5de4..96a52fa 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -60,6 +60,7 @@ baseIndex = 1; shortcut = "s"; mouse = true; + shell = "${pkgs.fish}/bin/fish"; plugins = with pkgs; [ tmuxPlugins.sensible tmuxPlugins.better-mouse-mode From 8eaac613fca20ca4e2e174faba39c5084e91bf8f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 16:16:09 +0300 Subject: [PATCH 0429/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2fedae7..6537284 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1738667255, + "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "7abcf59a365430b36f84eaa452a466b11e469e33", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738471961, - "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=", + "lastModified": 1738638143, + "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "537286c3c59b40311e5418a180b38034661d2536", + "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1738546358, + "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738468832, - "narHash": "sha256-+YOdIULLio6C6mlZvW3cg1oHLLbuNh0Hx82zFTaP9SM=", + "lastModified": 1738622717, + "narHash": "sha256-XSFbbhN8xdr4qKRFbubXJ3vkSusKSnALf69G9fdGPXE=", "owner": "nix-community", "repo": "nixvim", - "rev": "8104356af6536df366eea4b8bcc409320323b959", + "rev": "6288354d43ada972480cbd10dc7102637eeafc1e", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1737924095, - "narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { From cffc18a485441f35810ec85cc7050d7364e6e87a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 16:49:08 +0300 Subject: [PATCH 0430/1768] add wanikani script --- modules/home.nix | 33 ++++++++++++++++++++++++++++++--- modules/wanikani-tmux.sh | 10 ++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100755 modules/wanikani-tmux.sh diff --git a/modules/home.nix b/modules/home.nix index 96a52fa..8264c35 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -3,7 +3,35 @@ pkgs, stateVersion, ... -}: { +}: +let + wanikani-script = builtins.path { + path = ./wanikani.sh; + }; + tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { + pluginName = "dracula"; + version = "3.0.0"; + src = pkgs.fetchFromGitHub { + owner = "dracula"; + repo = "tmux"; + rev = "v${version}"; + hash = "sha256-VY4PyaQRwTc6LWhPJg4inrQf5K8+bp0+eqRhR7+Iexk="; + }; + installPhase = '' + # i am adding my custom widget to the plugin here cp the wanikani.sh script to the plugin directory + cp ${wanikani-script} $out/scripts/wanikani.sh + ''; + meta = with pkgs.lib; { + homepage = "https://draculatheme.com/tmux"; + description = "Feature packed Dracula theme for tmux!"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ethancedwards8 ]; + }; + }; + +in +{ # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "osbm"; @@ -64,9 +92,8 @@ plugins = with pkgs; [ tmuxPlugins.sensible tmuxPlugins.better-mouse-mode - # tmuxPlugins.dracula { - plugin = pkgs.tmuxPlugins.dracula; + plugin = tmux-dracula; extraConfig = '' set -g @dracula-plugins "cpu-usage ram-usage gpu-usage battery time" set -g @dracula-show-left-icon hostname diff --git a/modules/wanikani-tmux.sh b/modules/wanikani-tmux.sh new file mode 100755 index 0000000..34fd88e --- /dev/null +++ b/modules/wanikani-tmux.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +#!nix-shell -i bash -p jq curl +# Description: This script is used to display the current WaniKani review count in the tmux status bar. + +# curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count' + +# lets store the output of the above command in a variable +wanikani_reviews=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count') + +echo $wanikani_reviews \ No newline at end of file From 44608384869b4773865c430bd1a557d46c539849 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 17:16:42 +0300 Subject: [PATCH 0431/1768] add wanikani script take 2 --- modules/home.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home.nix b/modules/home.nix index 8264c35..bc67987 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -17,9 +17,9 @@ let rev = "v${version}"; hash = "sha256-VY4PyaQRwTc6LWhPJg4inrQf5K8+bp0+eqRhR7+Iexk="; }; - installPhase = '' + postInstall = '' # i am adding my custom widget to the plugin here cp the wanikani.sh script to the plugin directory - cp ${wanikani-script} $out/scripts/wanikani.sh + cp ${wanikani-script} $target/scripts/wanikani.sh ''; meta = with pkgs.lib; { homepage = "https://draculatheme.com/tmux"; @@ -95,7 +95,7 @@ in { plugin = tmux-dracula; extraConfig = '' - set -g @dracula-plugins "cpu-usage ram-usage gpu-usage battery time" + set -g @dracula-plugins "custom:wanikani cpu-usage ram-usage gpu-usage battery time" set -g @dracula-show-left-icon hostname set -g @dracula-git-show-current-symbol ✓ set -g @dracula-git-no-repo-message "no-git" From c6a9355e5d199602e52874ce3e340b251018393b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 17:18:49 +0300 Subject: [PATCH 0432/1768] hotfix --- modules/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home.nix b/modules/home.nix index bc67987..d8125e0 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -6,7 +6,7 @@ }: let wanikani-script = builtins.path { - path = ./wanikani.sh; + path = ./wanikani-tmux.sh; }; tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { pluginName = "dracula"; From 7c033637768757d19c0e270ce5ddaf492bb88729 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 17:24:31 +0300 Subject: [PATCH 0433/1768] i cant bother --- modules/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home.nix b/modules/home.nix index d8125e0..a934982 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -95,7 +95,7 @@ in { plugin = tmux-dracula; extraConfig = '' - set -g @dracula-plugins "custom:wanikani cpu-usage ram-usage gpu-usage battery time" + set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" set -g @dracula-show-left-icon hostname set -g @dracula-git-show-current-symbol ✓ set -g @dracula-git-no-repo-message "no-git" From 7ccfbeb2a6f007ecb13091e223dcc50dfc55aff6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 17:52:49 +0300 Subject: [PATCH 0434/1768] update wanikani script --- modules/wanikani-tmux.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/wanikani-tmux.sh b/modules/wanikani-tmux.sh index 34fd88e..de74d03 100755 --- a/modules/wanikani-tmux.sh +++ b/modules/wanikani-tmux.sh @@ -5,6 +5,20 @@ # curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count' # lets store the output of the above command in a variable -wanikani_reviews=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count') -echo $wanikani_reviews \ No newline at end of file +get_wanikani() +{ + wanikani_reviews=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count') + wanikani_lessons=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq '.total_count') + + echo "WaniKani: $wanikani_reviews reviews, $wanikani_lessons lessons" +} + +main() +{ + get_wanikani + # sleep for 30 minutes + sleep 1800m +} + +main \ No newline at end of file From c92953a5e3ed956d72fd754ba7fd616946e87797 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 18:31:48 +0300 Subject: [PATCH 0435/1768] formatting --- hosts/iso/configuration.nix | 1 - modules/home.nix | 21 +++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index 9e1a04a..aae5c6a 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -31,5 +31,4 @@ ]; services.openssh.enable = true; - } diff --git a/modules/home.nix b/modules/home.nix index a934982..2767ee8 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -3,8 +3,7 @@ pkgs, stateVersion, ... -}: -let +}: let wanikani-script = builtins.path { path = ./wanikani-tmux.sh; }; @@ -26,12 +25,10 @@ let description = "Feature packed Dracula theme for tmux!"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ ethancedwards8 ]; + maintainers = with maintainers; [ethancedwards8]; }; }; - -in -{ +in { # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "osbm"; @@ -95,12 +92,12 @@ in { plugin = tmux-dracula; extraConfig = '' - set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" - set -g @dracula-show-left-icon hostname - set -g @dracula-git-show-current-symbol ✓ - set -g @dracula-git-no-repo-message "no-git" - set -g @dracula-show-timezone false - set -g @dracula-ignore-lspci true + set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" + set -g @dracula-show-left-icon hostname + set -g @dracula-git-show-current-symbol ✓ + set -g @dracula-git-no-repo-message "no-git" + set -g @dracula-show-timezone false + set -g @dracula-ignore-lspci true ''; } ]; From 7c1cc7d4c56c7fcd8340c2599da1541937309874 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 18:56:50 +0300 Subject: [PATCH 0436/1768] remove the tempting comment --- modules/common-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 82d2a97..30c558c 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -5,7 +5,6 @@ ... }: { environment.systemPackages = with pkgs; [ - # vim wget git git-lfs From 53cd2ff2230cd68af316a2ce26bec520029f5cbe Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 18:57:18 +0300 Subject: [PATCH 0437/1768] firefox to home manager one day --- modules/firefox.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/firefox.nix b/modules/firefox.nix index f4fa9c7..fc3cbbf 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -72,7 +72,12 @@ in { # run `jq .browser_specific_settings.gecko.id manifest.json` or # `jq .applications.gecko.id manifest.json` to get the UUID }; - + # userChrome = '' + # #tabbrowser-tabs { + # visibility: collapse; + # } + # ''; + # i am the only mf that doesnt use home-manager for firefox config /* ---- PREFERENCES ---- */ From aa9d5e283aae37e79138542a102c97ad887352b5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 19:20:55 +0300 Subject: [PATCH 0438/1768] remove comment --- hosts/pochita/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index e4b3ee3..878d0b4 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -1,4 +1,3 @@ -# This is the SD image initial configuration { config, pkgs, From a11ff1ceb8e2622457e08d33d09c5ceedf39e0c0 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 19:23:25 +0300 Subject: [PATCH 0439/1768] remove system label --- flake.nix | 18 +++++------------- hosts/pochita/configuration.nix | 3 +-- hosts/tartarus/configuration.nix | 3 +-- hosts/ymir/configuration.nix | 1 - 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index facf517..48441d7 100644 --- a/flake.nix +++ b/flake.nix @@ -53,10 +53,11 @@ nixos-hardware, nixpkgs-rpi, ... - }: { - nixosConfigurations = let - system-label = self.shortRev or self.dirtyShortRev or self.lastModified or "unknown"; - in { + }@ inputs: + let + inherit (self) outputs; + in{ + nixosConfigurations = { tartarus = nixpkgs.lib.nixosSystem { modules = [ ./hosts/tartarus/configuration.nix @@ -70,9 +71,6 @@ ]; } ]; - specialArgs = { - inherit system-label; - }; }; ymir = nixpkgs.lib.nixosSystem { modules = [ @@ -87,9 +85,6 @@ ]; } ]; - specialArgs = { - inherit system-label; - }; }; harmonica = nixpkgs.lib.nixosSystem { modules = [ @@ -118,9 +113,6 @@ ]; } ]; - specialArgs = { - inherit system-label; - }; }; pochita-sd = nixpkgs-rpi.lib.nixosSystem { modules = [ diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 878d0b4..2cf3c67 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -2,7 +2,6 @@ config, pkgs, lib, - system-label, ... }: let stateVersion = "25.05"; @@ -59,7 +58,7 @@ in { #kernel-version = "v6_10_12"; }; - system.nixos.label = system-label; + # system.nixos.label = system-label; # DO NOT TOUCH THIS system.stateVersion = stateVersion; } diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index b82884a..75a933f 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -4,7 +4,6 @@ { config, pkgs, - system-label, ... }: let stateVersion = "24.05"; @@ -75,7 +74,7 @@ in { # networking.firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # networking.firewall.enable = false; - system.nixos.label = system-label; + # system.nixos.label = system-label; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 97f2288..a7378aa 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -4,7 +4,6 @@ { config, pkgs, - system-label, ... }: let stateVersion = "25.05"; From 6067232000d5147e3b2ca249d845b1c5e9c25621 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 22:03:11 +0300 Subject: [PATCH 0440/1768] add special args --- flake.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index 48441d7..ab92502 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,7 @@ in{ nixosConfigurations = { tartarus = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default @@ -73,6 +74,7 @@ ]; }; ymir = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs;}; modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default @@ -99,6 +101,7 @@ ]; }; pochita = nixpkgs-rpi.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; modules = [ ./hosts/pochita/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi From 10f8e97557de9ae4e57a10b33bd89de5fd5dce4c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 22:03:22 +0300 Subject: [PATCH 0441/1768] formatting --- flake.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index ab92502..300c317 100644 --- a/flake.nix +++ b/flake.nix @@ -53,13 +53,12 @@ nixos-hardware, nixpkgs-rpi, ... - }@ inputs: - let + } @ inputs: let inherit (self) outputs; - in{ + in { nixosConfigurations = { tartarus = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; + specialArgs = {inherit inputs outputs;}; modules = [ ./hosts/tartarus/configuration.nix vscode-server.nixosModules.default @@ -74,7 +73,7 @@ ]; }; ymir = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs;}; + specialArgs = {inherit inputs outputs;}; modules = [ ./hosts/ymir/configuration.nix vscode-server.nixosModules.default @@ -101,7 +100,7 @@ ]; }; pochita = nixpkgs-rpi.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; + specialArgs = {inherit inputs outputs;}; modules = [ ./hosts/pochita/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi From 8455240ad1223727ac0e00ee39b162dfbdd9985c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 22:39:01 +0300 Subject: [PATCH 0442/1768] dont fucking sleep for 1800 minutes --- modules/wanikani-tmux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wanikani-tmux.sh b/modules/wanikani-tmux.sh index de74d03..8a9b09f 100755 --- a/modules/wanikani-tmux.sh +++ b/modules/wanikani-tmux.sh @@ -18,7 +18,7 @@ main() { get_wanikani # sleep for 30 minutes - sleep 1800m + sleep 1800 } main \ No newline at end of file From 67296189c274c3104b795791553ae769d859ec2d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 23:18:42 +0300 Subject: [PATCH 0443/1768] 10 minutes seem more ideal --- modules/wanikani-tmux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/wanikani-tmux.sh b/modules/wanikani-tmux.sh index 8a9b09f..dc6ffb3 100755 --- a/modules/wanikani-tmux.sh +++ b/modules/wanikani-tmux.sh @@ -17,8 +17,8 @@ get_wanikani() main() { get_wanikani - # sleep for 30 minutes - sleep 1800 + # sleep for 10 minutes + sleep 600 } main \ No newline at end of file From 64fcba43f061d5c9d1c25f58dddd6367f9457941 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 23:46:05 +0300 Subject: [PATCH 0444/1768] simpler flake --- flake.nix | 13 +------------ hosts/ymir/configuration.nix | 7 ++++++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/flake.nix b/flake.nix index 300c317..9b213ba 100644 --- a/flake.nix +++ b/flake.nix @@ -74,18 +74,7 @@ }; ymir = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [ - ./hosts/ymir/configuration.nix - vscode-server.nixosModules.default - agenix.nixosModules.default - home-manager.nixosModules.home-manager - { - environment.systemPackages = [ - agenix.packages.x86_64-linux.default - osbm-nvim.packages.x86_64-linux.default - ]; - } - ]; + modules = [ ./hosts/ymir/configuration.nix ]; }; harmonica = nixpkgs.lib.nixosSystem { modules = [ diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a7378aa..d03f7ad 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -4,6 +4,7 @@ { config, pkgs, + inputs, ... }: let stateVersion = "25.05"; @@ -11,6 +12,9 @@ in { imports = [ ./hardware-configuration.nix ../../modules + inputs.vscode-server.nixosModules.default + inputs.agenix.nixosModules.default + inputs.home-manager.nixosModules.home-manager ]; blockYoutube = false; @@ -140,8 +144,9 @@ in { }; environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. nvidia-container-toolkit + inputs.agenix.packages.x86_64-linux.default + inputs.osbm-nvim.packages.x86_64-linux.default ]; services.ollama = { From 1b1e7f792f6eebd3e505ed7f83f6b07334eed35b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Feb 2025 23:53:13 +0300 Subject: [PATCH 0445/1768] use namespace for my options --- flake.nix | 4 +--- hosts/pochita/configuration.nix | 15 +++++++------ hosts/tartarus/configuration.nix | 14 ++++++------- hosts/ymir/configuration.nix | 14 ++++++------- modules/arduino.nix | 4 ++-- modules/concentration.nix | 36 +++++++++++++++++--------------- modules/fonts.nix | 4 ++-- modules/graphical-interface.nix | 4 ++-- modules/tailscale.nix | 4 ++-- 9 files changed, 49 insertions(+), 50 deletions(-) diff --git a/flake.nix b/flake.nix index 9b213ba..ac0a074 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,7 @@ }; ymir = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [ ./hosts/ymir/configuration.nix ]; + modules = [./hosts/ymir/configuration.nix]; }; harmonica = nixpkgs.lib.nixosSystem { modules = [ @@ -131,7 +131,5 @@ }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; - - description = "My system configuration"; }; } diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 2cf3c67..561fc34 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -21,14 +21,13 @@ in { sshUser = "osbm"; } ]; - - enableKDE = false; - enableFonts = false; - - blockYoutube = false; - blockTwitter = false; - - enableTailscale = true; + myModules = { + enableKDE = false; + enableFonts = false; + blockYoutube = false; + blockTwitter = false; + enableTailscale = true; + }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method programs.firefox.enable = lib.mkForce false; # no need for firefox diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 75a933f..a2efdfa 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -13,13 +13,13 @@ in { ../../modules ]; - blockYoutube = false; - blockTwitter = true; - blockBluesky = false; - - enableKDE = true; - - enableTailscale = true; + myModules = { + blockYoutube = false; + blockTwitter = true; + blockBluesky = false; + enableKDE = true; + enableTailscale = true; + }; boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index d03f7ad..adb87c3 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -17,13 +17,13 @@ in { inputs.home-manager.nixosModules.home-manager ]; - blockYoutube = false; - blockTwitter = true; - blockBluesky = false; - - enableKDE = true; - - enableTailscale = true; + myModules = { + blockYoutube = false; + blockTwitter = true; + blockBluesky = false; + enableKDE = true; + enableTailscale = true; + }; # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/modules/arduino.nix b/modules/arduino.nix index 34a86f6..c3d87c7 100644 --- a/modules/arduino.nix +++ b/modules/arduino.nix @@ -5,7 +5,7 @@ ... }: { options = { - arduinoSetup = lib.mkOption { + myModules.arduinoSetup = lib.mkOption { type = lib.types.bool; default = false; description = "Installs arduino-ide and adafruit-nrfutil and sets udev rules"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.arduinoSetup { + (lib.mkIf config.myModules.arduinoSetup { environment.systemPackages = with pkgs; [ arduino-ide adafruit-nrfutil diff --git a/modules/concentration.nix b/modules/concentration.nix index 9545c58..8bb83aa 100644 --- a/modules/concentration.nix +++ b/modules/concentration.nix @@ -5,25 +5,27 @@ ... }: { options = { - blockYoutube = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Disables youtube using /etc/hosts file"; - }; - blockTwitter = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Disables twitter using /etc/hosts file"; - }; - blockBluesky = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Disables bluesky using /etc/hosts file"; + myModules = { + blockYoutube = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Disables youtube using /etc/hosts file"; + }; + blockTwitter = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Disables twitter using /etc/hosts file"; + }; + blockBluesky = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Disables bluesky using /etc/hosts file"; + }; }; }; config = lib.mkMerge [ - (lib.mkIf config.blockYoutube { + (lib.mkIf config.myModules.blockYoutube { networking.extraHosts = '' 0.0.0.0 youtube.com ::0 youtube.com @@ -32,7 +34,7 @@ ::0 www.youtube.com ''; }) - (lib.mkIf config.blockTwitter { + (lib.mkIf config.myModules.blockTwitter { networking.extraHosts = '' 0.0.0.0 twitter.com ::0 twitter.com @@ -41,7 +43,7 @@ ::0 www.twitter.com ''; }) - (lib.mkIf config.blockBluesky { + (lib.mkIf config.myModules.blockBluesky { networking.extraHosts = '' 0.0.0.0 bsky.app ::0 bsky.app diff --git a/modules/fonts.nix b/modules/fonts.nix index a8907b1..892220e 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -5,7 +5,7 @@ ... }: { options = { - enableFonts = lib.mkOption { + myModules.enableFonts = lib.mkOption { type = lib.types.bool; default = true; description = "Enable my favorite fonts"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.enableFonts { + (lib.mkIf config.myModules.enableFonts { fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index b3ef62d..fb7ed77 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -5,7 +5,7 @@ ... }: { options = { - enableKDE = lib.mkOption { + myModules.enableKDE = lib.mkOption { type = lib.types.bool; default = false; description = "Enable KDE Plasma Desktop Environment with my favorite packages"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.enableKDE { + (lib.mkIf config.myModules.enableKDE { # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = true; diff --git a/modules/tailscale.nix b/modules/tailscale.nix index 0c1a9e7..0037beb 100644 --- a/modules/tailscale.nix +++ b/modules/tailscale.nix @@ -5,7 +5,7 @@ ... }: { options = { - enableTailscale = lib.mkOption { + myModules.enableTailscale = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Tailscale VPN"; @@ -19,7 +19,7 @@ # and i have a laptop named tartarus config = lib.mkMerge [ - (lib.mkIf config.enableTailscale { + (lib.mkIf config.myModules.enableTailscale { services.tailscale = { enable = true; port = 51513; From 65ffcac4a12ee6e58e364d0dc189a374e26e08bf Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:14:40 +0300 Subject: [PATCH 0446/1768] refactor: streamline ISO module imports in flake.nix and configuration.nix --- flake.nix | 5 +---- hosts/iso/configuration.nix | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index ac0a074..928e04f 100644 --- a/flake.nix +++ b/flake.nix @@ -113,10 +113,7 @@ ]; }; myISO = nixpkgs.lib.nixosSystem { - modules = [ - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" - ./hosts/iso/configuration.nix - ]; + modules = [./hosts/iso/configuration.nix]; }; }; homeConfigurations = { diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index aae5c6a..3d61997 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -5,6 +5,10 @@ system, ... }: { + imports = [ + "${pkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + ]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nix.settings.experimental-features = [ "nix-command" From 466d6a96f69f3243525bb59d2224b093a386931c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:16:16 +0300 Subject: [PATCH 0447/1768] why so many comments --- hosts/tartarus/configuration.nix | 27 --------------------------- hosts/ymir/configuration.nix | 13 ------------- 2 files changed, 40 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index a2efdfa..25853a6 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -1,6 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, @@ -38,11 +35,6 @@ in { boot.loader.efi.canTouchEfiVariables = true; networking.hostName = "tartarus"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Enable networking networking.networkmanager.enable = true; @@ -63,24 +55,5 @@ in { environment.systemPackages = with pkgs; [ ]; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - - # List services that you want to enable: - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - # system.nixos.label = system-label; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = stateVersion; # Did you read the comment? } diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index adb87c3..01939d4 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -29,9 +29,7 @@ in { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - #boot.initrd.luks.devices."luks-b84e6223-825f-4944-a6fe-16368b75c6de".device = "/dev/disk/by-uuid/b84e6223-825f-4944-a6fe-16368b75c6de"; networking.hostName = "ymir"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; @@ -39,10 +37,6 @@ in { inherit config pkgs stateVersion; }; - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - # Enable networking networking.networkmanager.enable = true; @@ -154,13 +148,6 @@ in { acceleration = "cuda"; }; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; From 09239008b1da4351862267f5a6188a36282ddbfa Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:35:01 +0300 Subject: [PATCH 0448/1768] i dont intend to seperate my home config from my system config --- flake.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/flake.nix b/flake.nix index 928e04f..3742a34 100644 --- a/flake.nix +++ b/flake.nix @@ -116,16 +116,6 @@ modules = [./hosts/iso/configuration.nix]; }; }; - homeConfigurations = { - # doesnt work because my different systems have different stateVersions - # I dont know how to get the stateVersion from the current host - osbm = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - modules = [./modules/home.nix]; - # get state version from the current hosts' configuration.nix - # specialArgs = { stateVersion = "24.05"; }; - }; - }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; }; From 7e9a24d1fdc50675d3cbe2ef611493af0c82804e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:35:32 +0300 Subject: [PATCH 0449/1768] unnecessary now --- hosts/pochita/configuration.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 561fc34..68e017a 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -3,9 +3,7 @@ pkgs, lib, ... -}: let - stateVersion = "25.05"; -in { +}: { imports = [ ./hardware-configuration.nix ../../modules @@ -57,7 +55,5 @@ in { #kernel-version = "v6_10_12"; }; - # system.nixos.label = system-label; - # DO NOT TOUCH THIS - system.stateVersion = stateVersion; + system.stateVersion = "25.05"; } From 335498476371948fce476bcdd1424fc5c967ea9b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:35:51 +0300 Subject: [PATCH 0450/1768] unnecessary now --- hosts/tartarus/configuration.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 25853a6..f494332 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -2,9 +2,7 @@ config, pkgs, ... -}: let - stateVersion = "24.05"; -in { +}: { imports = [ ./hardware-configuration.nix ../../modules @@ -55,5 +53,5 @@ in { environment.systemPackages = with pkgs; [ ]; - system.stateVersion = stateVersion; # Did you read the comment? + system.stateVersion = "24.05"; # lalalalala } From 749f96536fc1771ffc3bcbb19664a0483e664d70 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:36:11 +0300 Subject: [PATCH 0451/1768] unnecessary now --- hosts/ymir/configuration.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 01939d4..d10c3b5 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -6,9 +6,7 @@ pkgs, inputs, ... -}: let - stateVersion = "25.05"; -in { +}: { imports = [ ./hardware-configuration.nix ../../modules @@ -152,11 +150,5 @@ in { boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = stateVersion; # Did you read the comment? + system.stateVersion = "25.05"; # great taboo of the nixos world } From 8c176c2643e4764775a25a8dc9c6bf841aec9a1e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:41:11 +0300 Subject: [PATCH 0452/1768] infinite recursion? --- flake.nix | 5 ++++- hosts/iso/configuration.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 3742a34..dc2507b 100644 --- a/flake.nix +++ b/flake.nix @@ -113,7 +113,10 @@ ]; }; myISO = nixpkgs.lib.nixosSystem { - modules = [./hosts/iso/configuration.nix]; + modules = [ + ./hosts/iso/configuration.nix + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + ]; }; }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index 3d61997..a0e964c 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -6,7 +6,7 @@ ... }: { imports = [ - "${pkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; From 6cf1be302f02f913f51654a63c07ac1b5d943c79 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:41:36 +0300 Subject: [PATCH 0453/1768] seperate out home config --- home/git.nix | 8 ++ home/home.nix | 21 ++++ home/ssh.nix | 36 +++++++ home/tmux/default.nix | 58 ++++++++++++ {modules => home/tmux}/wanikani-tmux.sh | 0 hosts/pochita/configuration.nix | 4 +- hosts/tartarus/configuration.nix | 4 +- hosts/ymir/configuration.nix | 4 +- modules/home.nix | 121 ------------------------ 9 files changed, 129 insertions(+), 127 deletions(-) create mode 100644 home/git.nix create mode 100644 home/home.nix create mode 100644 home/ssh.nix create mode 100644 home/tmux/default.nix rename {modules => home/tmux}/wanikani-tmux.sh (100%) delete mode 100644 modules/home.nix diff --git a/home/git.nix b/home/git.nix new file mode 100644 index 0000000..5fb1f89 --- /dev/null +++ b/home/git.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + + programs.git = { + enable = true; + userEmail = "osmanfbayram@gmail.com"; + userName = "osbm"; + }; +} \ No newline at end of file diff --git a/home/home.nix b/home/home.nix new file mode 100644 index 0000000..72f1ca1 --- /dev/null +++ b/home/home.nix @@ -0,0 +1,21 @@ +{ + config, + pkgs, + ... +}: { + + imports = [ + ./tmux + ./git.nix + ./ssh.nix + ]; + + home.username = "osbm"; + home.homeDirectory = "/home/osbm"; + + home.packages = [ + # dont install packages here, just use normal nixpkgs + ]; + + home.stateVersion = config.system.stateVersion; +} diff --git a/home/ssh.nix b/home/ssh.nix new file mode 100644 index 0000000..739ec7e --- /dev/null +++ b/home/ssh.nix @@ -0,0 +1,36 @@ +{pkgs, ...}: { + programs.ssh = { + enable = true; + hashKnownHosts = true; + compression = true; + matchBlocks = { + "tartarus" = { + hostname = "192.168.0.4"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + # setEnv = { + # "TERM" = "xterm-256color"; + # }; + # extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). + # "RemoteCommand" = "fish"; + # }; + }; + "ymir" = { + hostname = "192.168.0.2"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + # setEnv = { + # "TERM" = "xterm-256color"; + # }; + # extraOptions = { # TODO fix the damn starship error + # "RemoteCommand" = "fish"; + # }; + }; + "pochita" = { + hostname = "192.168.0.9"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + }; + }; + }; +} \ No newline at end of file diff --git a/home/tmux/default.nix b/home/tmux/default.nix new file mode 100644 index 0000000..98b11bc --- /dev/null +++ b/home/tmux/default.nix @@ -0,0 +1,58 @@ +{ + config, + pkgs, + ... +}: let + wanikani-script = builtins.path { + path = ./wanikani-tmux.sh; + }; + tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { + pluginName = "dracula"; + version = "3.0.0"; + src = pkgs.fetchFromGitHub { + owner = "dracula"; + repo = "tmux"; + rev = "v${version}"; + hash = "sha256-VY4PyaQRwTc6LWhPJg4inrQf5K8+bp0+eqRhR7+Iexk="; + }; + postInstall = '' + # i am adding my custom widget to the plugin here cp the wanikani.sh script to the plugin directory + cp ${wanikani-script} $target/scripts/wanikani.sh + ''; + meta = with pkgs.lib; { + homepage = "https://draculatheme.com/tmux"; + description = "Feature packed Dracula theme for tmux!"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ethancedwards8]; + }; + }; +in { + programs.tmux = { + enable = true; + historyLimit = 100000; + baseIndex = 1; + shortcut = "s"; + mouse = true; + shell = "${pkgs.fish}/bin/fish"; + plugins = with pkgs; [ + tmuxPlugins.sensible + tmuxPlugins.better-mouse-mode + { + plugin = tmux-dracula; + extraConfig = '' + set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" + set -g @dracula-show-left-icon hostname + set -g @dracula-git-show-current-symbol ✓ + set -g @dracula-git-no-repo-message "no-git" + set -g @dracula-show-timezone false + set -g @dracula-ignore-lspci true + ''; + } + ]; + extraConfig = '' + # Automatically renumber windows + set -g renumber-windows on + ''; + }; +} \ No newline at end of file diff --git a/modules/wanikani-tmux.sh b/home/tmux/wanikani-tmux.sh similarity index 100% rename from modules/wanikani-tmux.sh rename to home/tmux/wanikani-tmux.sh diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 68e017a..1731f0f 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -35,8 +35,8 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../modules/home.nix { - inherit config pkgs stateVersion; + home-manager.users.osbm = import ../../home/home.nix { + inherit config pkgs; }; environment.systemPackages = with pkgs; [ diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index f494332..ec600a1 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -21,8 +21,8 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../modules/home.nix { - inherit config pkgs stateVersion; + home-manager.users.osbm = import ../../home/home.nix { + inherit config pkgs; }; virtualisation.virtualbox.host.enable = true; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index d10c3b5..e1ea4ac 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -31,8 +31,8 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../modules/home.nix { - inherit config pkgs stateVersion; + home-manager.users.osbm = import ../../home/home.nix { + inherit config pkgs; }; # Enable networking diff --git a/modules/home.nix b/modules/home.nix deleted file mode 100644 index 2767ee8..0000000 --- a/modules/home.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - config, - pkgs, - stateVersion, - ... -}: let - wanikani-script = builtins.path { - path = ./wanikani-tmux.sh; - }; - tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { - pluginName = "dracula"; - version = "3.0.0"; - src = pkgs.fetchFromGitHub { - owner = "dracula"; - repo = "tmux"; - rev = "v${version}"; - hash = "sha256-VY4PyaQRwTc6LWhPJg4inrQf5K8+bp0+eqRhR7+Iexk="; - }; - postInstall = '' - # i am adding my custom widget to the plugin here cp the wanikani.sh script to the plugin directory - cp ${wanikani-script} $target/scripts/wanikani.sh - ''; - meta = with pkgs.lib; { - homepage = "https://draculatheme.com/tmux"; - description = "Feature packed Dracula theme for tmux!"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ethancedwards8]; - }; - }; -in { - # Home Manager needs a bit of information about you and the - # paths it should manage. - home.username = "osbm"; - home.homeDirectory = "/home/osbm"; - - # Packages that should be installed to the user profile. - home.packages = [ - ]; - - programs.git = { - enable = true; - userEmail = "osmanfbayram@gmail.com"; - userName = "osbm"; - }; - - programs.ssh = { - enable = true; - hashKnownHosts = true; - compression = true; - - matchBlocks = { - "tartarus" = { - hostname = "192.168.0.4"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - # setEnv = { - # "TERM" = "xterm-256color"; - # }; - # extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). - # "RemoteCommand" = "fish"; - # }; - }; - "ymir" = { - hostname = "192.168.0.2"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - # setEnv = { - # "TERM" = "xterm-256color"; - # }; - # extraOptions = { # TODO fix the damn starship error - # "RemoteCommand" = "fish"; - # }; - }; - "pochita" = { - hostname = "192.168.0.9"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - }; - }; - }; - programs.tmux = { - enable = true; - historyLimit = 100000; - baseIndex = 1; - shortcut = "s"; - mouse = true; - shell = "${pkgs.fish}/bin/fish"; - plugins = with pkgs; [ - tmuxPlugins.sensible - tmuxPlugins.better-mouse-mode - { - plugin = tmux-dracula; - extraConfig = '' - set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" - set -g @dracula-show-left-icon hostname - set -g @dracula-git-show-current-symbol ✓ - set -g @dracula-git-no-repo-message "no-git" - set -g @dracula-show-timezone false - set -g @dracula-ignore-lspci true - ''; - } - ]; - extraConfig = '' - # Automatically renumber windows - set -g renumber-windows on - ''; - }; - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # You can update Home Manager without changing this value. See - # the Home Manager release notes for a list of state version - # changes in each release. - home.stateVersion = stateVersion; - - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; -} From 6425d6a27459ae673f9a7ac4aa1ce4e9ede0baac Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 00:42:36 +0300 Subject: [PATCH 0454/1768] formatting --- home/git.nix | 7 +++---- home/home.nix | 1 - home/ssh.nix | 2 +- home/tmux/default.nix | 26 +++++++++++++------------- hosts/iso/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/home/git.nix b/home/git.nix index 5fb1f89..e5e31e4 100644 --- a/home/git.nix +++ b/home/git.nix @@ -1,8 +1,7 @@ {pkgs, ...}: { - - programs.git = { + programs.git = { enable = true; userEmail = "osmanfbayram@gmail.com"; userName = "osbm"; - }; -} \ No newline at end of file + }; +} diff --git a/home/home.nix b/home/home.nix index 72f1ca1..4b1d567 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,7 +3,6 @@ pkgs, ... }: { - imports = [ ./tmux ./git.nix diff --git a/home/ssh.nix b/home/ssh.nix index 739ec7e..b9d3d5c 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -33,4 +33,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 98b11bc..59211e5 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -36,23 +36,23 @@ in { mouse = true; shell = "${pkgs.fish}/bin/fish"; plugins = with pkgs; [ - tmuxPlugins.sensible - tmuxPlugins.better-mouse-mode - { + tmuxPlugins.sensible + tmuxPlugins.better-mouse-mode + { plugin = tmux-dracula; extraConfig = '' - set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" - set -g @dracula-show-left-icon hostname - set -g @dracula-git-show-current-symbol ✓ - set -g @dracula-git-no-repo-message "no-git" - set -g @dracula-show-timezone false - set -g @dracula-ignore-lspci true + set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" + set -g @dracula-show-left-icon hostname + set -g @dracula-git-show-current-symbol ✓ + set -g @dracula-git-no-repo-message "no-git" + set -g @dracula-show-timezone false + set -g @dracula-ignore-lspci true ''; - } + } ]; extraConfig = '' - # Automatically renumber windows - set -g renumber-windows on + # Automatically renumber windows + set -g renumber-windows on ''; }; -} \ No newline at end of file +} diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index a0e964c..a7139a2 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -6,7 +6,6 @@ ... }: { imports = [ - ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index e1ea4ac..a034a4b 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -146,7 +146,6 @@ acceleration = "cuda"; }; - boot.binfmt.emulatedSystems = ["aarch64-linux"]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; From 02893b6035ae3bb37a156b31e74276959b3fb442 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 01:22:33 +0300 Subject: [PATCH 0455/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6537284..b5cca8d 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1738667255, - "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=", + "lastModified": 1738704702, + "narHash": "sha256-aq66AZxs/i4dJNpLF8gQbMg8BFjm92fXjzsuLr7JYYk=", "owner": "nix-community", "repo": "home-manager", - "rev": "7abcf59a365430b36f84eaa452a466b11e469e33", + "rev": "1e47f7101fedd857e561782d00d4cb1f6b69e7df", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { From 181afe262cd01cf206b9016887642c9fe0dfd02d Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 02:44:26 +0300 Subject: [PATCH 0456/1768] no need to mention this in the flake --- flake.nix | 13 +------------ hosts/tartarus/configuration.nix | 6 ++++++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index dc2507b..64f9a49 100644 --- a/flake.nix +++ b/flake.nix @@ -59,18 +59,7 @@ nixosConfigurations = { tartarus = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [ - ./hosts/tartarus/configuration.nix - vscode-server.nixosModules.default - agenix.nixosModules.default - home-manager.nixosModules.home-manager - { - environment.systemPackages = [ - agenix.packages.x86_64-linux.default - osbm-nvim.packages.x86_64-linux.default - ]; - } - ]; + modules = [ ./hosts/tartarus/configuration.nix]; }; ymir = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ec600a1..0b0e42e 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -1,11 +1,15 @@ { config, pkgs, + inputs, ... }: { imports = [ ./hardware-configuration.nix ../../modules + inputs.vscode-server.nixosModules.default + inputs.agenix.nixosModules.default + inputs.home-manager.nixosModules.home-manager ]; myModules = { @@ -51,6 +55,8 @@ hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot environment.systemPackages = with pkgs; [ + inputs.agenix.packages.x86_64-linux.default + inputs.osbm-nvim.packages.x86_64-linux.default ]; system.stateVersion = "24.05"; # lalalalala From a78d016a48fdde790cb668d651a630a64aa7f110 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 02:44:44 +0300 Subject: [PATCH 0457/1768] formatting --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 64f9a49..02fe366 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ nixosConfigurations = { tartarus = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [ ./hosts/tartarus/configuration.nix]; + modules = [./hosts/tartarus/configuration.nix]; }; ymir = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; From 7d6b743ac68c1e2831c6b8fe8512684cdb0bf2f2 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Feb 2025 02:46:01 +0300 Subject: [PATCH 0458/1768] concentrate --- hosts/ymir/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a034a4b..6795ac7 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -16,9 +16,9 @@ ]; myModules = { - blockYoutube = false; + blockYoutube = true; blockTwitter = true; - blockBluesky = false; + blockBluesky = true; enableKDE = true; enableTailscale = true; }; From 5c47bfe155828db317838976155330a070872c52 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Feb 2025 14:09:47 +0300 Subject: [PATCH 0459/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b5cca8d..12ca974 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1738704702, - "narHash": "sha256-aq66AZxs/i4dJNpLF8gQbMg8BFjm92fXjzsuLr7JYYk=", + "lastModified": 1738839606, + "narHash": "sha256-FSTlMH1Wo75sRQYfQAxOwX+clio420ZoeypxtFWoE0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e47f7101fedd857e561782d00d4cb1f6b69e7df", + "rev": "15bd673658c189491cd896f06b3dd8f09bb0dfe4", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1738277753, - "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738638143, - "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738622717, - "narHash": "sha256-XSFbbhN8xdr4qKRFbubXJ3vkSusKSnALf69G9fdGPXE=", + "lastModified": 1738807015, + "narHash": "sha256-cITxk7u1n+if4Lyd5dGmPVZF8usHWuUspGOv65L3FXs=", "owner": "nix-community", "repo": "nixvim", - "rev": "6288354d43ada972480cbd10dc7102637eeafc1e", + "rev": "2ecc5359f804bc98901dee0c95999ac3fa308388", "type": "github" }, "original": { @@ -685,11 +685,11 @@ ] }, "locked": { - "lastModified": 1738070913, - "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { From 674084ea5cb859fc6390969c00544c5d62f140c7 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 14:40:51 +0300 Subject: [PATCH 0460/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 12ca974..0ada2cf 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1738839606, - "narHash": "sha256-FSTlMH1Wo75sRQYfQAxOwX+clio420ZoeypxtFWoE0I=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "15bd673658c189491cd896f06b3dd8f09bb0dfe4", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738807015, - "narHash": "sha256-cITxk7u1n+if4Lyd5dGmPVZF8usHWuUspGOv65L3FXs=", + "lastModified": 1738917768, + "narHash": "sha256-mQ3ysHsEVHVjX5EzRzYG5hrDY0cqP6O7kNlCg6wFA90=", "owner": "nix-community", "repo": "nixvim", - "rev": "2ecc5359f804bc98901dee0c95999ac3fa308388", + "rev": "f2f70b4376874b74d9bae0df2d4bfd5292c1499e", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1737293095, - "narHash": "sha256-3TnrehU2mwEK7iHX+H+1dISUDo2e+ae/O8pFMVyBK7M=", + "lastModified": 1738840225, + "narHash": "sha256-7EDUeRMjChxtGuem08WUtdaOWQR7QsZD4xfc/0tTUEE=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "fdedca413f7f682a6d3f97c61cc5b47afe398765", + "rev": "51696e8089884bf66d3706c4becad1da630ff743", "type": "github" }, "original": { From dcdd843b2598642227f749f0ee4f6034ecea659f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 14:41:09 +0300 Subject: [PATCH 0461/1768] add jellyfin to ymir --- hosts/ymir/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 6795ac7..c030a76 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -23,6 +23,12 @@ enableTailscale = true; }; + services.jellyfin = { + enable = true; + port = 8096; + openFirewall = true; + }; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From 1021d7837167b9fcb6dc1906e708ed0f0d0c5b1e Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 14:41:45 +0300 Subject: [PATCH 0462/1768] remove port not an option --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index c030a76..71eb218 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -25,7 +25,6 @@ services.jellyfin = { enable = true; - port = 8096; openFirewall = true; }; From 3c39b49b0ecce36f519f748c393ae109d0cb9e75 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 15:48:05 +0300 Subject: [PATCH 0463/1768] enable youtube --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 71eb218..98a525f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -16,7 +16,7 @@ ]; myModules = { - blockYoutube = true; + blockYoutube = false; blockTwitter = true; blockBluesky = true; enableKDE = true; From 5d37ced152f5f7c33443130b32bb96d0bb951145 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 15:49:45 +0300 Subject: [PATCH 0464/1768] add jellyfin to ymir --- hosts/ymir/configuration.nix | 5 +---- modules/default.nix | 1 + modules/jellyfin.nix | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 modules/jellyfin.nix diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 98a525f..2738aae 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -21,12 +21,9 @@ blockBluesky = true; enableKDE = true; enableTailscale = true; + enableJellyfin = true; }; - services.jellyfin = { - enable = true; - openFirewall = true; - }; # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 966daaf..5772328 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,6 +7,7 @@ ./fonts.nix ./graphical-interface.nix ./i18n.nix + ./jellyfin.nix ./nix-settings.nix ./secrets.nix ./tailscale.nix diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix new file mode 100644 index 0000000..3a4e391 --- /dev/null +++ b/modules/jellyfin.nix @@ -0,0 +1,29 @@ +{ + config, + pkgs, + ... +}: { + + options = { + myModules.enableJellyfin = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Jellyfin media server"; + }; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableJellyfin { + services.jellyfin = { + enable = true; + openFirewall = true; + + }; + + networking.firewall.allowedTCPPorts = [8096]; + }) + ]; + +} \ No newline at end of file From ac433255a493a4e6f11a4376f07b462c08885dbd Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 15:52:03 +0300 Subject: [PATCH 0465/1768] hotfix --- modules/jellyfin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix index 3a4e391..d208be9 100644 --- a/modules/jellyfin.nix +++ b/modules/jellyfin.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { From b17a9f9754c8dc8f029f6536a4e756471e2a7a8b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 15:56:09 +0300 Subject: [PATCH 0466/1768] formatting and dont creat enable option --- hosts/ymir/configuration.nix | 1 - modules/jellyfin.nix | 15 +++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 2738aae..ebf6350 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -24,7 +24,6 @@ enableJellyfin = true; }; - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix index d208be9..3e9ff1e 100644 --- a/modules/jellyfin.nix +++ b/modules/jellyfin.nix @@ -4,14 +4,11 @@ lib, ... }: { - options = { - myModules.enableJellyfin = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Jellyfin media server"; - }; + myModules.enableJellyfin = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Jellyfin media server"; }; }; @@ -20,11 +17,9 @@ services.jellyfin = { enable = true; openFirewall = true; - }; networking.firewall.allowedTCPPorts = [8096]; }) ]; - -} \ No newline at end of file +} From 552fe8cc551a4192bb486fe8dc484beac80d9548 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 16:45:08 +0300 Subject: [PATCH 0467/1768] change the user of jellyfin --- modules/jellyfin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix index 3e9ff1e..e2f48c5 100644 --- a/modules/jellyfin.nix +++ b/modules/jellyfin.nix @@ -17,6 +17,9 @@ services.jellyfin = { enable = true; openFirewall = true; + user = "osbm"; + group = "users"; + dataDir = "/home/osbm/.local/share/jellyfin"; }; networking.firewall.allowedTCPPorts = [8096]; From 4d7d03248bfc3e7a2f0f031fd71ad27fbdcec8cb Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 17:19:32 +0300 Subject: [PATCH 0468/1768] disable jellyfin for now --- hosts/ymir/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ebf6350..918f325 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -21,7 +21,8 @@ blockBluesky = true; enableKDE = true; enableTailscale = true; - enableJellyfin = true; + # jellyfin is unnecessary for now + enableJellyfin = false; }; # Bootloader. From 2c00c995dd6fe8842148beed8e54fc62665d985f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 22:00:20 +0300 Subject: [PATCH 0469/1768] lets enable gui on pochita --- hosts/pochita/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 1731f0f..84616dd 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -25,11 +25,15 @@ blockYoutube = false; blockTwitter = false; enableTailscale = true; + enableJellyfin = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method programs.firefox.enable = lib.mkForce false; # no need for firefox + # enable hyprland + programs.hyprland.enable = true; + networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" From db9afdbc50d94e8c9e1e437aca86e040f86b204c Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 22:08:44 +0300 Subject: [PATCH 0470/1768] just do it later --- hosts/pochita/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 84616dd..e7d022c 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -25,14 +25,14 @@ blockYoutube = false; blockTwitter = false; enableTailscale = true; - enableJellyfin = true; + # enableJellyfin = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method programs.firefox.enable = lib.mkForce false; # no need for firefox # enable hyprland - programs.hyprland.enable = true; + # programs.hyprland.enable = true; networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" From f9124eb256b45b863223edbcde282bba8d95f847 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Feb 2025 22:19:27 +0300 Subject: [PATCH 0471/1768] i lied --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 918f325..69ff32d 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -22,7 +22,7 @@ enableKDE = true; enableTailscale = true; # jellyfin is unnecessary for now - enableJellyfin = false; + enableJellyfin = true; }; # Bootloader. From 25f0ebf7aea9d15c32fdceb832ca06bb704b8e30 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Feb 2025 16:54:56 +0300 Subject: [PATCH 0472/1768] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 0ada2cf..c66b879 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", + "lastModified": 1739002622, + "narHash": "sha256-PtJV5OYQF7XO6XkDYypsYJS3+OsgYaYSmkO3I/A7lZo=", "owner": "nix-community", "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "947eef9e99c42346cf0aac2bebe1cd94924c173b", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1738961098, + "narHash": "sha256-yWNBf6VDW38tl179FEuJ0qukthVfB02kv+mRsfUsWC0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "a3eaf5e8eca7cab680b964138fb79073704aca75", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738917768, - "narHash": "sha256-mQ3ysHsEVHVjX5EzRzYG5hrDY0cqP6O7kNlCg6wFA90=", + "lastModified": 1738966895, + "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", "owner": "nix-community", "repo": "nixvim", - "rev": "f2f70b4376874b74d9bae0df2d4bfd5292c1499e", + "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1738840225, - "narHash": "sha256-7EDUeRMjChxtGuem08WUtdaOWQR7QsZD4xfc/0tTUEE=", + "lastModified": 1739022815, + "narHash": "sha256-rXrd5lRCxVAcc7xcjGcvHdTZdrNZRBGTpG1KwF/iaPg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "51696e8089884bf66d3706c4becad1da630ff743", + "rev": "1d1a1e95b63ae1471574276ec13cf1e37104de4e", "type": "github" }, "original": { @@ -480,18 +480,18 @@ "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", - "rpi-linux-6_10_12-src": "rpi-linux-6_10_12-src", + "rpi-linux-6_12_11-src": "rpi-linux-6_12_11-src", "rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src", "rpi-linux-stable-src": "rpi-linux-stable-src", "rpicam-apps-src": "rpicam-apps-src", "u-boot-src": "u-boot-src" }, "locked": { - "lastModified": 1736358780, - "narHash": "sha256-t8++2QSK+8Ed506NUmSG588wZKoBkJ+dlDxuFxNAF4Y=", + "lastModified": 1738949424, + "narHash": "sha256-w+OitboChUZUZAn2lFA3YGxUBSz4F5TLqBwEkkEtN+0=", "owner": "nix-community", "repo": "raspberry-pi-nix", - "rev": "628e512d60fa99f8f49e73e39b7cedf9b968c282", + "rev": "f3171167258766def0851915685b9a6e7ca7e96e", "type": "github" }, "original": { @@ -564,19 +564,19 @@ "type": "github" } }, - "rpi-linux-6_10_12-src": { + "rpi-linux-6_12_11-src": { "flake": false, "locked": { - "lastModified": 1728305462, - "narHash": "sha256-LtvNmGD1D5YYv+C9xxxddAeHw69o3OX/H9M7F663L74=", + "lastModified": 1738149451, + "narHash": "sha256-NGmZcaC2vlewTEV/p0z2+6PWnHB229dkGui45kI8HOE=", "owner": "raspberrypi", "repo": "linux", - "rev": "26ee50d56618c2d98100b1bc672fd201aed4d00f", + "rev": "fab655ee33e6d647da5996c5548cfd7d43447a53", "type": "github" }, "original": { "owner": "raspberrypi", - "ref": "rpi-6.10.y", + "ref": "rpi-6.12.y", "repo": "linux", "type": "github" } From c5e57b70d786d3b6b0100feba9ef1a9dfb6c15a1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Feb 2025 17:38:30 +0300 Subject: [PATCH 0473/1768] add iso build recipe --- justfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index 854d63d..6299020 100644 --- a/justfile +++ b/justfile @@ -29,4 +29,7 @@ collect-garbage: sudo nix-collect-garbage --delete-older-than 3d build-sd-image-harmonica: check-git - nix build -L .#nixosConfigurations.harmonica.config.system.build.sdImage \ No newline at end of file + nix build -L .#nixosConfigurations.harmonica.config.system.build.sdImage + +build-iso: check-git + nix build -L .#nixosConfigurations.myISO.config.system.build.isoImage From 40533661ffd63503de1e999b771c3d87d8da9af5 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Feb 2025 13:49:20 +0300 Subject: [PATCH 0474/1768] update flake.lock and remove blender --- flake.lock | 12 ++++++------ modules/graphical-interface.nix | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index c66b879..3f5552f 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739002622, - "narHash": "sha256-PtJV5OYQF7XO6XkDYypsYJS3+OsgYaYSmkO3I/A7lZo=", + "lastModified": 1739051380, + "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "947eef9e99c42346cf0aac2bebe1cd94924c173b", + "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738961098, - "narHash": "sha256-yWNBf6VDW38tl179FEuJ0qukthVfB02kv+mRsfUsWC0=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3eaf5e8eca7cab680b964138fb79073704aca75", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index fb7ed77..73f0f1e 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -42,7 +42,6 @@ obsidian mpv libreoffice - blender gimp kitty obs-studio From aac4a9f0936a8afef3ce87b5bb3076160f0a84e6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Feb 2025 22:09:34 +0300 Subject: [PATCH 0475/1768] bashrc --- home/bash.nix | 10 ++++++++++ home/home.nix | 1 + 2 files changed, 11 insertions(+) create mode 100644 home/bash.nix diff --git a/home/bash.nix b/home/bash.nix new file mode 100644 index 0000000..b29a484 --- /dev/null +++ b/home/bash.nix @@ -0,0 +1,10 @@ +{pkgs, ...}: { + programs.bash = { + enable = true; + bashrcExtra = '' + if [ "dumb" == "$TERM" ] ; then + export TERM=xterm-256color + fi + ''; + }; +} diff --git a/home/home.nix b/home/home.nix index 4b1d567..3f3d993 100644 --- a/home/home.nix +++ b/home/home.nix @@ -7,6 +7,7 @@ ./tmux ./git.nix ./ssh.nix + ./bash.nix ]; home.username = "osbm"; From 788ab922ea4e0e51a5bf37782a5d3e57b1974787 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Feb 2025 22:10:27 +0300 Subject: [PATCH 0476/1768] add tailscale inputs --- home/ssh.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/home/ssh.nix b/home/ssh.nix index b9d3d5c..9a9f806 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -31,6 +31,21 @@ user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; }; + "pochita-tailscale" = { + hostname = "pochita.curl-boga.ts.net"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + }; + "ymir-tailscale" = { + hostname = "ymir.curl-boga.ts.net"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + }; + "tartarus-tailscale" = { + hostname = "tartarus.curl-boga.ts.net"; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + }; }; }; } From a6fccaf727faef9d0ecd6b1f450d18f7a2aca282 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Feb 2025 22:28:26 +0300 Subject: [PATCH 0477/1768] update git config --- home/git.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/home/git.nix b/home/git.nix index e5e31e4..86dcbff 100644 --- a/home/git.nix +++ b/home/git.nix @@ -3,5 +3,34 @@ enable = true; userEmail = "osmanfbayram@gmail.com"; userName = "osbm"; + ignores = [ + "*.pyc" # python + "*.swp" # vim + "__pycache__" # python + ".DS_Store" # macOS + "result" # nix + "node_modules" # node + ]; + extraConfig = { + credential = { + helper = "store"; + }; + core = { + editor = "vim"; + pager = "cat"; + }; + init = { + defaultBranch = "main"; + }; + http = { + postBuffer = "1048576000"; + }; + https = { + postBuffer = "1048576000"; + }; + push = { + autoSetupRemote = true; + }; + } }; } From fb8f31fe1bf84a41313927a7f7664786b918aae6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Feb 2025 22:28:56 +0300 Subject: [PATCH 0478/1768] hotfix --- home/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/git.nix b/home/git.nix index 86dcbff..d858ccc 100644 --- a/home/git.nix +++ b/home/git.nix @@ -31,6 +31,6 @@ push = { autoSetupRemote = true; }; - } + }; }; } From b13a33bf8c54b57d5c54ab700d47f103b3a0e729 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Feb 2025 22:31:27 +0300 Subject: [PATCH 0479/1768] these need to be int --- home/git.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/git.nix b/home/git.nix index d858ccc..a2407d1 100644 --- a/home/git.nix +++ b/home/git.nix @@ -23,10 +23,10 @@ defaultBranch = "main"; }; http = { - postBuffer = "1048576000"; + postBuffer = 1048576000; }; https = { - postBuffer = "1048576000"; + postBuffer = 1048576000; }; push = { autoSetupRemote = true; From dcf87e342cafe885c062a6898108fffd8f760568 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Feb 2025 22:49:54 +0300 Subject: [PATCH 0480/1768] add tlrc config --- home/home.nix | 1 + home/tlrc.nix | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 home/tlrc.nix diff --git a/home/home.nix b/home/home.nix index 3f3d993..d168b81 100644 --- a/home/home.nix +++ b/home/home.nix @@ -8,6 +8,7 @@ ./git.nix ./ssh.nix ./bash.nix + ./tlrc.nix ]; home.username = "osbm"; diff --git a/home/tlrc.nix b/home/tlrc.nix new file mode 100644 index 0000000..4489595 --- /dev/null +++ b/home/tlrc.nix @@ -0,0 +1,90 @@ +{ pkgs, config, ... }: +# stolen from https://github.com/dmarcoux/dotfiles +{ + home.packages = [ pkgs.tlrc ]; + xdg.configFile."tlrc/config.toml".text = '' + [cache] + dir = "${config.xdg.cacheHome}/tlrc" + mirror = "https://github.com/tldr-pages/tldr/releases/latest/download" + auto_update = true + max_age = 336 + languages = ["en", "tr", "ja"] + + [output] + show_title = false + platform_title = false + show_hyphens = false + example_prefix = "- " + compact = true + raw_markdown = false + + [indent] + title = 2 + description = 2 + bullet = 2 + example = 4 + + [style.title] + color = "magenta" + background = "default" + bold = true + underline = false + italic = false + dim = false + strikethrough = false + + [style.description] + color = "magenta" + background = "default" + bold = false + underline = false + italic = false + dim = false + strikethrough = false + + [style.bullet] + color = "green" + background = "default" + bold = false + underline = false + italic = false + dim = false + strikethrough = false + + [style.example] + color = "cyan" + background = "default" + bold = false + underline = false + italic = false + dim = false + strikethrough = false + + [style.url] + color = "red" + background = "default" + bold = false + underline = false + italic = true + dim = false + strikethrough = false + + [style.inline_code] + color = "yellow" + background = "default" + bold = false + underline = false + italic = true + dim = false + strikethrough = false + + [style.placeholder] + color = "red" + background = "default" + bold = false + underline = false + italic = true + dim = false + strikethrough = false + ''; +} \ No newline at end of file From 04ba0934a1f3d00bd287e528c41f2e5b87bbb1b8 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Feb 2025 16:13:28 +0300 Subject: [PATCH 0481/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3f5552f..3ac5364 100644 --- a/flake.lock +++ b/flake.lock @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738966895, - "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", + "lastModified": 1739121491, + "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", + "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", "type": "github" }, "original": { From 40c4f838b09a7179051a5236eb13b8568f3fd1f5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 17:52:44 +0300 Subject: [PATCH 0482/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3ac5364..d5d4016 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739051380, - "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", + "lastModified": 1739233400, + "narHash": "sha256-fldFwXHP9Ndy/ADMDWNTpfWNsLdhZ8PP4DQyr1Igfo4=", "owner": "nix-community", "repo": "home-manager", - "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", + "rev": "ba4a1a110204c27805d1a1b5c8b24b3a0da4d063", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1739022815, - "narHash": "sha256-rXrd5lRCxVAcc7xcjGcvHdTZdrNZRBGTpG1KwF/iaPg=", + "lastModified": 1739193223, + "narHash": "sha256-o7sO/R0sdOAY1KwMRjKIgsIjhYPPXnmecQokzQ6BVfs=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "1d1a1e95b63ae1471574276ec13cf1e37104de4e", + "rev": "e2633c0e3c3e4624d1a419fb7e9de992a1fc8c55", "type": "github" }, "original": { From ff6a101b35d6997b104623bdfd4e6759582b1ffd Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 19:21:11 +0300 Subject: [PATCH 0483/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d5d4016..f7e799f 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739233400, - "narHash": "sha256-fldFwXHP9Ndy/ADMDWNTpfWNsLdhZ8PP4DQyr1Igfo4=", + "lastModified": 1739287084, + "narHash": "sha256-CtRNJsqsXIArJV+AKWZVBMO8PD1FQB69br+WMtTJEgI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ba4a1a110204c27805d1a1b5c8b24b3a0da4d063", + "rev": "8f351726c5841d86854e7fa6003ea472352f5208", "type": "github" }, "original": { From b82235b34c73e1bd6886ea1989230fc3743f30bf Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 19:25:59 +0300 Subject: [PATCH 0484/1768] formatting --- home/tlrc.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/home/tlrc.nix b/home/tlrc.nix index 4489595..af7f3f1 100644 --- a/home/tlrc.nix +++ b/home/tlrc.nix @@ -1,7 +1,11 @@ -{ pkgs, config, ... }: +{ + pkgs, + config, + ... +}: # stolen from https://github.com/dmarcoux/dotfiles { - home.packages = [ pkgs.tlrc ]; + home.packages = [pkgs.tlrc]; xdg.configFile."tlrc/config.toml".text = '' [cache] dir = "${config.xdg.cacheHome}/tlrc" @@ -87,4 +91,4 @@ dim = false strikethrough = false ''; -} \ No newline at end of file +} From 39ede21a89427492edd5c2f2a03ecdeb3304d4d5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 19:26:25 +0300 Subject: [PATCH 0485/1768] this is better than waiting for a solution --- hosts/ymir/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 69ff32d..e125f54 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -1,6 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). { config, pkgs, @@ -61,6 +58,9 @@ programs.nix-required-mounts.enable = true; programs.nix-required-mounts.presets.nvidia-gpu.enable = true; + # TODO: this ugly thing is necessary until this issue is resolved + # https://github.com/NixOS/nixpkgs/issues/380601 + nix.settings.system-features = ["nixos-test" "benchmark" "big-parallel" "kvm" "gpu" "nvidia-gpu" "opengl" "cuda"]; hardware.graphics = { enable = true; From 93b8218e46b88d8d20dfc7ef661f1235702d316a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 19:35:56 +0300 Subject: [PATCH 0486/1768] update justfile --- justfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index 6299020..468480a 100644 --- a/justfile +++ b/justfile @@ -11,9 +11,12 @@ build *args: check-git nvd diff /run/current-system ./result [linux] -switch *args: check-git +switch *args: check-git check sudo nixos-rebuild switch --accept-flake-config --flake . {{args}} |& nom +test: + nh os test . + update: nix flake update From a3fa8203dbb3ce47b6e7a249577b2a2a804759f7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 22:16:56 +0300 Subject: [PATCH 0487/1768] make emulation a module --- hosts/tartarus/configuration.nix | 3 +-- hosts/ymir/configuration.nix | 4 +--- modules/default.nix | 1 + modules/emulation.nix | 21 +++++++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 modules/emulation.nix diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 0b0e42e..36a93e0 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -18,10 +18,9 @@ blockBluesky = false; enableKDE = true; enableTailscale = true; + enableAarch64Emulation = true; }; - boot.binfmt.emulatedSystems = ["aarch64-linux"]; - nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index e125f54..a012c14 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -20,6 +20,7 @@ enableTailscale = true; # jellyfin is unnecessary for now enableJellyfin = true; + enableAarch64Emulation = true; }; # Bootloader. @@ -148,8 +149,5 @@ acceleration = "cuda"; }; - boot.binfmt.emulatedSystems = ["aarch64-linux"]; - nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - system.stateVersion = "25.05"; # great taboo of the nixos world } diff --git a/modules/default.nix b/modules/default.nix index 5772328..2992dcc 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,6 +3,7 @@ ./arduino.nix ./common-packages.nix ./concentration.nix + ./emulation.nix ./firefox.nix ./fonts.nix ./graphical-interface.nix diff --git a/modules/emulation.nix b/modules/emulation.nix new file mode 100644 index 0000000..7e26754 --- /dev/null +++ b/modules/emulation.nix @@ -0,0 +1,21 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + myModules.enableAarch64Emulation = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Aarch64 emulation"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableAarch64Emulation { + boot.binfmt.emulatedSystems = ["aarch64-linux"]; + nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; + }) + ]; +} From 270088d902c0d0e011e567e728a6ab4b61a9aa88 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 22:21:58 +0300 Subject: [PATCH 0488/1768] make disabling hibernation into a module --- hosts/ymir/configuration.nix | 21 +----------------- modules/default.nix | 1 + modules/disable-hibernation.nix | 39 +++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 modules/disable-hibernation.nix diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a012c14..d38e531 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -21,6 +21,7 @@ # jellyfin is unnecessary for now enableJellyfin = true; enableAarch64Emulation = true; + disableHibernation = true; }; # Bootloader. @@ -117,26 +118,6 @@ #media-session.enable = true; }; - systemd = { - targets = { - sleep = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - suspend = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - hibernate = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - "hybrid-sleep" = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - }; - }; environment.systemPackages = with pkgs; [ nvidia-container-toolkit diff --git a/modules/default.nix b/modules/default.nix index 2992dcc..b09c7ac 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,6 +3,7 @@ ./arduino.nix ./common-packages.nix ./concentration.nix + ./disable-hibernation.nix ./emulation.nix ./firefox.nix ./fonts.nix diff --git a/modules/disable-hibernation.nix b/modules/disable-hibernation.nix new file mode 100644 index 0000000..2a05350 --- /dev/null +++ b/modules/disable-hibernation.nix @@ -0,0 +1,39 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + myModules.disableHibernation = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Disable hibernation"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.disableHibernation { + systemd = { + targets = { + sleep = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + suspend = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + hibernate = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + "hybrid-sleep" = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + }; + }; + }) + ]; +} From 069e9662fb78628108820fcc036597a17b22a267 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 22:22:22 +0300 Subject: [PATCH 0489/1768] formatting --- hosts/tartarus/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - modules/disable-hibernation.nix | 40 ++++++++++++++++---------------- modules/emulation.nix | 6 ++--- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 36a93e0..f82958d 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -21,7 +21,6 @@ enableAarch64Emulation = true; }; - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ../../home/home.nix { diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index d38e531..67f71a7 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -118,7 +118,6 @@ #media-session.enable = true; }; - environment.systemPackages = with pkgs; [ nvidia-container-toolkit inputs.agenix.packages.x86_64-linux.default diff --git a/modules/disable-hibernation.nix b/modules/disable-hibernation.nix index 2a05350..67e6c56 100644 --- a/modules/disable-hibernation.nix +++ b/modules/disable-hibernation.nix @@ -14,26 +14,26 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.disableHibernation { - systemd = { - targets = { - sleep = { - enable = false; - unitConfig.DefaultDependencies = "no"; + systemd = { + targets = { + sleep = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + suspend = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + hibernate = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + "hybrid-sleep" = { + enable = false; + unitConfig.DefaultDependencies = "no"; + }; + }; }; - suspend = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - hibernate = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - "hybrid-sleep" = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - }; - }; }) - ]; + ]; } diff --git a/modules/emulation.nix b/modules/emulation.nix index 7e26754..2c19254 100644 --- a/modules/emulation.nix +++ b/modules/emulation.nix @@ -14,8 +14,8 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableAarch64Emulation { - boot.binfmt.emulatedSystems = ["aarch64-linux"]; - nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; + boot.binfmt.emulatedSystems = ["aarch64-linux"]; + nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; }) - ]; + ]; } From d630dcb877f4bd02f8bca828fe23718389931ef5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Feb 2025 22:29:25 +0300 Subject: [PATCH 0490/1768] make wol into a module --- hosts/ymir/configuration.nix | 17 +---------------- modules/default.nix | 1 + modules/wake-on-lan.nix | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 modules/wake-on-lan.nix diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 67f71a7..7ea69cd 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -22,6 +22,7 @@ enableJellyfin = true; enableAarch64Emulation = true; disableHibernation = true; + enableWakeOnLan = true; }; # Bootloader. @@ -39,25 +40,9 @@ # Enable networking networking.networkmanager.enable = true; - networking.interfaces.enp3s0.wakeOnLan.enable = true; - # The services doesn't actually work atm, define an additional service - # see https://github.com/NixOS/nixpkgs/issues/91352 - systemd.services.wakeonlan = { - description = "Reenable wake on lan every boot"; - after = ["network.target"]; - serviceConfig = { - Type = "simple"; - RemainAfterExit = "true"; - ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp3s0 wol g"; - }; - wantedBy = ["default.target"]; - }; - hardware.nvidia-container-toolkit.enable = true; - # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; # Enable OpenGL - programs.nix-required-mounts.enable = true; programs.nix-required-mounts.presets.nvidia-gpu.enable = true; # TODO: this ugly thing is necessary until this issue is resolved diff --git a/modules/default.nix b/modules/default.nix index b09c7ac..541af36 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -14,5 +14,6 @@ ./secrets.nix ./tailscale.nix ./users.nix + ./wake-on-lan.nix ]; } diff --git a/modules/wake-on-lan.nix b/modules/wake-on-lan.nix new file mode 100644 index 0000000..fa1b0d5 --- /dev/null +++ b/modules/wake-on-lan.nix @@ -0,0 +1,32 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + myModules.enableWakeOnLan = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Wake on LAN"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableWakeOnLan { + networking.interfaces.enp3s0.wakeOnLan.enable = true; + # The services doesn't actually work atm, define an additional service + # see https://github.com/NixOS/nixpkgs/issues/91352 + systemd.services.wakeonlan = { + description = "Reenable wake on lan every boot"; + after = ["network.target"]; + serviceConfig = { + Type = "simple"; + RemainAfterExit = "true"; + ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp3s0 wol g"; + }; + wantedBy = ["default.target"]; + }; + }) + ]; +} From dabbac4c4b796897333b5ffb2eaa6c2d243d7e5b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Feb 2025 00:38:56 +0300 Subject: [PATCH 0491/1768] make sound stuff into a module --- hosts/tartarus/configuration.nix | 11 +---------- hosts/ymir/configuration.nix | 17 +---------------- modules/default.nix | 1 + modules/sound.nix | 28 ++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 modules/sound.nix diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index f82958d..473fee4 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -19,6 +19,7 @@ enableKDE = true; enableTailscale = true; enableAarch64Emulation = true; + enableSound = true; }; home-manager.useGlobalPkgs = true; @@ -39,16 +40,6 @@ # Enable networking networking.networkmanager.enable = true; - # Enable sound with pipewire. - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 7ea69cd..3a9202b 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -23,6 +23,7 @@ enableAarch64Emulation = true; disableHibernation = true; enableWakeOnLan = true; + enableSound = true; }; # Bootloader. @@ -87,22 +88,6 @@ package = config.boot.kernelPackages.nvidiaPackages.beta; }; - # Enable sound with pipewire. - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - environment.systemPackages = with pkgs; [ nvidia-container-toolkit inputs.agenix.packages.x86_64-linux.default diff --git a/modules/default.nix b/modules/default.nix index 541af36..b3afe0f 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -12,6 +12,7 @@ ./jellyfin.nix ./nix-settings.nix ./secrets.nix + ./sound.nix ./tailscale.nix ./users.nix ./wake-on-lan.nix diff --git a/modules/sound.nix b/modules/sound.nix new file mode 100644 index 0000000..6c4b379 --- /dev/null +++ b/modules/sound.nix @@ -0,0 +1,28 @@ +{ + pkgs, + lib, + config, + ... +}: { + options = { + myModules.enableSound = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable sound with pipewire."; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableFonts { + # Enable sound with pipewire. + services.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + }) + ]; +} From f65e47231f301c822174ff6d9275933a031b82c7 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Feb 2025 01:20:18 +0300 Subject: [PATCH 0492/1768] I pray this doesnt cause any trouble for me --- modules/users.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/users.nix b/modules/users.nix index 6acc7c6..46677d3 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -8,7 +8,7 @@ osbm = { isNormalUser = true; description = "osbm"; - initialPassword = "changeme"; + initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; extraGroups = ["networkmanager" "wheel" "docker"]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" @@ -19,10 +19,11 @@ bayram = { isNormalUser = true; description = "bayram"; - initialPassword = "changeme"; + initialHashedPassword = "$6$IamAbigfailure$3BP231DVwbqUtZ.mq33nM/JitBrT2u26Y25VpsfBwhZbezMHz4XbySrOMnaMcCYdsb3wZFL3Ppcp0L.R8nonT."; extraGroups = ["networkmanager"]; packages = with pkgs; [ ]; }; + root.initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; }; } From 6f8ecf6242b49f5e26d7b0c89b666b009052b74b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Feb 2025 01:31:41 +0300 Subject: [PATCH 0493/1768] try another firefox instance --- flake.lock | 6 +++--- home/firefox.nix | 9 +++++++++ home/home.nix | 1 + modules/default.nix | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 home/firefox.nix diff --git a/flake.lock b/flake.lock index f7e799f..5967914 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739287084, - "narHash": "sha256-CtRNJsqsXIArJV+AKWZVBMO8PD1FQB69br+WMtTJEgI=", + "lastModified": 1739298825, + "narHash": "sha256-q9CzTY7n8n9RK9mKUQ4VbaKdydhXQqzphahEG5Wt8sI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f351726c5841d86854e7fa6003ea472352f5208", + "rev": "f0a31d38e6de48970ce1fe93e6ea343e20a9c80a", "type": "github" }, "original": { diff --git a/home/firefox.nix b/home/firefox.nix new file mode 100644 index 0000000..e3c10fc --- /dev/null +++ b/home/firefox.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + programs.firefox = { + enable = true; + profiles.osbm = { + id = 0; + name = "osbm"; + }; + }; +} \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index d168b81..0814726 100644 --- a/home/home.nix +++ b/home/home.nix @@ -9,6 +9,7 @@ ./ssh.nix ./bash.nix ./tlrc.nix + ./firefox.nix ]; home.username = "osbm"; diff --git a/modules/default.nix b/modules/default.nix index b3afe0f..ad2ab8c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,7 +5,7 @@ ./concentration.nix ./disable-hibernation.nix ./emulation.nix - ./firefox.nix + # ./firefox.nix ./fonts.nix ./graphical-interface.nix ./i18n.nix From dd06a9a041182df5b58b2394b706d706c2fc11bc Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Feb 2025 01:49:26 +0300 Subject: [PATCH 0494/1768] add all options to firefox --- home/firefox.nix | 91 +++++++++++++++++++++++++++++++++++++++++++++--- justfile | 1 + 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/home/firefox.nix b/home/firefox.nix index e3c10fc..c2bc4ef 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,9 +1,92 @@ {pkgs, ...}: { programs.firefox = { enable = true; - profiles.osbm = { - id = 0; - name = "osbm"; + languagePacks = [ + "ja" + "tr" + "en-US" + ]; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + }; + # DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + StartPage = "previous-session"; + # OverrideFirstRunPage = ""; + # OverridePostUpdatePage = ""; + # DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" + # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + # SearchBar = "unified"; # alternat + ExtensionSettings = with builtins; let + extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; + }; + }; + in + listToAttrs [ + (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") + (extension "ublock-origin" "uBlock0@raymondhill.net") + (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") + (extension "motivation-new-tab" "") + (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") + + # (extension "tabliss" "extension@tabliss.io") + # (extension "umatrix" "uMatrix@raymondhill.net") + # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") + # (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") + ]; + # To add additional extensions, find it on addons.mozilla.org, find + # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) + # Then, download the XPI by filling it in to the install_url template, unzip it, + # run `jq .browser_specific_settings.gecko.id manifest.json` or + # `jq .applications.gecko.id manifest.json` to get the UUID + }; + profiles.default = { + id = 0; + name = "osbm"; + + + userChrome = '' + #tabbrowser-tabs { + visibility: collapse; + } + ''; + settings = { + # "Open previous windows and tabs" + "browser.startup.page" = 3; + "browser.contentblocking.category" = true; + "extensions.pocket.enabled" = false; + "extensions.screenshots.disabled" = true; + "browser.topsites.contile.enabled" = false; + "browser.formfill.enable" = false; + "browser.search.suggest.enabled" = false; + "browser.search.suggest.enabled.private" = false; + "browser.urlbar.suggest.searches" = false; + "browser.urlbar.showSearchSuggestionsFirst" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.snippets" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "ui.key.menuAccessKeyFocuses" = false; + }; }; }; -} \ No newline at end of file +} diff --git a/justfile b/justfile index 468480a..0584069 100644 --- a/justfile +++ b/justfile @@ -13,6 +13,7 @@ build *args: check-git [linux] switch *args: check-git check sudo nixos-rebuild switch --accept-flake-config --flake . {{args}} |& nom + # sudo nh os test: nh os test . From 72acf62bbe7a18a04b5885b8a8dc9549c45d4516 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Feb 2025 01:56:33 +0300 Subject: [PATCH 0495/1768] formatting --- home/firefox.nix | 93 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/home/firefox.nix b/home/firefox.nix index c2bc4ef..4c20aca 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -6,58 +6,57 @@ "tr" "en-US" ]; - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - EnableTrackingProtection = { - Value = true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - }; - # DisablePocket = true; - DisableFirefoxAccounts = true; - DisableAccounts = true; - DisableFirefoxScreenshots = true; - StartPage = "previous-session"; - # OverrideFirstRunPage = ""; - # OverridePostUpdatePage = ""; - # DontCheckDefaultBrowser = true; - DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" - # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" - # SearchBar = "unified"; # alternat - ExtensionSettings = with builtins; let - extension = shortId: uuid: { - name = uuid; - value = { - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; - }; - }; - in - listToAttrs [ - (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") - (extension "ublock-origin" "uBlock0@raymondhill.net") - (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") - (extension "motivation-new-tab" "") - (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") - - # (extension "tabliss" "extension@tabliss.io") - # (extension "umatrix" "uMatrix@raymondhill.net") - # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") - # (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") - ]; - # To add additional extensions, find it on addons.mozilla.org, find - # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) - # Then, download the XPI by filling it in to the install_url template, unzip it, - # run `jq .browser_specific_settings.gecko.id manifest.json` or - # `jq .applications.gecko.id manifest.json` to get the UUID + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; }; + # DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + StartPage = "previous-session"; + # OverrideFirstRunPage = ""; + # OverridePostUpdatePage = ""; + # DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" + # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + # SearchBar = "unified"; # alternat + ExtensionSettings = with builtins; let + extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; + }; + }; + in + listToAttrs [ + (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") + (extension "ublock-origin" "uBlock0@raymondhill.net") + (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") + (extension "motivation-new-tab" "") + (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") + + # (extension "tabliss" "extension@tabliss.io") + # (extension "umatrix" "uMatrix@raymondhill.net") + # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") + # (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") + ]; + # To add additional extensions, find it on addons.mozilla.org, find + # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) + # Then, download the XPI by filling it in to the install_url template, unzip it, + # run `jq .browser_specific_settings.gecko.id manifest.json` or + # `jq .applications.gecko.id manifest.json` to get the UUID + }; profiles.default = { id = 0; name = "osbm"; - userChrome = '' #tabbrowser-tabs { visibility: collapse; From 38449b87d80dc1bbaed708c86b6f0625ef67aa1f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Feb 2025 18:55:08 +0300 Subject: [PATCH 0496/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5967914..542b6f4 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739298825, - "narHash": "sha256-q9CzTY7n8n9RK9mKUQ4VbaKdydhXQqzphahEG5Wt8sI=", + "lastModified": 1739314552, + "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f0a31d38e6de48970ce1fe93e6ea343e20a9c80a", + "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739121491, - "narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=", + "lastModified": 1739353096, + "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", "owner": "nix-community", "repo": "nixvim", - "rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a", + "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", "type": "github" }, "original": { From 08cabc39de956326b1529ffb199b75760963bf8e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Feb 2025 02:03:03 +0300 Subject: [PATCH 0497/1768] add new wanikani scripts --- home/tmux/default.nix | 12 ++++--- ...ni-tmux.sh => wanikani-current-reviews.sh} | 7 +--- home/tmux/wanikani-level.sh | 23 ++++++++++++ home/tmux/wanikani-progression.sh | 35 +++++++++++++++++++ 4 files changed, 66 insertions(+), 11 deletions(-) rename home/tmux/{wanikani-tmux.sh => wanikani-current-reviews.sh} (56%) create mode 100755 home/tmux/wanikani-level.sh create mode 100755 home/tmux/wanikani-progression.sh diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 59211e5..2378bce 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -3,9 +3,9 @@ pkgs, ... }: let - wanikani-script = builtins.path { - path = ./wanikani-tmux.sh; - }; + wanikani-current-reviews-script = builtins.path { path = ./scripts/wanikani-current-reviews.sh; }; + wanikani-level-script = builtins.path { path = ./scripts/wanikani-level.sh; }; + wanikani-progression-script = builtins.path { path = ./scripts/wanikani-progression.sh; }; tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { pluginName = "dracula"; version = "3.0.0"; @@ -17,7 +17,9 @@ }; postInstall = '' # i am adding my custom widget to the plugin here cp the wanikani.sh script to the plugin directory - cp ${wanikani-script} $target/scripts/wanikani.sh + cp ${wanikani-current-reviews-script} $target/scripts/wanikani-current-reviews.sh + cp ${wanikani-level-script} $target/scripts/wanikani-level.sh + cp ${wanikani-progression-script} $target/scripts/wanikani-progression.sh ''; meta = with pkgs.lib; { homepage = "https://draculatheme.com/tmux"; @@ -41,7 +43,7 @@ in { { plugin = tmux-dracula; extraConfig = '' - set -g @dracula-plugins "custom:wanikani.sh cpu-usage ram-usage gpu-usage battery time" + set -g @dracula-plugins "custom:wanikani-level.sh custom:wanikani-progression.sh custom:wanikani-current-reviews.sh cpu-usage ram-usage gpu-usage battery" set -g @dracula-show-left-icon hostname set -g @dracula-git-show-current-symbol ✓ set -g @dracula-git-no-repo-message "no-git" diff --git a/home/tmux/wanikani-tmux.sh b/home/tmux/wanikani-current-reviews.sh similarity index 56% rename from home/tmux/wanikani-tmux.sh rename to home/tmux/wanikani-current-reviews.sh index dc6ffb3..a6a4b59 100755 --- a/home/tmux/wanikani-tmux.sh +++ b/home/tmux/wanikani-current-reviews.sh @@ -1,17 +1,12 @@ #!/usr/bin/env bash #!nix-shell -i bash -p jq curl -# Description: This script is used to display the current WaniKani review count in the tmux status bar. - -# curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count' - -# lets store the output of the above command in a variable get_wanikani() { wanikani_reviews=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count') wanikani_lessons=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq '.total_count') - echo "WaniKani: $wanikani_reviews reviews, $wanikani_lessons lessons" + echo "$wanikani_reviews reviews $wanikani_lessons lessons" } main() diff --git a/home/tmux/wanikani-level.sh b/home/tmux/wanikani-level.sh new file mode 100755 index 0000000..bdb5f8c --- /dev/null +++ b/home/tmux/wanikani-level.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +#!nix-shell -i bash -p jq curl + +get_wanikani() +{ + wanikani_level_data=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/level_progressions") + wanikani_level=$(echo $wanikani_level_data | jq '.data[-1].data.level') + wanikani_level_start_date_string=$(echo $wanikani_level_data | jq '.data[-1].data.started_at') + wanikani_level_start_timestamp=$(date -d "${wanikani_level_start_date_string//\"/}" +%s) + current_timestamp=$(date +%s) + difference=$((current_timestamp - wanikani_level_start_timestamp)) + wanikani_level_creation_date=$((difference / 86400)) + echo "At $wanikani_level for $wanikani_level_creation_date days" +} + +main() +{ + get_wanikani + # sleep for 1 hour + sleep 3600 +} + +main \ No newline at end of file diff --git a/home/tmux/wanikani-progression.sh b/home/tmux/wanikani-progression.sh new file mode 100755 index 0000000..d1ba173 --- /dev/null +++ b/home/tmux/wanikani-progression.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +#!nix-shell -i bash -p jq curl python312 + +get_wanikani() +{ + all_subjects=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/subjects") + total_subjects=$(echo $all_subjects | jq '.total_count') + + total=0 + for i in {0..9} + do + srs_level=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?srs_stages=$i" | jq '.total_count') + # echo "SRS level $i: $srs_level" + multiplied=$((srs_level * (i + 1))) + # echo "SRS level $i multiplied: $multiplied" + total=$((total + multiplied)) + # echo "Total: $total" + done + + # now i need the percentage of (total/(total_subjects*10)) + # python will be used for this and i need the result to be %23.234 + python_command="python3 -c 'print(f\"{$total/$total_subjects*10:.3f}\")'" + # echo "Python command: $python_command" + percentage=$(nix-shell -p python312 --run "$python_command") + echo "%$percentage" +} + +main() +{ + get_wanikani + # sleep for 1 hour + sleep 3600 +} + +main \ No newline at end of file From b2a80a9f963ea3f04e9ca6d462a5a39eb9c95165 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Feb 2025 02:05:36 +0300 Subject: [PATCH 0498/1768] hotfix --- home/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 2378bce..3e4de79 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -3,9 +3,9 @@ pkgs, ... }: let - wanikani-current-reviews-script = builtins.path { path = ./scripts/wanikani-current-reviews.sh; }; - wanikani-level-script = builtins.path { path = ./scripts/wanikani-level.sh; }; - wanikani-progression-script = builtins.path { path = ./scripts/wanikani-progression.sh; }; + wanikani-current-reviews-script = builtins.path { path = ./wanikani-current-reviews.sh; }; + wanikani-level-script = builtins.path { path = ./wanikani-level.sh; }; + wanikani-progression-script = builtins.path { path = ./wanikani-progression.sh; }; tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { pluginName = "dracula"; version = "3.0.0"; From 1ed72b16c1f15f217b2c6e8f99bb68429fcde53e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Feb 2025 03:00:41 +0300 Subject: [PATCH 0499/1768] formatting --- home/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 3e4de79..847b3b6 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -3,9 +3,9 @@ pkgs, ... }: let - wanikani-current-reviews-script = builtins.path { path = ./wanikani-current-reviews.sh; }; - wanikani-level-script = builtins.path { path = ./wanikani-level.sh; }; - wanikani-progression-script = builtins.path { path = ./wanikani-progression.sh; }; + wanikani-current-reviews-script = builtins.path {path = ./wanikani-current-reviews.sh;}; + wanikani-level-script = builtins.path {path = ./wanikani-level.sh;}; + wanikani-progression-script = builtins.path {path = ./wanikani-progression.sh;}; tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { pluginName = "dracula"; version = "3.0.0"; From 743e8b75b96e3bcad0ca54236007782d002b15e7 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Feb 2025 16:46:59 +0300 Subject: [PATCH 0500/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 542b6f4..72b318a 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739314552, - "narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=", + "lastModified": 1739416022, + "narHash": "sha256-Af1CIT+XlXEb+Dk11sgPDzJoOUiada2Xoj5hA8TBvLY=", "owner": "nix-community", "repo": "home-manager", - "rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd", + "rev": "c9d343cfa0565671cc7e8d5aefebaf61cc840abd", "type": "github" }, "original": { From dcf59804f6b28479ecf643a1fda915831720fdaa Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Feb 2025 20:08:51 +0300 Subject: [PATCH 0501/1768] same old --- hosts/ymir/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 3a9202b..1ebdc9d 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -13,9 +13,9 @@ ]; myModules = { - blockYoutube = false; + blockYoutube = true; blockTwitter = true; - blockBluesky = true; + blockBluesky = false; enableKDE = true; enableTailscale = true; # jellyfin is unnecessary for now From 29fb479f21054262a3eb17492de50d0c2032e7fe Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Feb 2025 23:43:10 +0300 Subject: [PATCH 0502/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 72b318a..f6e3060 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739416022, - "narHash": "sha256-Af1CIT+XlXEb+Dk11sgPDzJoOUiada2Xoj5hA8TBvLY=", + "lastModified": 1739470101, + "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c9d343cfa0565671cc7e8d5aefebaf61cc840abd", + "rev": "5031c6d2978109336637977c165f82aa49fa16a7", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739353096, - "narHash": "sha256-w/T2uYCoq4k6K46GX2CMGWsKfMvcqnxC41LIgnvGifE=", + "lastModified": 1739469954, + "narHash": "sha256-faUXxkM3yYm++fpEw02tbAgPJprVB0xOtrU87BEQkuI=", "owner": "nix-community", "repo": "nixvim", - "rev": "78b6f8e1e5b37a7789216e17a96ebc117660f0e7", + "rev": "7f29e4b2ae34c1ba5fe650d74c8f28b0d1fa21ee", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1739193223, - "narHash": "sha256-o7sO/R0sdOAY1KwMRjKIgsIjhYPPXnmecQokzQ6BVfs=", + "lastModified": 1739454426, + "narHash": "sha256-CMCoft86Akcy1Xkycm77tNyZ1/PkeWmyBUNNREE8hH8=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "e2633c0e3c3e4624d1a419fb7e9de992a1fc8c55", + "rev": "d5efd47b9d61a19db6a855706ebd73afae7bf3c3", "type": "github" }, "original": { From 9405d081f36520f2aeeb6ce1616cc996c2e0fc30 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Feb 2025 13:50:18 +0300 Subject: [PATCH 0503/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f6e3060..bc8a33a 100644 --- a/flake.lock +++ b/flake.lock @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739469954, - "narHash": "sha256-faUXxkM3yYm++fpEw02tbAgPJprVB0xOtrU87BEQkuI=", + "lastModified": 1739527837, + "narHash": "sha256-dsb5iSthp5zCWhdV0aXPunFSCkS0pCvRXMMgTEFjzew=", "owner": "nix-community", "repo": "nixvim", - "rev": "7f29e4b2ae34c1ba5fe650d74c8f28b0d1fa21ee", + "rev": "a39e0a651657046f3b936d842147fa51523b6818", "type": "github" }, "original": { From 7a3115f590b9b759576030bc7fa56da98dd8e7f5 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Feb 2025 13:51:22 +0300 Subject: [PATCH 0504/1768] update justfile --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index 0584069..ba7b3ae 100644 --- a/justfile +++ b/justfile @@ -12,8 +12,8 @@ build *args: check-git [linux] switch *args: check-git check - sudo nixos-rebuild switch --accept-flake-config --flake . {{args}} |& nom - # sudo nh os + # sudo nixos-rebuild switch --accept-flake-config --flake . {{args}} |& nom + nh os switch . test: nh os test . From 752ba3eb6d62d88223c2466a40f4baac675d3c7b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Feb 2025 14:04:05 +0300 Subject: [PATCH 0505/1768] enable configuration hash label --- modules/nix-settings.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index b462893..031eba8 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, lib, config, @@ -37,4 +38,7 @@ # disable the database error TODO add nix-index search programs.command-not-found.enable = false; + + system.configurationRevision = inputs.self.rev or "dirty"; + #system.nixos.label = } From fc1cede863c79a0775aa9791229bb4f5b144af53 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Feb 2025 18:58:45 +0300 Subject: [PATCH 0506/1768] update harmonica os label --- hosts/harmonica/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index ad65e61..8089104 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -20,7 +20,7 @@ nixpkgs.hostPlatform = "aarch64-linux"; # ! Need a trusted user for deploy-rs. nix.settings.trusted-users = ["@wheel"]; - system.stateVersion = "24.11"; + system.stateVersion = "25.05"; zramSwap = { enable = true; From 0a843253fc831547b3285fbb40ccdca050cf16d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 15 Feb 2025 14:33:20 +0300 Subject: [PATCH 0507/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bc8a33a..c8bb69d 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1739571712, + "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1739454426, - "narHash": "sha256-CMCoft86Akcy1Xkycm77tNyZ1/PkeWmyBUNNREE8hH8=", + "lastModified": 1739578812, + "narHash": "sha256-mAdRXygyMkbfzfIqW2o/sGskX6Utb46Dh73BJ8RxkCw=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "d5efd47b9d61a19db6a855706ebd73afae7bf3c3", + "rev": "a38608489079d4a876ea8774fb59ad5b9e53c803", "type": "github" }, "original": { From dc952bd5bdb280eddaa5bb2ffa04bfbb56ace5ce Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:14:05 +0300 Subject: [PATCH 0508/1768] add nixd --- hosts/tartarus/configuration.nix | 1 + hosts/ymir/configuration.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 473fee4..814b0a2 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -46,6 +46,7 @@ environment.systemPackages = with pkgs; [ inputs.agenix.packages.x86_64-linux.default inputs.osbm-nvim.packages.x86_64-linux.default + nixd ]; system.stateVersion = "24.05"; # lalalalala diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 1ebdc9d..ebb1de6 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -92,6 +92,7 @@ nvidia-container-toolkit inputs.agenix.packages.x86_64-linux.default inputs.osbm-nvim.packages.x86_64-linux.default + nixd ]; services.ollama = { From 0ba4cbb6993a271f4461754108528989aaa965b8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:23:40 +0300 Subject: [PATCH 0509/1768] weird af error --- home/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/git.nix b/home/git.nix index a2407d1..2a61360 100644 --- a/home/git.nix +++ b/home/git.nix @@ -3,6 +3,7 @@ enable = true; userEmail = "osmanfbayram@gmail.com"; userName = "osbm"; + signing.format = "ssh"; ignores = [ "*.pyc" # python "*.swp" # vim From 7499da1897958d6f583a5884f5b285e4b47b6d6b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:25:43 +0300 Subject: [PATCH 0510/1768] agenix module --- hosts/tartarus/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - modules/common-packages.nix | 1 - modules/secrets.nix | 49 +++++++++++++++++++++++--------- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 814b0a2..2bad20b 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -44,7 +44,6 @@ hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot environment.systemPackages = with pkgs; [ - inputs.agenix.packages.x86_64-linux.default inputs.osbm-nvim.packages.x86_64-linux.default nixd ]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ebb1de6..ea87433 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -90,7 +90,6 @@ environment.systemPackages = with pkgs; [ nvidia-container-toolkit - inputs.agenix.packages.x86_64-linux.default inputs.osbm-nvim.packages.x86_64-linux.default nixd ]; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 30c558c..a7d4ac5 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -30,7 +30,6 @@ lolcat cmatrix inxi - age jq onefetch just diff --git a/modules/secrets.nix b/modules/secrets.nix index 84fe2a2..73dcbbf 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -1,17 +1,40 @@ { - age.secrets = { - network-manager.file = ../secrets/network-manager.age; - ssh-key-private = { - file = ../secrets/ssh-key-private.age; - path = "/home/osbm/.ssh/id_ed25519"; - owner = "osbm"; - mode = "0600"; - }; - ssh-key-public = { - file = ../secrets/ssh-key-public.age; - path = "/home/osbm/.ssh/id_ed25519.pub"; - owner = "osbm"; - mode = "0644"; + config, + pkgs, + inputs, + lib, + ... +}: { + options = { + myModules.enableSecrets = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable agenix secrets management"; }; }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableSecrets { + environment.systemPackages = with pkgs; [ + inputs.agenix.packages.x86_64-linux.default + age + ]; + + age.secrets = { + network-manager.file = ../secrets/network-manager.age; + ssh-key-private = { + file = ../secrets/ssh-key-private.age; + path = "/home/osbm/.ssh/id_ed25519"; + owner = "osbm"; + mode = "0600"; + }; + ssh-key-public = { + file = ../secrets/ssh-key-public.age; + path = "/home/osbm/.ssh/id_ed25519.pub"; + owner = "osbm"; + mode = "0644"; + }; + }; + }) + ]; } From a0ae3ed3b7f0093bbf12ecc568e8205dcc8f077f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:36:38 +0300 Subject: [PATCH 0511/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c8bb69d..2f57f04 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739571712, - "narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=", + "lastModified": 1739658904, + "narHash": "sha256-2o/JuD6qD0CtPNVvdPNL3bEDFITaSfSLceajHcIzmw4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", + "rev": "45c07fcf7d28b5fb3ee189c260dee0a2e4d14317", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739527837, - "narHash": "sha256-dsb5iSthp5zCWhdV0aXPunFSCkS0pCvRXMMgTEFjzew=", + "lastModified": 1739632145, + "narHash": "sha256-maNBjf9whO303r4+8ekfAZOrf3sHnw6DLiSph5xnXJw=", "owner": "nix-community", "repo": "nixvim", - "rev": "a39e0a651657046f3b936d842147fa51523b6818", + "rev": "b8c55873998948bf14a2b6cf30f9ad5ecdf79818", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1739578812, - "narHash": "sha256-mAdRXygyMkbfzfIqW2o/sGskX6Utb46Dh73BJ8RxkCw=", + "lastModified": 1739662473, + "narHash": "sha256-40Ti01kBHxB6/WxBz1fGM+G/sqMFb75+MTbyfnFDxYM=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "a38608489079d4a876ea8774fb59ad5b9e53c803", + "rev": "9ba62e343e7f9c8309fd011a235474b3ce125a9d", "type": "github" }, "original": { From 70ec48d33b53825fc55c282fb246c9f73a577961 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 02:36:56 +0300 Subject: [PATCH 0512/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2f57f04..733801c 100644 --- a/flake.lock +++ b/flake.lock @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1739662473, - "narHash": "sha256-40Ti01kBHxB6/WxBz1fGM+G/sqMFb75+MTbyfnFDxYM=", + "lastModified": 1739662608, + "narHash": "sha256-NqU8k8RKU4ZBjVBCKm7L5s6+6TO+eXwV/2+WVjprQ10=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "9ba62e343e7f9c8309fd011a235474b3ce125a9d", + "rev": "c7deb01578dec435c0dbc3a9a50789fd96b03ebe", "type": "github" }, "original": { From c38d70e6e7a1ee36e01b07c608dfd5211475abdb Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 19:45:50 +0300 Subject: [PATCH 0513/1768] dont check when switching --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index ba7b3ae..a8cdedc 100644 --- a/justfile +++ b/justfile @@ -11,7 +11,7 @@ build *args: check-git nvd diff /run/current-system ./result [linux] -switch *args: check-git check +switch *args: check-git # sudo nixos-rebuild switch --accept-flake-config --flake . {{args}} |& nom nh os switch . From e573cd99eefcbdd0b3f69d11762b69e5477b8ee8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 19:58:13 +0300 Subject: [PATCH 0514/1768] make it work on all platforms --- modules/secrets.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/secrets.nix b/modules/secrets.nix index 73dcbbf..5f4af4b 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -15,9 +15,9 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableSecrets { - environment.systemPackages = with pkgs; [ - inputs.agenix.packages.x86_64-linux.default - age + environment.systemPackages = [ + inputs.agenix.packages.${pkgs.hostPlatform.system}.agenix + pkgs.age ]; age.secrets = { From 765c12af9014a594aab9a71f24722850915b123c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 21:21:24 +0300 Subject: [PATCH 0515/1768] formatting --- modules/nix-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 031eba8..a8d2266 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -39,6 +39,6 @@ # disable the database error TODO add nix-index search programs.command-not-found.enable = false; - system.configurationRevision = inputs.self.rev or "dirty"; - #system.nixos.label = + system.configurationRevision = inputs.self.rev or "dirty"; + #system.nixos.label = } From 3e9215ae535b4b6eef7fca697fac6f9bbde46ff6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 21:21:41 +0300 Subject: [PATCH 0516/1768] show whitespaces --- home/git.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/git.nix b/home/git.nix index 2a61360..ce16fd3 100644 --- a/home/git.nix +++ b/home/git.nix @@ -20,6 +20,9 @@ editor = "vim"; pager = "cat"; }; + diff = { + wsErrorHighlight = "all"; + }; init = { defaultBranch = "main"; }; From b73d0807be033144a6b1006f9cc668ef56665663 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 23:37:24 +0300 Subject: [PATCH 0517/1768] remove unused things --- home/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/git.nix b/home/git.nix index ce16fd3..063b155 100644 --- a/home/git.nix +++ b/home/git.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ programs.git = { enable = true; userEmail = "osmanfbayram@gmail.com"; From a8ee31b452e335cc20842ed4bd7a65df04199116 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Feb 2025 23:38:05 +0300 Subject: [PATCH 0518/1768] remove unused args --- home/home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 0814726..55c623c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,6 +1,5 @@ { config, - pkgs, ... }: { imports = [ From 3fa90f7a47d26fa881e66d66f424eb3c768a6a38 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 17 Feb 2025 23:49:06 +0300 Subject: [PATCH 0519/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 733801c..07a9576 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739658904, - "narHash": "sha256-2o/JuD6qD0CtPNVvdPNL3bEDFITaSfSLceajHcIzmw4=", + "lastModified": 1739823458, + "narHash": "sha256-uHjpcdlWKrZEJxsGdlMRTe4jlMYAnNsjRxPSTrNMFvo=", "owner": "nix-community", "repo": "home-manager", - "rev": "45c07fcf7d28b5fb3ee189c260dee0a2e4d14317", + "rev": "6c93eea85daddd0dc8d4a3a687473461f3122961", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739632145, - "narHash": "sha256-maNBjf9whO303r4+8ekfAZOrf3sHnw6DLiSph5xnXJw=", + "lastModified": 1739751913, + "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8c55873998948bf14a2b6cf30f9ad5ecdf79818", + "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1739662608, - "narHash": "sha256-NqU8k8RKU4ZBjVBCKm7L5s6+6TO+eXwV/2+WVjprQ10=", + "lastModified": 1739662923, + "narHash": "sha256-4kjVala4lYnjhLWQQfJdT2RFwMdFLOqY017688lx6cw=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "c7deb01578dec435c0dbc3a9a50789fd96b03ebe", + "rev": "9d60e67d07c1f5fa81e1708a1ac38320a0a9cf6f", "type": "github" }, "original": { From be5359c46d1a13f2a6a999ad81f9bc7f83c78b1a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 13:38:43 +0300 Subject: [PATCH 0520/1768] update lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 07a9576..c0261c4 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739823458, - "narHash": "sha256-uHjpcdlWKrZEJxsGdlMRTe4jlMYAnNsjRxPSTrNMFvo=", + "lastModified": 1739845242, + "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "6c93eea85daddd0dc8d4a3a687473461f3122961", + "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", "type": "github" }, "original": { From 2ce70e4de7f727c13a4ad5ba33e4e85af4353151 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 19:17:25 +0300 Subject: [PATCH 0521/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c0261c4..46c0535 100644 --- a/flake.lock +++ b/flake.lock @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1739662923, - "narHash": "sha256-4kjVala4lYnjhLWQQfJdT2RFwMdFLOqY017688lx6cw=", + "lastModified": 1739877399, + "narHash": "sha256-ER8kgDpw/CUWwrkH6xSHMg7B4FVFZW5jdAZsor1X35A=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "9d60e67d07c1f5fa81e1708a1ac38320a0a9cf6f", + "rev": "4d580248edabe065adab6c793e62b10d3c6fa469", "type": "github" }, "original": { From d7b6bffb2ba4cdf2ed134c640caefb1428dbf9da Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 19:17:57 +0300 Subject: [PATCH 0522/1768] enable waydroid --- hosts/ymir/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ea87433..35e493f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -38,6 +38,8 @@ inherit config pkgs; }; + services.waydroid.enable = true; + # Enable networking networking.networkmanager.enable = true; From c0b05bb3f98e23f27aa6838cd823869e77877e98 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 19:19:11 +0300 Subject: [PATCH 0523/1768] enable waydroid hotfix --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 35e493f..5ebfa6a 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -38,7 +38,7 @@ inherit config pkgs; }; - services.waydroid.enable = true; + virtualisation.waydroid.enable = true; # Enable networking networking.networkmanager.enable = true; From 088565575c2f6960aeb3ccb26d858d8138491783 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 19:23:01 +0300 Subject: [PATCH 0524/1768] disable waydroid --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 5ebfa6a..51503d9 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -38,7 +38,6 @@ inherit config pkgs; }; - virtualisation.waydroid.enable = true; # Enable networking networking.networkmanager.enable = true; From 1f1008730530dd11f76e5589c9ef8d66a4f805b4 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 20:13:36 +0300 Subject: [PATCH 0525/1768] add phone config --- flake.lock | 166 ++++++++++++++++++++++++++++++++- flake.nix | 11 +++ hosts/atreus/configuration.nix | 50 ++++++++++ 3 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 hosts/atreus/configuration.nix diff --git a/flake.lock b/flake.lock index 46c0535..8f9fd25 100644 --- a/flake.lock +++ b/flake.lock @@ -207,6 +207,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709445365, + "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -291,13 +312,39 @@ } }, "nix-formatter-pack": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs" + ], + "nmd": [ + "nix-on-droid", + "nmd" + ], + "nmt": "nmt" + }, + "locked": { + "lastModified": 1705252799, + "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", + "type": "github" + }, + "original": { + "owner": "Gerschtli", + "repo": "nix-formatter-pack", + "type": "github" + } + }, + "nix-formatter-pack_2": { "inputs": { "nixpkgs": [ "osbm-nvim", "nixpkgs" ], - "nmd": "nmd", - "nmt": "nmt" + "nmd": "nmd_2", + "nmt": "nmt_2" }, "locked": { "lastModified": 1734904675, @@ -313,6 +360,32 @@ "type": "github" } }, + "nix-on-droid": { + "inputs": { + "home-manager": "home-manager_2", + "nix-formatter-pack": "nix-formatter-pack", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-docs": "nixpkgs-docs", + "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", + "nmd": "nmd" + }, + "locked": { + "lastModified": 1725658585, + "narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=", + "owner": "nix-community", + "repo": "nix-on-droid", + "rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "nix-on-droid", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1739798439, @@ -345,6 +418,38 @@ "type": "github" } }, + "nixpkgs-docs": { + "locked": { + "lastModified": 1705957679, + "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-for-bootstrap": { + "locked": { + "lastModified": 1720244366, + "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", + "type": "github" + } + }, "nixpkgs-rpi": { "locked": { "lastModified": 1736883708, @@ -392,6 +497,28 @@ } }, "nmd": { + "inputs": { + "nixpkgs": [ + "nix-on-droid", + "nixpkgs-docs" + ], + "scss-reset": "scss-reset" + }, + "locked": { + "lastModified": 1705050560, + "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", + "owner": "~rycee", + "repo": "nmd", + "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", + "type": "sourcehut" + }, + "original": { + "owner": "~rycee", + "repo": "nmd", + "type": "sourcehut" + } + }, + "nmd_2": { "flake": false, "locked": { "lastModified": 1666190571, @@ -423,6 +550,22 @@ "type": "gitlab" } }, + "nmt_2": { + "flake": false, + "locked": { + "lastModified": 1648075362, + "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", + "owner": "rycee", + "repo": "nmt", + "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", + "type": "gitlab" + }, + "original": { + "owner": "rycee", + "repo": "nmt", + "type": "gitlab" + } + }, "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", @@ -448,7 +591,7 @@ }, "osbm-nvim": { "inputs": { - "nix-formatter-pack": "nix-formatter-pack", + "nix-formatter-pack": "nix-formatter-pack_2", "nixpkgs": [ "nixpkgs" ], @@ -504,6 +647,7 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager", + "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-rpi": "nixpkgs-rpi", @@ -632,6 +776,22 @@ "type": "github" } }, + "scss-reset": { + "flake": false, + "locked": { + "lastModified": 1631450058, + "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", + "owner": "andreymatin", + "repo": "scss-reset", + "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", + "type": "github" + }, + "original": { + "owner": "andreymatin", + "repo": "scss-reset", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 02fe366..801ed45 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; + nix-on-droid = { + url = "github:nix-community/nix-on-droid/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; osbm-nvim = { url = "github:osbm/osbm-nvim"; inputs.nixpkgs.follows = "nixpkgs"; @@ -52,6 +56,7 @@ raspberry-pi-nix, nixos-hardware, nixpkgs-rpi, + nix-on-droid, ... } @ inputs: let inherit (self) outputs; @@ -108,6 +113,12 @@ ]; }; }; + nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { + specialArgs = {inherit inputs outputs;}; + pkgs = import nixpkgs { system = "aarch64-linux"; }; + modules = [./hosts/atreus/configuration.nix]; + }; + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; }; diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix new file mode 100644 index 0000000..6c46b4c --- /dev/null +++ b/hosts/atreus/configuration.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: + +{ + user.userName = "osbm"; + # Simply install just the packages + environment.packages = with pkgs; [ + # User-facing stuff that you really really want to have + vim # or some other editor, e.g. nano or neovim + + # Some common stuff that people expect to have + #procps + #killall + #diffutils + findutils + utillinux + #tzdata + hostname + man + gnugrep + #gnupg + #gnused + #gnutar + #bzip2 + #gzip + #xz + zip + unzip + fish + tmux + nano + ripgrep + tailscale + git + openssh + ]; + + # Backup etc files instead of failing to activate generation if a file already exists in /etc + environment.etcBackupExtension = ".bak"; + + # Read the changelog before changing this value + system.stateVersion = "24.05"; + #services.openssh.enable=true; + # Set up nix for flakes + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + + # Set your time zone + #time.timeZone = "Europe/Berlin"; +} \ No newline at end of file From e99522a9c9c74839dc49dca926de2b954110eb58 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 20:19:10 +0300 Subject: [PATCH 0526/1768] try extraSpecial --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 801ed45..0f6e3ca 100644 --- a/flake.nix +++ b/flake.nix @@ -114,7 +114,7 @@ }; }; nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - specialArgs = {inherit inputs outputs;}; + extraSpecialArgs = {inherit inputs outputs;}; pkgs = import nixpkgs { system = "aarch64-linux"; }; modules = [./hosts/atreus/configuration.nix]; }; From 829d5ac5f05b055ca94c4dec6d6926e654466f3e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 20:20:38 +0300 Subject: [PATCH 0527/1768] try forcing username --- hosts/atreus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 6c46b4c..1abf1de 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - user.userName = "osbm"; + user.userName = lib.mkForce "osbm"; # Simply install just the packages environment.packages = with pkgs; [ # User-facing stuff that you really really want to have From 188cdafff33d5bf80a30767412bc3e6d6a96fdb9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 20:25:51 +0300 Subject: [PATCH 0528/1768] dont just set username for now --- hosts/atreus/configuration.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 1abf1de..51e3867 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -1,10 +1,8 @@ { config, lib, pkgs, ... }: { - user.userName = lib.mkForce "osbm"; - # Simply install just the packages + # user.userName = lib.mkForce "osbm"; # fuck i hate unmaintained projects environment.packages = with pkgs; [ - # User-facing stuff that you really really want to have vim # or some other editor, e.g. nano or neovim # Some common stuff that people expect to have @@ -13,7 +11,7 @@ #diffutils findutils utillinux - #tzdata + tzdata hostname man gnugrep From 8a604d7547112c7f38228b1bfa34e976807bd86b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 20:42:29 +0300 Subject: [PATCH 0529/1768] add just recipe for nix-on-droid --- hosts/atreus/configuration.nix | 2 +- justfile | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 51e3867..c21dbb7 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -27,9 +27,9 @@ tmux nano ripgrep - tailscale git openssh + just ]; # Backup etc files instead of failing to activate generation if a file already exists in /etc diff --git a/justfile b/justfile index a8cdedc..4c0f386 100644 --- a/justfile +++ b/justfile @@ -12,8 +12,12 @@ build *args: check-git [linux] switch *args: check-git - # sudo nixos-rebuild switch --accept-flake-config --flake . {{args}} |& nom - nh os switch . + if [[ "$(hostname)" == "nix-on-droid" ]]; then + nix-on-droid switch --flake . + else + nh os switch . + fi + test: nh os test . From 78150c16782e9a908ed3d863395a4a803a8a5796 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 20:50:49 +0300 Subject: [PATCH 0530/1768] add shebang to recipe --- justfile | 1 + 1 file changed, 1 insertion(+) diff --git a/justfile b/justfile index 4c0f386..3c5c16e 100644 --- a/justfile +++ b/justfile @@ -12,6 +12,7 @@ build *args: check-git [linux] switch *args: check-git + #!/usr/bin/env sh if [[ "$(hostname)" == "nix-on-droid" ]]; then nix-on-droid switch --flake . else From 4651b57a37044051c6f3936365f498bb3026c891 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 20:53:15 +0300 Subject: [PATCH 0531/1768] add nh --- hosts/atreus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index c21dbb7..d2732c9 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -30,6 +30,7 @@ git openssh just + nh ]; # Backup etc files instead of failing to activate generation if a file already exists in /etc From 536b4f844947119661d6807c9f2486b64d0ec56b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 22:09:41 +0300 Subject: [PATCH 0532/1768] add phone to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9f6243a..8d4140f 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Here i have 4 machines and 1 sd card image that i maintain. - Desktop **ymir** (beast, my most prized possesion as of now) - Raspberry Pi 5 **pochita** (a server that i experiment with) - Raspberry Pi 5 SD image **pochita-sd** (produces an sd image that could be used to flash the sd card of a rpi-5) +- Phone **atreus** (unrooted, nix-on-droid) + I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) From c2d3cd72749343ae61b7bbff59410a23317723c0 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 22:35:45 +0300 Subject: [PATCH 0533/1768] formatting --- flake.nix | 2 +- home/home.nix | 5 +---- hosts/atreus/configuration.nix | 9 ++++++--- hosts/ymir/configuration.nix | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 0f6e3ca..553bfb7 100644 --- a/flake.nix +++ b/flake.nix @@ -115,7 +115,7 @@ }; nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { extraSpecialArgs = {inherit inputs outputs;}; - pkgs = import nixpkgs { system = "aarch64-linux"; }; + pkgs = import nixpkgs {system = "aarch64-linux";}; modules = [./hosts/atreus/configuration.nix]; }; diff --git a/home/home.nix b/home/home.nix index 55c623c..93f7d00 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,7 +1,4 @@ -{ - config, - ... -}: { +{config, ...}: { imports = [ ./tmux ./git.nix diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index d2732c9..a00170f 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -1,6 +1,9 @@ -{ config, lib, pkgs, ... }: - { + config, + lib, + pkgs, + ... +}: { # user.userName = lib.mkForce "osbm"; # fuck i hate unmaintained projects environment.packages = with pkgs; [ vim # or some other editor, e.g. nano or neovim @@ -46,4 +49,4 @@ # Set your time zone #time.timeZone = "Europe/Berlin"; -} \ No newline at end of file +} diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 51503d9..ea87433 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -38,7 +38,6 @@ inherit config pkgs; }; - # Enable networking networking.networkmanager.enable = true; From a4badfb206e28497acdd7e0dfec80a4bac86a498 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 22:40:44 +0300 Subject: [PATCH 0534/1768] update flake.lock --- flake.lock | 16 ++++++++-------- flake.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8f9fd25..c562da7 100644 --- a/flake.lock +++ b/flake.lock @@ -372,15 +372,15 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1725658585, - "narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=", - "owner": "nix-community", + "lastModified": 1739907588, + "narHash": "sha256-1UjLSRRW+bkQafH5JEtMiBCld+ye0SEhIwuCv5Gx19k=", + "owner": "osbm", "repo": "nix-on-droid", - "rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc", + "rev": "d9a5f852ebceb55bc9b083cbc490e3ed525bea79", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "osbm", "ref": "master", "repo": "nix-on-droid", "type": "github" @@ -483,11 +483,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739751913, - "narHash": "sha256-H72wNdLOl9CzfimXjDdKWnV0Mr8lpVF4m3HZ2m+fuck=", + "lastModified": 1739902813, + "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a66c8a33001d8bd79388c6b15eb1039f43f4192", + "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 553bfb7..76fde5d 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ inputs.home-manager.follows = "home-manager"; }; nix-on-droid = { - url = "github:nix-community/nix-on-droid/master"; + url = "github:osbm/nix-on-droid/master"; inputs.nixpkgs.follows = "nixpkgs"; }; osbm-nvim = { From 27a817324857353ff37340566c8a047453200731 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 22:44:16 +0300 Subject: [PATCH 0535/1768] localhost is a scary hostname --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 3c5c16e..a44bb95 100644 --- a/justfile +++ b/justfile @@ -13,7 +13,7 @@ build *args: check-git [linux] switch *args: check-git #!/usr/bin/env sh - if [[ "$(hostname)" == "nix-on-droid" ]]; then + if [[ "$(hostname)" == "localhost" ]]; then nix-on-droid switch --flake . else nh os switch . From 045676afc69f82b902f36d15cb17ea59fbf5b529 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 22:52:37 +0300 Subject: [PATCH 0536/1768] set username --- hosts/atreus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index a00170f..bf58b45 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -4,7 +4,7 @@ pkgs, ... }: { - # user.userName = lib.mkForce "osbm"; # fuck i hate unmaintained projects + user.userName = "osbm"; # fuck i hate unmaintained projects environment.packages = with pkgs; [ vim # or some other editor, e.g. nano or neovim From 85907213a8de8177ecf51c2950375e612cc58984 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 22:53:48 +0300 Subject: [PATCH 0537/1768] force --- hosts/atreus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index bf58b45..6293d20 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -4,7 +4,7 @@ pkgs, ... }: { - user.userName = "osbm"; # fuck i hate unmaintained projects + user.userName = lib.mkForce "osbm"; # fuck i hate unmaintained projects environment.packages = with pkgs; [ vim # or some other editor, e.g. nano or neovim From 3e471c9a39e2d27966e7cf945309969e38d24f89 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Feb 2025 23:08:20 +0300 Subject: [PATCH 0538/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c562da7..00ed414 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739845242, - "narHash": "sha256-rNMXpDubNWGLTs45MuoH9YHtXfXye/fn2u4YMSTPt9I=", + "lastModified": 1739907986, + "narHash": "sha256-Vo7LHigoL4VdIJt+rVaQEctBzWN5di1FUvygeLg141E=", "owner": "nix-community", "repo": "home-manager", - "rev": "5cfbf5cc37a3bd1da07ae84eea1b828909c4456b", + "rev": "a135aae1be749a10227413f9eb944a6f887dab86", "type": "github" }, "original": { @@ -372,11 +372,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1739907588, - "narHash": "sha256-1UjLSRRW+bkQafH5JEtMiBCld+ye0SEhIwuCv5Gx19k=", + "lastModified": 1739909050, + "narHash": "sha256-BIP6OM1VoiO9vihxqvtpo+Y76DMmvXWFR02NSs+tYjQ=", "owner": "osbm", "repo": "nix-on-droid", - "rev": "d9a5f852ebceb55bc9b083cbc490e3ed525bea79", + "rev": "114274bad04436737da8ccf3e912178efef250ff", "type": "github" }, "original": { From c2d681874490e285d61c957cddb1112737505027 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 19 Feb 2025 09:14:37 +0300 Subject: [PATCH 0539/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 00ed414..6ec0b7b 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739907986, - "narHash": "sha256-Vo7LHigoL4VdIJt+rVaQEctBzWN5di1FUvygeLg141E=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a135aae1be749a10227413f9eb944a6f887dab86", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { @@ -404,11 +404,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { From 96e4afa3eb22305cd377aa1df4dcb4cc140acb0d Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 19 Feb 2025 10:52:16 +0300 Subject: [PATCH 0540/1768] add ssh --- hosts/atreus/configuration.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 6293d20..83e2e5c 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -9,9 +9,10 @@ vim # or some other editor, e.g. nano or neovim # Some common stuff that people expect to have - #procps + procps #killall #diffutils + inetutils findutils utillinux tzdata @@ -34,6 +35,10 @@ openssh just nh + (pkgs.writeShellScriptBin "sshd-start" '' + echo "Starting sshd on port 8022" + ${pkgs.openssh}/bin/sshd + '') ]; # Backup etc files instead of failing to activate generation if a file already exists in /etc @@ -49,4 +54,21 @@ # Set your time zone #time.timeZone = "Europe/Berlin"; + + build.activation.sshd = '' + if [ ! -e /etc/ssh/ssh_host_rsa_key ]; then + $VERBOSE_ECHO "Generating host keys..." + $DRY_RUN_CMD ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -a 32 -f "/etc/ssh/ssh_host_ed25519_key" -N "" + fi + ''; + + environment.etc."ssh/sshd_config".text = '' + AcceptEnv LANG LC_* + KbdInteractiveAuthentication no + PasswordAuthentication no + PermitRootLogin no + Port 8022 + PrintMotd no + ''; + } From a1ad96476d4d3ee212e48de3bb8cee12c0d58243 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 19 Feb 2025 14:08:31 +0300 Subject: [PATCH 0541/1768] formatting --- hosts/atreus/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 83e2e5c..e51459d 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -70,5 +70,4 @@ Port 8022 PrintMotd no ''; - } From 062eb9dde2befd2f5ea5a58b934451a0dc98eda4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 20 Feb 2025 11:01:06 +0300 Subject: [PATCH 0542/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6ec0b7b..c2b29ad 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739913864, - "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", + "lastModified": 1739992710, + "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "97ac0801d187b2911e8caa45316399de12f6f199", + "rev": "1c189f011447810af939a886ba7bee33532bb1f9", "type": "github" }, "original": { From 8b2825590727c409b8246c8f7c6b10630ee16e4a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 20 Feb 2025 12:55:18 +0300 Subject: [PATCH 0543/1768] reenable youtube for now --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index ea87433..3447754 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -13,7 +13,7 @@ ]; myModules = { - blockYoutube = true; + blockYoutube = false; blockTwitter = true; blockBluesky = false; enableKDE = true; From 64ab2e1f22d9461f9a46362d011467b0e1fd59cd Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Feb 2025 15:08:59 +0300 Subject: [PATCH 0544/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c2b29ad..dbad4c0 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1739992710, - "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", + "lastModified": 1740060750, + "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c189f011447810af939a886ba7bee33532bb1f9", + "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", "type": "github" }, "original": { @@ -388,11 +388,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1739798439, - "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { From 0418be2d678e1a074ed79858358f7e3277f04f74 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Feb 2025 21:32:33 +0300 Subject: [PATCH 0545/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index dbad4c0..38d3fb1 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1740060750, - "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", + "lastModified": 1740161702, + "narHash": "sha256-dUwfoRhWT22JjXn0iqmMWKsutELwSL01EdKeA9TXsHA=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", + "rev": "bdf73272a8408fedc7ca86d5ea47192f6d2dad54", "type": "github" }, "original": { From df023f69e62a7a913818e493a72e3f80a4350d2a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Feb 2025 14:38:44 +0300 Subject: [PATCH 0546/1768] kernel compiles now --- flake.lock | 43 +++++++++++++------------------------------ flake.nix | 7 ++----- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 38d3fb1..d4c2454 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1740161702, - "narHash": "sha256-dUwfoRhWT22JjXn0iqmMWKsutELwSL01EdKeA9TXsHA=", + "lastModified": 1740208222, + "narHash": "sha256-FqgPcK5BK+Mc4cGBCGz555UsVd/TQK9FvmuamBWu+ZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "bdf73272a8408fedc7ca86d5ea47192f6d2dad54", + "rev": "f4a07823a298deff0efb0db30f9318511de7c232", "type": "github" }, "original": { @@ -450,19 +450,19 @@ "type": "github" } }, - "nixpkgs-rpi": { + "nixpkgs_2": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-24.11", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" } }, @@ -617,24 +617,21 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": [ - "nixpkgs-rpi" - ], + "nixpkgs": "nixpkgs_2", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", "rpi-linux-6_12_11-src": "rpi-linux-6_12_11-src", "rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src", "rpi-linux-stable-src": "rpi-linux-stable-src", - "rpicam-apps-src": "rpicam-apps-src", - "u-boot-src": "u-boot-src" + "rpicam-apps-src": "rpicam-apps-src" }, "locked": { - "lastModified": 1738949424, - "narHash": "sha256-w+OitboChUZUZAn2lFA3YGxUBSz4F5TLqBwEkkEtN+0=", + "lastModified": 1740187527, + "narHash": "sha256-thcUeJlXJ6lD5s1UDKE3jYyzdSRxMjcE/mSWf5Y0KHU=", "owner": "nix-community", "repo": "raspberry-pi-nix", - "rev": "f3171167258766def0851915685b9a6e7ca7e96e", + "rev": "4f6706677c4adeca591ada531fc4d7b7b68c0414", "type": "github" }, "original": { @@ -650,7 +647,6 @@ "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-rpi": "nixpkgs-rpi", "nixvim": "nixvim", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix", @@ -858,19 +854,6 @@ "type": "github" } }, - "u-boot-src": { - "flake": false, - "locked": { - "lastModified": 1719857238, - "narHash": "sha256-mJ2TBy0Y5ZtcGFgtU5RKr0UDUp5FWzojbFb+o/ebRJU=", - "type": "tarball", - "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2" - }, - "original": { - "type": "tarball", - "url": "https://ftp.denx.de/pub/u-boot/u-boot-2024.07.tar.bz2" - } - }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", diff --git a/flake.nix b/flake.nix index 76fde5d..dbf80a8 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-rpi.url = "github:NixOS/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8"; # TODO: fix this later nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; @@ -38,7 +37,6 @@ }; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; - inputs.nixpkgs.follows = "nixpkgs-rpi"; }; vscode-server = { url = "github:nix-community/nixos-vscode-server"; @@ -55,7 +53,6 @@ home-manager, raspberry-pi-nix, nixos-hardware, - nixpkgs-rpi, nix-on-droid, ... } @ inputs: let @@ -82,7 +79,7 @@ } ]; }; - pochita = nixpkgs-rpi.lib.nixosSystem { + pochita = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ ./hosts/pochita/configuration.nix @@ -99,7 +96,7 @@ } ]; }; - pochita-sd = nixpkgs-rpi.lib.nixosSystem { + pochita-sd = nixpkgs.lib.nixosSystem { modules = [ ./hosts/pochita-sd/configuration.nix raspberry-pi-nix.nixosModules.raspberry-pi From 871f290dc50a1350caef7fbfb5cf37ed6f66d963 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Feb 2025 22:36:43 +0300 Subject: [PATCH 0547/1768] update flake.lock --- flake.lock | 6 +++--- modules/nix-settings.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d4c2454..222b40d 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1740208222, - "narHash": "sha256-FqgPcK5BK+Mc4cGBCGz555UsVd/TQK9FvmuamBWu+ZY=", + "lastModified": 1740250266, + "narHash": "sha256-fbB/I4bCsJ++BhRzDaeQmzw/Gt5Lrt1csJ8D2IkQANA=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4a07823a298deff0efb0db30f9318511de7c232", + "rev": "61d8fc9af0f8568ffaff93e4001cb607f88790f9", "type": "github" }, "original": { diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index a8d2266..e7ebcff 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -1,8 +1,6 @@ { inputs, - pkgs, lib, - config, ... }: { # Allow unfree packages @@ -21,6 +19,7 @@ "cuda_cccl" "cuda_nvcc" "nvidia-settings" + "cuda-merged" ]; # enable nix flakes @@ -40,5 +39,4 @@ programs.command-not-found.enable = false; system.configurationRevision = inputs.self.rev or "dirty"; - #system.nixos.label = } From ae8c5b8c35f59ab17e10a8ceff8da01df9fdfdb9 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 17:56:14 +0300 Subject: [PATCH 0548/1768] diff --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 222b40d..a20eb9b 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1740250266, - "narHash": "sha256-fbB/I4bCsJ++BhRzDaeQmzw/Gt5Lrt1csJ8D2IkQANA=", + "lastModified": 1740318342, + "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", "owner": "nix-community", "repo": "home-manager", - "rev": "61d8fc9af0f8568ffaff93e4001cb607f88790f9", + "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", "type": "github" }, "original": { From 8b331dae79d54fbfbc9369d3fbfd3bdad7a25818 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 19:06:56 +0300 Subject: [PATCH 0549/1768] add wake-on-lan command as a program --- hosts/atreus/configuration.nix | 4 ++++ modules/common-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index e51459d..f0dcccb 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -39,6 +39,10 @@ echo "Starting sshd on port 8022" ${pkgs.openssh}/bin/sshd '') + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') ]; # Backup etc files instead of failing to activate generation if a file already exists in /etc diff --git a/modules/common-packages.nix b/modules/common-packages.nix index a7d4ac5..61c1d58 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -17,7 +17,10 @@ htop unzip tlrc - wakeonlan + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') btop pciutils nodePackages.npm From 40c254ee685804e256cccb06046ec4f71a5fbbbe Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 19:07:16 +0300 Subject: [PATCH 0550/1768] clear out some more things --- modules/common-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 61c1d58..c4e35ca 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -1,7 +1,5 @@ { pkgs, - lib, - config, ... }: { environment.systemPackages = with pkgs; [ @@ -27,11 +25,6 @@ nodejs cloc neofetch - cbonsai - cowsay - fortune - lolcat - cmatrix inxi jq onefetch @@ -39,7 +32,6 @@ gh starship tree - ffmpeg nix-output-monitor yazi ripgrep From 56befadb4f22b01a22d14ebbfd124ea9cacc4192 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 19:07:36 +0300 Subject: [PATCH 0551/1768] mostly esthetics atp --- modules/concentration.nix | 1 - modules/disable-hibernation.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/concentration.nix b/modules/concentration.nix index 8bb83aa..b7486e9 100644 --- a/modules/concentration.nix +++ b/modules/concentration.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/modules/disable-hibernation.nix b/modules/disable-hibernation.nix index 67e6c56..254d3a2 100644 --- a/modules/disable-hibernation.nix +++ b/modules/disable-hibernation.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... From 97bba14c7f322ab74d527c3a8d28e92b96b34fe7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 19:08:18 +0300 Subject: [PATCH 0552/1768] remove firefox --- modules/default.nix | 1 - modules/firefox.nix | 110 -------------------------------------------- 2 files changed, 111 deletions(-) delete mode 100644 modules/firefox.nix diff --git a/modules/default.nix b/modules/default.nix index ad2ab8c..1d09326 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,7 +5,6 @@ ./concentration.nix ./disable-hibernation.nix ./emulation.nix - # ./firefox.nix ./fonts.nix ./graphical-interface.nix ./i18n.nix diff --git a/modules/firefox.nix b/modules/firefox.nix deleted file mode 100644 index fc3cbbf..0000000 --- a/modules/firefox.nix +++ /dev/null @@ -1,110 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: let - lock-false = { - Value = false; - Status = "locked"; - }; - lock-true = { - Value = true; - Status = "locked"; - }; -in { - # Install firefox. - programs.firefox = { - enable = true; - languagePacks = [ - "ja" - "tr" - "en-US" - ]; - - # profiles.osbm = { - - # Check about:policies#documentation for options. - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - EnableTrackingProtection = { - Value = true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - }; - # DisablePocket = true; - DisableFirefoxAccounts = true; - DisableAccounts = true; - DisableFirefoxScreenshots = true; - StartPage = "previous-session"; - # OverrideFirstRunPage = ""; - # OverridePostUpdatePage = ""; - # DontCheckDefaultBrowser = true; - DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" - # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" - # SearchBar = "unified"; # alternat - ExtensionSettings = with builtins; let - extension = shortId: uuid: { - name = uuid; - value = { - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; - }; - }; - in - listToAttrs [ - (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") - (extension "ublock-origin" "uBlock0@raymondhill.net") - (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") - (extension "motivation-new-tab" "") - (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") - - # (extension "tabliss" "extension@tabliss.io") - # (extension "umatrix" "uMatrix@raymondhill.net") - # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") - # (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") - ]; - # To add additional extensions, find it on addons.mozilla.org, find - # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) - # Then, download the XPI by filling it in to the install_url template, unzip it, - # run `jq .browser_specific_settings.gecko.id manifest.json` or - # `jq .applications.gecko.id manifest.json` to get the UUID - }; - # userChrome = '' - # #tabbrowser-tabs { - # visibility: collapse; - # } - # ''; - # i am the only mf that doesnt use home-manager for firefox config - /* - ---- PREFERENCES ---- - */ - # Check about:config for options. - preferences = { - # "Open previous windows and tabs" - "browser.startup.page" = 3; - "browser.contentblocking.category" = true; - "extensions.pocket.enabled" = false; - "extensions.screenshots.disabled" = true; - "browser.topsites.contile.enabled" = false; - "browser.formfill.enable" = false; - "browser.search.suggest.enabled" = false; - "browser.search.suggest.enabled.private" = false; - "browser.urlbar.suggest.searches" = false; - "browser.urlbar.showSearchSuggestionsFirst" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.feeds.snippets" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "ui.key.menuAccessKeyFocuses" = false; - }; - }; -} From f6bfae5e1e613152f075d1944e4ea98f072e02ec Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 19:08:28 +0300 Subject: [PATCH 0553/1768] make the lsp happy --- modules/i18n.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i18n.nix b/modules/i18n.nix index bd9fd87..fb52fb4 100644 --- a/modules/i18n.nix +++ b/modules/i18n.nix @@ -1,7 +1,5 @@ { pkgs, - lib, - config, ... }: { time.timeZone = "Europe/Istanbul"; From 6aec2e2372e7e59fd7ad7547c5bb05f8a2bcc266 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 20:00:48 +0300 Subject: [PATCH 0554/1768] seperate out remote builds --- flake.nix | 15 +-------------- hosts/pochita/configuration.nix | 18 ++++++------------ modules/default.nix | 1 + modules/remote-builds.nix | 15 +++++++++++++++ 4 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 modules/remote-builds.nix diff --git a/flake.nix b/flake.nix index dbf80a8..6d4c204 100644 --- a/flake.nix +++ b/flake.nix @@ -81,20 +81,7 @@ }; pochita = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [ - ./hosts/pochita/configuration.nix - raspberry-pi-nix.nixosModules.raspberry-pi - nixos-hardware.nixosModules.raspberry-pi-5 - vscode-server.nixosModules.default - agenix.nixosModules.default - home-manager.nixosModules.home-manager - { - environment.systemPackages = [ - agenix.packages.aarch64-linux.default - osbm-nvim.packages.aarch64-linux.default - ]; - } - ]; + modules = [./hosts/pochita/configuration.nix]; }; pochita-sd = nixpkgs.lib.nixosSystem { modules = [ diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index e7d022c..cb44d65 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -2,34 +2,28 @@ config, pkgs, lib, + inputs, ... }: { imports = [ ./hardware-configuration.nix ../../modules + inputs.raspberry-pi-nix.nixosModules.raspberry-pi + inputs.nixos-hardware.nixosModules.raspberry-pi-5 + inputs.vscode-server.nixosModules.default + inputs.agenix.nixosModules.default + inputs.home-manager.nixosModules.home-manager ]; - nix.distributedBuilds = true; - nix.buildMachines = [ - { - hostName = "192.168.0.2"; - systems = ["x86_64-linux" "aarch64-linux"]; - supportedFeatures = ["big-parallel" "kvm"]; - sshKey = "/home/osbm/.ssh/id_ed25519"; - sshUser = "osbm"; - } - ]; myModules = { enableKDE = false; enableFonts = false; blockYoutube = false; blockTwitter = false; enableTailscale = true; - # enableJellyfin = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method - programs.firefox.enable = lib.mkForce false; # no need for firefox # enable hyprland # programs.hyprland.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 1d09326..9d30420 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -10,6 +10,7 @@ ./i18n.nix ./jellyfin.nix ./nix-settings.nix + ./remote-builds.nix ./secrets.nix ./sound.nix ./tailscale.nix diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix new file mode 100644 index 0000000..67e14a0 --- /dev/null +++ b/modules/remote-builds.nix @@ -0,0 +1,15 @@ +{config, outputs, ...}:{ + + nix.distributedBuilds = true; + nix.builders-use-substitutes = true; + nix.buildMachines = [ + { + hostName = "ymir.curl-boga.ts.net"; + systems = ["x86_64-linux" "aarch64-linux"]; + supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; + sshKey = config.age.secrets.ssh-key-private.path; + sshUser = "osbm"; + protocol = "ssh-ng"; + } + ]; +} \ No newline at end of file From b398d3c68802660cb8a4c803339955f9f4e888a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 20:01:33 +0300 Subject: [PATCH 0555/1768] hotfix --- modules/remote-builds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 67e14a0..d4aae22 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,7 +1,7 @@ {config, outputs, ...}:{ nix.distributedBuilds = true; - nix.builders-use-substitutes = true; + nix.settings.builders-use-substitutes = true; nix.buildMachines = [ { hostName = "ymir.curl-boga.ts.net"; From 80f245f973b1b16cd0ebe84b6bbd776e8a862658 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 20:03:40 +0300 Subject: [PATCH 0556/1768] formatting --- modules/common-packages.nix | 5 +---- modules/i18n.nix | 5 +---- modules/remote-builds.nix | 9 ++++++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index c4e35ca..08f27c4 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { environment.systemPackages = with pkgs; [ wget git diff --git a/modules/i18n.nix b/modules/i18n.nix index fb52fb4..c6cebdb 100644 --- a/modules/i18n.nix +++ b/modules/i18n.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { time.timeZone = "Europe/Istanbul"; # Select internationalisation properties. diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index d4aae22..6f9684e 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,5 +1,8 @@ -{config, outputs, ...}:{ - +{ + config, + outputs, + ... +}: { nix.distributedBuilds = true; nix.settings.builders-use-substitutes = true; nix.buildMachines = [ @@ -12,4 +15,4 @@ protocol = "ssh-ng"; } ]; -} \ No newline at end of file +} From 4613f3658b9096c276ffad74656242d22bdd7010 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 20:12:50 +0300 Subject: [PATCH 0557/1768] try ssh instead of ssh-ng --- modules/remote-builds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 6f9684e..3839a8d 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -12,7 +12,7 @@ supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; sshKey = config.age.secrets.ssh-key-private.path; sshUser = "osbm"; - protocol = "ssh-ng"; + protocol = "ssh"; } ]; } From d766317430f13ed0bfb12fc935e9243f13030a16 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 20:49:52 +0300 Subject: [PATCH 0558/1768] try ssh-ng back --- modules/i18n.nix | 1 + modules/remote-builds.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i18n.nix b/modules/i18n.nix index c6cebdb..35a4707 100644 --- a/modules/i18n.nix +++ b/modules/i18n.nix @@ -14,6 +14,7 @@ LC_PAPER = "tr_TR.UTF-8"; LC_TELEPHONE = "tr_TR.UTF-8"; LC_TIME = "ja_JP.UTF-8"; + # LC_ALL = "en_US.UTF-8"; }; services.xserver.xkb = { diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 3839a8d..6f9684e 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -12,7 +12,7 @@ supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; sshKey = config.age.secrets.ssh-key-private.path; sshUser = "osbm"; - protocol = "ssh"; + protocol = "ssh-ng"; } ]; } From fa8338755096a283c8e4ebf98abbda701e39d568 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 21:28:12 +0300 Subject: [PATCH 0559/1768] add nix path --- modules/nix-settings.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index e7ebcff..ca3a8a6 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -25,6 +25,11 @@ # enable nix flakes nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.nixPath = [ + "nixpkgs=${inputs.nixpkgs.path}" + "nixos-config=${inputs.self.path}" + ]; + nix.settings.trusted-users = ["root" "osbm"]; nix.gc = { From 53bee43f1acbba9dd82835f0f226ad0b4a5da8a0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 21:32:07 +0300 Subject: [PATCH 0560/1768] dont add path --- modules/nix-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index ca3a8a6..9ceb30b 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -26,8 +26,8 @@ nix.settings.experimental-features = ["nix-command" "flakes"]; nix.nixPath = [ - "nixpkgs=${inputs.nixpkgs.path}" - "nixos-config=${inputs.self.path}" + "nixpkgs=${inputs.nixpkgs}" + "nixos-config=${inputs.self}" ]; nix.settings.trusted-users = ["root" "osbm"]; From e4fc3cc8c350e9d98cef90fcbfa3da4fba1dea90 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 21:36:26 +0300 Subject: [PATCH 0561/1768] disable channels --- modules/nix-settings.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 9ceb30b..7590074 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -30,6 +30,8 @@ "nixos-config=${inputs.self}" ]; + nix.channel.enable = false; + nix.settings.trusted-users = ["root" "osbm"]; nix.gc = { From a9a7763549227d6d2a270635831407c3e7dc2d35 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 23:48:22 +0300 Subject: [PATCH 0562/1768] unused --- modules/emulation.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/emulation.nix b/modules/emulation.nix index 2c19254..6daeef1 100644 --- a/modules/emulation.nix +++ b/modules/emulation.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... From 432b607d2c26db274076aa35b53997c54d4ce491 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Feb 2025 23:52:41 +0300 Subject: [PATCH 0563/1768] fish? --- home/ssh.nix | 65 ++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 43 deletions(-) diff --git a/home/ssh.nix b/home/ssh.nix index 9a9f806..b3141d4 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -1,51 +1,30 @@ -{pkgs, ...}: { +{...}: +let + # define a block that just takes a hostname and returns attrset to not repeat the same fields + sshBlock = hostname: { + hostname = hostname; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). + "RemoteCommand" = "fish"; + "RequestTTY" = "force"; + }; + }; +in +{ programs.ssh = { enable = true; hashKnownHosts = true; compression = true; matchBlocks = { - "tartarus" = { - hostname = "192.168.0.4"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - # setEnv = { - # "TERM" = "xterm-256color"; - # }; - # extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). - # "RemoteCommand" = "fish"; - # }; - }; - "ymir" = { - hostname = "192.168.0.2"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - # setEnv = { - # "TERM" = "xterm-256color"; - # }; - # extraOptions = { # TODO fix the damn starship error - # "RemoteCommand" = "fish"; - # }; - }; - "pochita" = { - hostname = "192.168.0.9"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - }; - "pochita-tailscale" = { - hostname = "pochita.curl-boga.ts.net"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - }; - "ymir-tailscale" = { - hostname = "ymir.curl-boga.ts.net"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - }; - "tartarus-tailscale" = { - hostname = "tartarus.curl-boga.ts.net"; - user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; - }; + ymir = sshBlock "192.168.0.2"; + ymir-ts = sshBlock "ymir.curl-boga.ts.net"; + atreus = sshBlock "192.168.0.3"; + atreus-ts = sshBlock "atreus.curl-boga.ts.net"; + tartarus = sshBlock "192.168.0.4"; + tartarus-ts = sshBlock "tartarus.curl-boga.ts.net"; + pochita = sshBlock "192.168.0.9"; + pochita-ts = sshBlock "pochita.curl-boga.ts.net"; }; }; } From b0c5cbba809b5464b735f1eabe233b589b037423 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 01:52:06 +0300 Subject: [PATCH 0564/1768] set atreus port --- home/ssh.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/home/ssh.nix b/home/ssh.nix index b3141d4..772d153 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -10,6 +10,17 @@ let "RequestTTY" = "force"; }; }; + # sshBlockAtreus is the same as sshBlock but with 8090 as the port + sshBlockAtreus = hostname: { + hostname = hostname; + user = "osbm"; + identityFile = "/home/osbm/.ssh/id_ed25519"; + port = "8022"; + extraOptions = { + "RemoteCommand" = "fish"; + "RequestTTY" = "force"; + }; + }; in { programs.ssh = { @@ -19,8 +30,8 @@ in matchBlocks = { ymir = sshBlock "192.168.0.2"; ymir-ts = sshBlock "ymir.curl-boga.ts.net"; - atreus = sshBlock "192.168.0.3"; - atreus-ts = sshBlock "atreus.curl-boga.ts.net"; + atreus = sshBlockAtreus "192.168.0.3"; + atreus-ts = sshBlockAtreus "atreus.curl-boga.ts.net"; tartarus = sshBlock "192.168.0.4"; tartarus-ts = sshBlock "tartarus.curl-boga.ts.net"; pochita = sshBlock "192.168.0.9"; From abcc52e99994af9362657165dcb805a6f719ce42 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 01:53:04 +0300 Subject: [PATCH 0565/1768] hotfix --- home/ssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/ssh.nix b/home/ssh.nix index 772d153..d95d91b 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -15,7 +15,7 @@ let hostname = hostname; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - port = "8022"; + port = 8022; extraOptions = { "RemoteCommand" = "fish"; "RequestTTY" = "force"; From 367d90910cb8f3d5a86ba410edca824400a91684 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 02:08:52 +0300 Subject: [PATCH 0566/1768] sshd config authorized keys --- hosts/atreus/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index f0dcccb..a92fbfb 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -73,5 +73,9 @@ PermitRootLogin no Port 8022 PrintMotd no + AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u + ''; + environment.etc."ssh/authorized_keys.d/osbm".text = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k ''; } From dd2ee113a585c75b0d31242108d3a8dbb1bd29b9 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 02:12:33 +0300 Subject: [PATCH 0567/1768] you filthy reprobate --- hosts/atreus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index a92fbfb..91a4428 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -60,7 +60,7 @@ #time.timeZone = "Europe/Berlin"; build.activation.sshd = '' - if [ ! -e /etc/ssh/ssh_host_rsa_key ]; then + if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then $VERBOSE_ECHO "Generating host keys..." $DRY_RUN_CMD ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -a 32 -f "/etc/ssh/ssh_host_ed25519_key" -N "" fi From 863720f3f2b6e152b3ca034f4a83f773490bd472 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 03:30:47 +0300 Subject: [PATCH 0568/1768] add terraria sync program --- modules/graphical-interface.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 73f0f1e..397486e 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -50,6 +50,21 @@ ani-cli prismlauncher qbittorrent + (pkgs.writeShellApplication { + name = "sync-terraria"; + runtimeInputs = [ + pkgs.python3Packages.huggingface-hub + pkgs.zip + ]; + text = '' + cd ~/.local/share + timestamp=$(date +%Y-%m-%d_%H-%M) + echo "$timestamp" + zip -r "Terraria_$timestamp.zip" Terraria/ + echo huggingface-cli whoami + huggingface-cli upload --repo-type dataset osbm/terraria-backups "Terraria_$timestamp.zip" "Terraria_$timestamp.zip" + ''; + }) ]; programs.steam = { From 9c222af667b7daddb018a0e77fdca6baee09dbad Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 19:50:33 +0300 Subject: [PATCH 0569/1768] update flake.lock --- flake.lock | 165 ++++++----------------------------------------------- flake.nix | 1 - 2 files changed, 16 insertions(+), 150 deletions(-) diff --git a/flake.lock b/flake.lock index a20eb9b..9f94875 100644 --- a/flake.lock +++ b/flake.lock @@ -47,41 +47,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "revCount": 69, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -139,54 +104,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -194,11 +111,11 @@ ] }, "locked": { - "lastModified": 1740318342, - "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", + "lastModified": 1740347597, + "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", + "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", "type": "github" }, "original": { @@ -290,27 +207,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -388,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1740387674, + "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", "type": "github" }, "original": { @@ -404,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -468,26 +364,18 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": [ - "home-manager" - ], - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1739902813, - "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=", + "lastModified": 1740413069, + "narHash": "sha256-DUentJypG+n1yuL60WBYM+SOfH4tFivKzuuJRQLCtF0=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50", + "rev": "4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10", "type": "github" }, "original": { @@ -600,11 +488,11 @@ ] }, "locked": { - "lastModified": 1739877399, - "narHash": "sha256-ER8kgDpw/CUWwrkH6xSHMg7B4FVFZW5jdAZsor1X35A=", + "lastModified": 1740415787, + "narHash": "sha256-2Qc9+aO7YgNpdNvunz66zXmZYkGClFZgTNg+DiEHuyI=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "4d580248edabe065adab6c793e62b10d3c6fa469", + "rev": "bf8104af417170d1e11f9a59aaf7948381251f82", "type": "github" }, "original": { @@ -833,27 +721,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738680491, - "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", diff --git a/flake.nix b/flake.nix index 6d4c204..56271ae 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,6 @@ nixvim = { url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; }; nix-on-droid = { url = "github:osbm/nix-on-droid/master"; From 3d05ac9a93bf9235eea090e6b9ff0de268d62004 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 21:49:25 +0300 Subject: [PATCH 0570/1768] huggingface login confition --- modules/graphical-interface.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 397486e..4d5733b 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -57,11 +57,17 @@ pkgs.zip ]; text = '' + # check if logged in to huggingface + # hugingface-cli whoami == "Not logged in" means not logged in + if [ "$(huggingface-cli whoami)" == "Not logged in" ]; then + echo "Please log in to huggingface" + exit 1 + fi + cd ~/.local/share timestamp=$(date +%Y-%m-%d_%H-%M) echo "$timestamp" zip -r "Terraria_$timestamp.zip" Terraria/ - echo huggingface-cli whoami huggingface-cli upload --repo-type dataset osbm/terraria-backups "Terraria_$timestamp.zip" "Terraria_$timestamp.zip" ''; }) From 8acfba9da8732a7130ec6d74a3c75c27e33b6973 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 24 Feb 2025 23:47:28 +0300 Subject: [PATCH 0571/1768] obdisian commands --- home/ssh.nix | 5 +---- hosts/atreus/configuration.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/home/ssh.nix b/home/ssh.nix index d95d91b..c776863 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -16,10 +16,7 @@ let user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; port = 8022; - extraOptions = { - "RemoteCommand" = "fish"; - "RequestTTY" = "force"; - }; + # fish not found error ??? }; in { diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 91a4428..ed36039 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -43,6 +43,33 @@ echo waking up ymir ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 '') + # obsidian tools + # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin + # (pkgs.writeShellScriptBin "rerouting-sync-start" '' + # cd /storage/emulated/0/Documents/rerouting + # git pull + # git add --all + # git commit -m "Android sync" + # git push + # '') + (pkgs.writeShellScriptBin "cd-rerouting" '' + cd /storage/emulated/0/Documents/rerouting + '') + (pkgs.writeShellScriptBin "rerouting-status" '' + cd /storage/emulated/0/Documents/rerouting + git fetch + git status + '') + (pkgs.writeShellScriptBin "rerouting-pull" '' + cd /storage/emulated/0/Documents/rerouting + git pull + '') + (pkgs.writeShellScriptBin "rerouting-push" '' + cd /storage/emulated/0/Documents/rerouting + git add --all + git commit -m "Android sync" + git push + '') ]; # Backup etc files instead of failing to activate generation if a file already exists in /etc From c102005ea3377f817cb5981947bd80e69989a071 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 12:40:47 +0300 Subject: [PATCH 0572/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9f94875..c80e559 100644 --- a/flake.lock +++ b/flake.lock @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1740347597, - "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", + "lastModified": 1740432748, + "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", + "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319", "type": "github" }, "original": { @@ -371,11 +371,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740413069, - "narHash": "sha256-DUentJypG+n1yuL60WBYM+SOfH4tFivKzuuJRQLCtF0=", + "lastModified": 1740432393, + "narHash": "sha256-uXlB7bTlrl0q2jryKMSRlU+GptkVJN7PTsqdKkaFg1M=", "owner": "nix-community", "repo": "nixvim", - "rev": "4b0de83c39718e6fca0c80fdeae7c4a9b2cb6c10", + "rev": "53f9d242ffdf0997109d0b5b8bbbcc67a4296077", "type": "github" }, "original": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1740415787, - "narHash": "sha256-2Qc9+aO7YgNpdNvunz66zXmZYkGClFZgTNg+DiEHuyI=", + "lastModified": 1740476265, + "narHash": "sha256-fPWpdDENumQl1e31C9a1HzciuYEG2L2YmvS1DjTt3j0=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "bf8104af417170d1e11f9a59aaf7948381251f82", + "rev": "fe01f0d6507b6639e5faea730987baf53a485982", "type": "github" }, "original": { From 181edd4d55b8c4b34715ba63be5770d4a469c20b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 12:40:58 +0300 Subject: [PATCH 0573/1768] add openwebui --- hosts/ymir/configuration.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 3447754..49cf568 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -97,7 +97,21 @@ services.ollama = { enable = true; acceleration = "cuda"; + loadModels = ["deepseek-r1:7b" "deepseek-r1:14b"]; }; + services.open-webui = { + enable = true; + port = 7070; + environment = { + SCARF_NO_ANALYTICS = "True"; + DO_NOT_TRACK = "True"; + ANONYMIZED_TELEMETRY = "False"; + WEBUI_AUTH = "False"; + ENABLE_LOGIN_FORM = "False"; + }; + }; + + system.stateVersion = "25.05"; # great taboo of the nixos world } From 0f3b572a1adee6e942802aabe22c64916a80c8e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 12:46:04 +0300 Subject: [PATCH 0574/1768] openFirewall --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 49cf568..b7ccf7d 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -103,6 +103,7 @@ services.open-webui = { enable = true; port = 7070; + openFirewall = true; environment = { SCARF_NO_ANALYTICS = "True"; DO_NOT_TRACK = "True"; From 923d9d9e0a3a962e551066256870e8cd38870f92 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 15:33:32 +0300 Subject: [PATCH 0575/1768] change host --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index b7ccf7d..a71cfa8 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -103,6 +103,7 @@ services.open-webui = { enable = true; port = 7070; + host = "0.0.0.0"; openFirewall = true; environment = { SCARF_NO_ANALYTICS = "True"; From 8a7c6977bbcf6d80d776aa68ee33c9c27597be2b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 18:08:31 +0300 Subject: [PATCH 0576/1768] enable modules --- flake.nix | 2 +- hosts/harmonica/configuration.nix | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 56271ae..5214f9f 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,7 @@ harmonica = nixpkgs.lib.nixosSystem { modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" - agenix.nixosModules.default + ./hosts/harmonica/configuration.nix { environment.systemPackages = [ diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 8089104..09eace8 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -1,14 +1,28 @@ { config, lib, - modulesPath, + inputs, pkgs, ... }: { imports = [ ./sd-image.nix + ../../modules + inputs.agenix.nixosModules.default + inputs.home-manager.nixosModules.home-manager ]; + myModules = { + enableKDE = false; + enableFonts = false; + blockYoutube = false; + blockTwitter = false; + enableTailscale = true; + }; + + i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method + + # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 nixpkgs.overlays = [ (final: super: { @@ -19,7 +33,6 @@ nixpkgs.hostPlatform = "aarch64-linux"; # ! Need a trusted user for deploy-rs. - nix.settings.trusted-users = ["@wheel"]; system.stateVersion = "25.05"; zramSwap = { @@ -149,26 +162,13 @@ }; }; - # Enable OpenSSH out of the box. - services.sshd.enable = true; - # NTP time sync. services.timesyncd.enable = true; - # ! Change the following configuration - users.users.osbm = { - isNormalUser = true; - home = "/home/osbm"; - description = "osbm"; - extraGroups = ["wheel" "networkmanager"]; - # ! Be sure to put your own public key here - openssh.authorizedKeys.keys = ["a public key"]; - }; security.sudo = { enable = true; wheelNeedsPassword = false; }; - # ! Be sure to change the autologinUser. services.getty.autologinUser = "osbm"; } From 8d465fc7c5640daf147ade4346004af2ad4d8538 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 18:08:49 +0300 Subject: [PATCH 0577/1768] set hostname --- hosts/harmonica/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 09eace8..2cda79c 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -111,6 +111,7 @@ # }; # }; # }; + networking.hostName = "harmonica"; networking.networkmanager.ensureProfiles = { environmentFiles = [ config.age.secrets.nm-secrets.path From a7f5f8ebd8d11f2c44e8da2c7b955d5d98e140bd Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 18:09:04 +0300 Subject: [PATCH 0578/1768] i am not sure about this one --- hosts/harmonica/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 2cda79c..aba02ab 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -92,6 +92,9 @@ grub.enable = false; generic-extlinux-compatible.enable = true; }; + extraModprobeConfig = '' + options brcmfmac roamoff=1 feature_disable=0x82000 + ''; # Avoids warning: mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash. # See: https://github.com/NixOS/nixpkgs/issues/254807 From 8e5def77fb3d8348a83ae0e3329010ee749c4bac Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 18:09:19 +0300 Subject: [PATCH 0579/1768] flash recipe --- justfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/justfile b/justfile index a44bb95..387680e 100644 --- a/justfile +++ b/justfile @@ -42,3 +42,7 @@ build-sd-image-harmonica: check-git build-iso: check-git nix build -L .#nixosConfigurations.myISO.config.system.build.isoImage + +flash-sd-image-harmonica: check-git + nix build -L .#nixosConfigurations.harmonica.config.system.build.sdImage + nix run nixos.sdImage -c writeImageTo /dev/mmcblk0 ./result \ No newline at end of file From 44d1c0165c174d8b40096fed0c2006f4fda09164 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 18:26:53 +0300 Subject: [PATCH 0580/1768] use correct password --- hosts/harmonica/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index aba02ab..f78d419 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -160,7 +160,7 @@ }; wifi-security = { key-mgmt = "wpa-psk"; - psk = "$HOME_WIFI"; + psk = "$MOBILE_HOTSPOT"; }; }; }; From ba1007a4cc96bb28cfe84f3fb9d385cfe04b3966 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 18:28:43 +0300 Subject: [PATCH 0581/1768] remove unnecessary part --- flake.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/flake.nix b/flake.nix index 5214f9f..7bc53a5 100644 --- a/flake.nix +++ b/flake.nix @@ -69,13 +69,7 @@ harmonica = nixpkgs.lib.nixosSystem { modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" - ./hosts/harmonica/configuration.nix - { - environment.systemPackages = [ - agenix.packages.aarch64-linux.default - ]; - } ]; }; pochita = nixpkgs.lib.nixosSystem { From 2dd9ef7ba114210de94d87a605c4a5d2bb9bcf85 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 18:58:10 +0300 Subject: [PATCH 0582/1768] fancy --- flake.nix | 3 ++- hosts/harmonica/configuration.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 7bc53a5..e62b737 100644 --- a/flake.nix +++ b/flake.nix @@ -67,8 +67,9 @@ modules = [./hosts/ymir/configuration.nix]; }; harmonica = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; modules = [ - "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" + ./hosts/harmonica/configuration.nix ]; }; diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index f78d419..888579e 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -7,9 +7,11 @@ }: { imports = [ ./sd-image.nix + "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ../../modules inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager + inputs.vscode-server.nixosModules.default ]; myModules = { From 19d57b43d550e746c20afe580618fb9ff2659872 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 19:02:09 +0300 Subject: [PATCH 0583/1768] create hardware configuration --- hosts/harmonica/configuration.nix | 81 +--------------------- hosts/harmonica/hardware-configuration.nix | 79 +++++++++++++++++++++ 2 files changed, 82 insertions(+), 78 deletions(-) create mode 100644 hosts/harmonica/hardware-configuration.nix diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 888579e..ae9418c 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -8,6 +8,7 @@ imports = [ ./sd-image.nix "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" + ./hardware-configuration.nix ../../modules inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager @@ -24,84 +25,9 @@ i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method - - # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 - nixpkgs.overlays = [ - (final: super: { - makeModulesClosure = x: - super.makeModulesClosure (x // {allowMissing = true;}); - }) - ]; - - nixpkgs.hostPlatform = "aarch64-linux"; - # ! Need a trusted user for deploy-rs. system.stateVersion = "25.05"; - zramSwap = { - enable = true; - algorithm = "zstd"; - }; - - sdImage = { - # bzip2 compression takes loads of time with emulation, skip it. Enable this if you're low on space. - compressImage = false; - imageName = "zero2.img"; - - extraFirmwareConfig = { - # Give up VRAM for more Free System Memory - # - Disable camera which automatically reserves 128MB VRAM - start_x = 0; - # - Reduce allocation of VRAM to 16MB minimum for non-rotated (32MB for rotated) - gpu_mem = 16; - - # Configure display to 800x600 so it fits on most screens - # * See: https://elinux.org/RPi_Configuration - hdmi_group = 2; - hdmi_mode = 8; - }; - }; - - hardware = { - enableRedistributableFirmware = lib.mkForce false; - firmware = [pkgs.raspberrypiWirelessFirmware]; # Keep this to make sure wifi works - i2c.enable = true; - deviceTree.filter = "bcm2837-rpi-zero*.dtb"; - deviceTree.overlays = [ - { - name = "enable-i2c"; - dtsText = '' - /dts-v1/; - /plugin/; - / { - compatible = "brcm,bcm2837"; - fragment@0 { - target = <&i2c1>; - __overlay__ { - status = "okay"; - }; - }; - }; - ''; - } - ]; - }; - - boot = { - kernelPackages = pkgs.linuxPackages_rpi02w; - - initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage"]; - loader = { - grub.enable = false; - generic-extlinux-compatible.enable = true; - }; - extraModprobeConfig = '' - options brcmfmac roamoff=1 feature_disable=0x82000 - ''; - - # Avoids warning: mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash. - # See: https://github.com/NixOS/nixpkgs/issues/254807 - swraid.enable = lib.mkForce false; - }; + networking.hostName = "harmonica"; # networking = { # interfaces."wlan0".useDHCP = true; @@ -116,7 +42,7 @@ # }; # }; # }; - networking.hostName = "harmonica"; + networking.networkmanager.ensureProfiles = { environmentFiles = [ config.age.secrets.nm-secrets.path @@ -171,7 +97,6 @@ # NTP time sync. services.timesyncd.enable = true; - security.sudo = { enable = true; wheelNeedsPassword = false; diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/harmonica/hardware-configuration.nix new file mode 100644 index 0000000..e92338f --- /dev/null +++ b/hosts/harmonica/hardware-configuration.nix @@ -0,0 +1,79 @@ +{pkgs, lib, ...}: { + + # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 + nixpkgs.overlays = [ + (final: super: { + makeModulesClosure = x: + super.makeModulesClosure (x // {allowMissing = true;}); + }) + ]; + + zramSwap = { + enable = true; + algorithm = "zstd"; + }; + + sdImage = { + # bzip2 compression takes loads of time with emulation, skip it. Enable this if you're low on space. + compressImage = false; + imageName = "zero2.img"; + + extraFirmwareConfig = { + # Give up VRAM for more Free System Memory + # - Disable camera which automatically reserves 128MB VRAM + start_x = 0; + # - Reduce allocation of VRAM to 16MB minimum for non-rotated (32MB for rotated) + gpu_mem = 16; + + # Configure display to 800x600 so it fits on most screens + # * See: https://elinux.org/RPi_Configuration + hdmi_group = 2; + hdmi_mode = 8; + }; + }; + + hardware = { + enableRedistributableFirmware = lib.mkForce false; + firmware = [pkgs.raspberrypiWirelessFirmware]; # Keep this to make sure wifi works + i2c.enable = true; + deviceTree.filter = "bcm2837-rpi-zero*.dtb"; + deviceTree.overlays = [ + { + name = "enable-i2c"; + dtsText = '' + /dts-v1/; + /plugin/; + / { + compatible = "brcm,bcm2837"; + fragment@0 { + target = <&i2c1>; + __overlay__ { + status = "okay"; + }; + }; + }; + ''; + } + ]; + }; + + boot = { + kernelPackages = pkgs.linuxPackages_rpi02w; + + initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage"]; + loader = { + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; + extraModprobeConfig = '' + options brcmfmac roamoff=1 feature_disable=0x82000 + ''; + + # Avoids warning: mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash. + # See: https://github.com/NixOS/nixpkgs/issues/254807 + swraid.enable = lib.mkForce false; + }; + + + nixpkgs.hostPlatform = "aarch64-linux"; +} \ No newline at end of file From de825eb4dcb3f4805e70faae37bb9fb2c0978a45 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 19:18:31 +0300 Subject: [PATCH 0584/1768] all hail nixd --- hosts/harmonica/configuration.nix | 1 - hosts/harmonica/sd-image.nix | 1 - hosts/pochita/configuration.nix | 3 +-- modules/users.nix | 11 +++-------- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index ae9418c..339c0e9 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -2,7 +2,6 @@ config, lib, inputs, - pkgs, ... }: { imports = [ diff --git a/hosts/harmonica/sd-image.nix b/hosts/harmonica/sd-image.nix index 9c38bde..1893925 100644 --- a/hosts/harmonica/sd-image.nix +++ b/hosts/harmonica/sd-image.nix @@ -3,7 +3,6 @@ { config, lib, - pkgs, ... }: { options.sdImage = with lib; { diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index cb44d65..5acfac5 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -37,8 +37,7 @@ inherit config pkgs; }; - environment.systemPackages = with pkgs; [ - ]; + environment.systemPackages = []; security.sudo = { enable = true; diff --git a/modules/users.nix b/modules/users.nix index 46677d3..95a0a2e 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,9 +1,4 @@ -{ - pkgs, - lib, - config, - ... -}: { +{...}: { users.users = { osbm = { isNormalUser = true; @@ -13,7 +8,7 @@ openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; - packages = with pkgs; [ + packages = [ ]; }; bayram = { @@ -21,7 +16,7 @@ description = "bayram"; initialHashedPassword = "$6$IamAbigfailure$3BP231DVwbqUtZ.mq33nM/JitBrT2u26Y25VpsfBwhZbezMHz4XbySrOMnaMcCYdsb3wZFL3Ppcp0L.R8nonT."; extraGroups = ["networkmanager"]; - packages = with pkgs; [ + packages = [ ]; }; root.initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; From e5357f709912cf2cd9824f3e24c20d9ad9d6a30e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Feb 2025 19:34:07 +0300 Subject: [PATCH 0585/1768] formatting --- flake.nix | 1 - home/ssh.nix | 9 ++++----- hosts/harmonica/hardware-configuration.nix | 10 ++++++---- hosts/ymir/configuration.nix | 23 +++++++++++----------- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index e62b737..c4a5f3b 100644 --- a/flake.nix +++ b/flake.nix @@ -69,7 +69,6 @@ harmonica = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ - ./hosts/harmonica/configuration.nix ]; }; diff --git a/home/ssh.nix b/home/ssh.nix index c776863..502445f 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -1,11 +1,11 @@ -{...}: -let +{...}: let # define a block that just takes a hostname and returns attrset to not repeat the same fields sshBlock = hostname: { hostname = hostname; user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; - extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). + extraOptions = { + # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). "RemoteCommand" = "fish"; "RequestTTY" = "force"; }; @@ -18,8 +18,7 @@ let port = 8022; # fish not found error ??? }; -in -{ +in { programs.ssh = { enable = true; hashKnownHosts = true; diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/harmonica/hardware-configuration.nix index e92338f..6627bca 100644 --- a/hosts/harmonica/hardware-configuration.nix +++ b/hosts/harmonica/hardware-configuration.nix @@ -1,5 +1,8 @@ -{pkgs, lib, ...}: { - +{ + pkgs, + lib, + ... +}: { # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 nixpkgs.overlays = [ (final: super: { @@ -74,6 +77,5 @@ swraid.enable = lib.mkForce false; }; - nixpkgs.hostPlatform = "aarch64-linux"; -} \ No newline at end of file +} diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a71cfa8..5191b46 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -101,19 +101,18 @@ }; services.open-webui = { - enable = true; - port = 7070; - host = "0.0.0.0"; - openFirewall = true; - environment = { - SCARF_NO_ANALYTICS = "True"; - DO_NOT_TRACK = "True"; - ANONYMIZED_TELEMETRY = "False"; - WEBUI_AUTH = "False"; - ENABLE_LOGIN_FORM = "False"; - }; + enable = true; + port = 7070; + host = "0.0.0.0"; + openFirewall = true; + environment = { + SCARF_NO_ANALYTICS = "True"; + DO_NOT_TRACK = "True"; + ANONYMIZED_TELEMETRY = "False"; + WEBUI_AUTH = "False"; + ENABLE_LOGIN_FORM = "False"; + }; }; - system.stateVersion = "25.05"; # great taboo of the nixos world } From 7f67da24217c0de12e39b2dee7b2a8d37ed20866 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 00:53:41 +0300 Subject: [PATCH 0586/1768] networking with secrets is hard in nixos --- hosts/harmonica/configuration.nix | 69 +++++-------------------------- 1 file changed, 10 insertions(+), 59 deletions(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 339c0e9..a1d1d21 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -28,66 +28,17 @@ networking.hostName = "harmonica"; - # networking = { - # interfaces."wlan0".useDHCP = true; - # wireless = { - # enable = true; - # interfaces = ["wlan0"]; - # # ! Change the following to connect to your own network - # networks = { - # "${config.age.secrets.home-wifi-ssid.}" = { - # psk = "${secrets.home-wifi-password.age}"; - # }; - # }; - # }; - # }; - - networking.networkmanager.ensureProfiles = { - environmentFiles = [ - config.age.secrets.nm-secrets.path - ]; - - profiles = { - House_Bayram = { - connection = { - id = "House_Bayram"; - type = "wifi"; + networking = { + interfaces."wlan0".useDHCP = true; + wireless = { + enable = true; + interfaces = ["wlan0"]; + networks = { + "House_Bayram" = { + psk = "PASSWORD"; }; - ipv4 = { - method = "auto"; - }; - ipv6 = { - addr-gen-mode = "stable-privacy"; - method = "auto"; - }; - wifi = { - mode = "infrastructure"; - ssid = "House_Bayram"; - }; - wifi-security = { - key-mgmt = "wpa-psk"; - psk = "$HOME_WIFI"; - }; - }; - it_hurts_when_IP = { - connection = { - id = "it_hurts_when_IP"; - type = "ethernet"; - }; - ipv4 = { - method = "auto"; - }; - ipv6 = { - addr-gen-mode = "stable-privacy"; - method = "auto"; - }; - wifi = { - mode = "infrastructure"; - ssid = "it_hurts_when_IP"; - }; - wifi-security = { - key-mgmt = "wpa-psk"; - psk = "$MOBILE_HOTSPOT"; + "it_hurts_when_IP" = { + psk = "PASSWORD"; }; }; }; From c9ed15cb890cee045d5da7b8e3094e3596acefc0 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 00:54:04 +0300 Subject: [PATCH 0587/1768] idk about the "false" command but here goes nothing --- justfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/justfile b/justfile index 387680e..7226069 100644 --- a/justfile +++ b/justfile @@ -29,9 +29,6 @@ update: check: nix flake check -clean: - rm result - collect-garbage: sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old # home-manager expire-generations now @@ -43,6 +40,9 @@ build-sd-image-harmonica: check-git build-iso: check-git nix build -L .#nixosConfigurations.myISO.config.system.build.isoImage -flash-sd-image-harmonica: check-git +flash-sd-image-harmonica: + # raise error because this command should be edited before running + false nix build -L .#nixosConfigurations.harmonica.config.system.build.sdImage - nix run nixos.sdImage -c writeImageTo /dev/mmcblk0 ./result \ No newline at end of file + sudo dd if=result/sd-image/nixos-image-sd-card-25.05.20250224.0196c01-aarch64-linux.img of=/dev/sda bs=4M status=progress conv=fsync + From c33b9513043575f3caa1a5afbbded0ed259f86c9 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 01:26:41 +0300 Subject: [PATCH 0588/1768] cleanup on isle 6 --- flake.nix | 17 +++-------------- hosts/harmonica/configuration.nix | 1 - hosts/pochita-sd/configuration.nix | 6 +++++- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index c4a5f3b..3804fd2 100644 --- a/flake.nix +++ b/flake.nix @@ -46,12 +46,6 @@ outputs = { self, nixpkgs, - vscode-server, - agenix, - osbm-nvim, - home-manager, - raspberry-pi-nix, - nixos-hardware, nix-on-droid, ... } @ inputs: let @@ -68,20 +62,15 @@ }; harmonica = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; - modules = [ - ./hosts/harmonica/configuration.nix - ]; + modules = [./hosts/harmonica/configuration.nix]; }; pochita = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [./hosts/pochita/configuration.nix]; }; pochita-sd = nixpkgs.lib.nixosSystem { - modules = [ - ./hosts/pochita-sd/configuration.nix - raspberry-pi-nix.nixosModules.raspberry-pi - raspberry-pi-nix.nixosModules.sd-image - ]; + specialArgs = {inherit inputs outputs;}; + modules = [./hosts/pochita-sd/configuration.nix]; }; myISO = nixpkgs.lib.nixosSystem { modules = [ diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index a1d1d21..dfe7fd2 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -1,5 +1,4 @@ { - config, lib, inputs, ... diff --git a/hosts/pochita-sd/configuration.nix b/hosts/pochita-sd/configuration.nix index f09ae4b..7b5815d 100644 --- a/hosts/pochita-sd/configuration.nix +++ b/hosts/pochita-sd/configuration.nix @@ -1,8 +1,12 @@ { pkgs, - lib, + inputs, ... }: { + imports = [ + inputs.raspberry-pi-nix.nixosModules.raspberry-pi + inputs.raspberry-pi-nix.nixosModules.sd-image + ]; # bcm2711 for rpi 3, 3+, 4, zero 2 w # bcm2712 for rpi 5 # See the docs at: From 9142742c6c67235bf6ffb645a4a8cdaa1492b7a3 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 01:45:52 +0300 Subject: [PATCH 0589/1768] add deploy-rs --- flake.lock | 88 +++++++++++++++++++++++++++++++++++++++++++++++++----- flake.nix | 4 +++ 2 files changed, 84 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index c80e559..90c8c5c 100644 --- a/flake.lock +++ b/flake.lock @@ -47,6 +47,44 @@ "type": "github" } }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", + "type": "github" + }, + "original": { + "owner": "serokell", + "repo": "deploy-rs", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -70,7 +108,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -88,7 +126,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -111,11 +149,11 @@ ] }, "locked": { - "lastModified": 1740432748, - "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=", + "lastModified": 1740494361, + "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319", + "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "type": "github" }, "original": { @@ -371,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740432393, - "narHash": "sha256-uXlB7bTlrl0q2jryKMSRlU+GptkVJN7PTsqdKkaFg1M=", + "lastModified": 1740520037, + "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", "owner": "nix-community", "repo": "nixvim", - "rev": "53f9d242ffdf0997109d0b5b8bbbcc67a4296077", + "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", "type": "github" }, "original": { @@ -531,6 +569,7 @@ "root": { "inputs": { "agenix": "agenix", + "deploy-rs": "deploy-rs", "home-manager": "home-manager", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", @@ -721,6 +760,39 @@ "type": "github" } }, + "systems_4": { + "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_2" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_2", diff --git a/flake.nix b/flake.nix index 3804fd2..f9ce3d8 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,10 @@ url = "github:nix-community/nixos-vscode-server"; inputs.nixpkgs.follows = "nixpkgs"; }; + deploy-rs = { + url = "github:serokell/deploy-rs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { From cbe75701cca212cc7784016e8ee9be69c3e5943f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 02:40:17 +0300 Subject: [PATCH 0590/1768] add deploy-rs --- flake.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/flake.nix b/flake.nix index f9ce3d8..cff0620 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ self, nixpkgs, nix-on-droid, + deploy-rs, ... } @ inputs: let inherit (self) outputs; @@ -91,5 +92,15 @@ formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; + deploy = { + user = "root"; + nodes = { + zero2w = { + hostname = "harmonica"; + profiles.system.path = + deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.zero2w; + }; + }; + }; }; } From b5b2665e99346ba7796c5226ee0699145c6712ea Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 02:52:33 +0300 Subject: [PATCH 0591/1768] add harmonica ssh config --- home/ssh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/ssh.nix b/home/ssh.nix index 502445f..a9613b3 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -32,6 +32,8 @@ in { tartarus-ts = sshBlock "tartarus.curl-boga.ts.net"; pochita = sshBlock "192.168.0.9"; pochita-ts = sshBlock "pochita.curl-boga.ts.net"; + harmonica = sshBlock "192.168.0.11"; + harmonica-ts = sshBlock "harmonica.curl-boga.ts.net"; }; }; } From e90a9873a4ddeb4efc65ba092e840b7d5e90d2be Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 03:10:37 +0300 Subject: [PATCH 0592/1768] add ani-cli --- hosts/atreus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index ed36039..a5d7956 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -70,6 +70,7 @@ git commit -m "Android sync" git push '') + ani-cli ]; # Backup etc files instead of failing to activate generation if a file already exists in /etc From b7957bca71985a8448f98f110dae660b239396b9 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Feb 2025 22:55:01 +0300 Subject: [PATCH 0593/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 90c8c5c..41c2851 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1740494361, - "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", + "lastModified": 1740579671, + "narHash": "sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", + "rev": "53c587d263f94aaf6a281745923c76bbec62bcf3", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1740476265, - "narHash": "sha256-fPWpdDENumQl1e31C9a1HzciuYEG2L2YmvS1DjTt3j0=", + "lastModified": 1740570809, + "narHash": "sha256-zAHVk2TE7mtGIaPauEl/ykqmGy9Xe5Kl0XVYLEAsyBI=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "fe01f0d6507b6639e5faea730987baf53a485982", + "rev": "2a8094b5e0a64b139d8ee49804e5173f1d851198", "type": "github" }, "original": { From c14da8e17655a885d9330a0bd904526b92d1e770 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 12:53:37 +0300 Subject: [PATCH 0594/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 41c2851..6e7abda 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1740579671, - "narHash": "sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw=", + "lastModified": 1740624780, + "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "53c587d263f94aaf6a281745923c76bbec62bcf3", + "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740387674, - "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d58f642ddb23320965b27beb0beba7236e9117b5", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { From 1cbeba0f18ad58673c39b6160d79d34d03883bbe Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 19:29:29 +0300 Subject: [PATCH 0595/1768] harmonica-sd --- hosts/harmonica-sd/configuration.nix | 54 +++++++++++++ hosts/harmonica-sd/hardware-configuration.nix | 81 +++++++++++++++++++ hosts/harmonica-sd/sd-image.nix | 39 +++++++++ 3 files changed, 174 insertions(+) create mode 100644 hosts/harmonica-sd/configuration.nix create mode 100644 hosts/harmonica-sd/hardware-configuration.nix create mode 100644 hosts/harmonica-sd/sd-image.nix diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/harmonica-sd/configuration.nix new file mode 100644 index 0000000..dfe7fd2 --- /dev/null +++ b/hosts/harmonica-sd/configuration.nix @@ -0,0 +1,54 @@ +{ + lib, + inputs, + ... +}: { + imports = [ + ./sd-image.nix + "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" + ./hardware-configuration.nix + ../../modules + inputs.agenix.nixosModules.default + inputs.home-manager.nixosModules.home-manager + inputs.vscode-server.nixosModules.default + ]; + + myModules = { + enableKDE = false; + enableFonts = false; + blockYoutube = false; + blockTwitter = false; + enableTailscale = true; + }; + + i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method + + system.stateVersion = "25.05"; + + networking.hostName = "harmonica"; + + networking = { + interfaces."wlan0".useDHCP = true; + wireless = { + enable = true; + interfaces = ["wlan0"]; + networks = { + "House_Bayram" = { + psk = "PASSWORD"; + }; + "it_hurts_when_IP" = { + psk = "PASSWORD"; + }; + }; + }; + }; + + # NTP time sync. + services.timesyncd.enable = true; + + security.sudo = { + enable = true; + wheelNeedsPassword = false; + }; + services.getty.autologinUser = "osbm"; +} diff --git a/hosts/harmonica-sd/hardware-configuration.nix b/hosts/harmonica-sd/hardware-configuration.nix new file mode 100644 index 0000000..6627bca --- /dev/null +++ b/hosts/harmonica-sd/hardware-configuration.nix @@ -0,0 +1,81 @@ +{ + pkgs, + lib, + ... +}: { + # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 + nixpkgs.overlays = [ + (final: super: { + makeModulesClosure = x: + super.makeModulesClosure (x // {allowMissing = true;}); + }) + ]; + + zramSwap = { + enable = true; + algorithm = "zstd"; + }; + + sdImage = { + # bzip2 compression takes loads of time with emulation, skip it. Enable this if you're low on space. + compressImage = false; + imageName = "zero2.img"; + + extraFirmwareConfig = { + # Give up VRAM for more Free System Memory + # - Disable camera which automatically reserves 128MB VRAM + start_x = 0; + # - Reduce allocation of VRAM to 16MB minimum for non-rotated (32MB for rotated) + gpu_mem = 16; + + # Configure display to 800x600 so it fits on most screens + # * See: https://elinux.org/RPi_Configuration + hdmi_group = 2; + hdmi_mode = 8; + }; + }; + + hardware = { + enableRedistributableFirmware = lib.mkForce false; + firmware = [pkgs.raspberrypiWirelessFirmware]; # Keep this to make sure wifi works + i2c.enable = true; + deviceTree.filter = "bcm2837-rpi-zero*.dtb"; + deviceTree.overlays = [ + { + name = "enable-i2c"; + dtsText = '' + /dts-v1/; + /plugin/; + / { + compatible = "brcm,bcm2837"; + fragment@0 { + target = <&i2c1>; + __overlay__ { + status = "okay"; + }; + }; + }; + ''; + } + ]; + }; + + boot = { + kernelPackages = pkgs.linuxPackages_rpi02w; + + initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage"]; + loader = { + grub.enable = false; + generic-extlinux-compatible.enable = true; + }; + extraModprobeConfig = '' + options brcmfmac roamoff=1 feature_disable=0x82000 + ''; + + # Avoids warning: mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash. + # See: https://github.com/NixOS/nixpkgs/issues/254807 + swraid.enable = lib.mkForce false; + }; + + nixpkgs.hostPlatform = "aarch64-linux"; +} diff --git a/hosts/harmonica-sd/sd-image.nix b/hosts/harmonica-sd/sd-image.nix new file mode 100644 index 0000000..1893925 --- /dev/null +++ b/hosts/harmonica-sd/sd-image.nix @@ -0,0 +1,39 @@ +# This module extends the official sd-image.nix with the following: +# - ability to add options to the config.txt firmware +{ + config, + lib, + ... +}: { + options.sdImage = with lib; { + extraFirmwareConfig = mkOption { + type = types.attrs; + default = {}; + description = lib.mdDoc '' + Extra configuration to be added to config.txt. + ''; + }; + }; + + config = { + sdImage.populateFirmwareCommands = + lib.mkIf ((lib.length (lib.attrValues config.sdImage.extraFirmwareConfig)) > 0) + ( + let + # Convert the set into a string of lines of "key=value" pairs. + keyValueMap = name: value: name + "=" + toString value; + keyValueList = lib.mapAttrsToList keyValueMap config.sdImage.extraFirmwareConfig; + extraFirmwareConfigString = lib.concatStringsSep "\n" keyValueList; + in + lib.mkAfter + '' + config=firmware/config.txt + # The initial file has just been created without write permissions. Add them to be able to append the file. + chmod u+w $config + echo "\n# Extra configuration" >> $config + echo "${extraFirmwareConfigString}" >> $config + chmod u-w $config + '' + ); + }; +} From c0f591787abc4155e236d03c3d21543b523a141c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 19:30:15 +0300 Subject: [PATCH 0596/1768] i staging all over --- hosts/harmonica/configuration.nix | 18 ---------- hosts/harmonica/hardware-configuration.nix | 20 +++-------- hosts/harmonica/sd-image.nix | 39 ---------------------- 3 files changed, 4 insertions(+), 73 deletions(-) delete mode 100644 hosts/harmonica/sd-image.nix diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index dfe7fd2..ce7cdd4 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -4,8 +4,6 @@ ... }: { imports = [ - ./sd-image.nix - "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ./hardware-configuration.nix ../../modules inputs.agenix.nixosModules.default @@ -27,22 +25,6 @@ networking.hostName = "harmonica"; - networking = { - interfaces."wlan0".useDHCP = true; - wireless = { - enable = true; - interfaces = ["wlan0"]; - networks = { - "House_Bayram" = { - psk = "PASSWORD"; - }; - "it_hurts_when_IP" = { - psk = "PASSWORD"; - }; - }; - }; - }; - # NTP time sync. services.timesyncd.enable = true; diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/harmonica/hardware-configuration.nix index 6627bca..6e22dea 100644 --- a/hosts/harmonica/hardware-configuration.nix +++ b/hosts/harmonica/hardware-configuration.nix @@ -16,24 +16,12 @@ algorithm = "zstd"; }; - sdImage = { - # bzip2 compression takes loads of time with emulation, skip it. Enable this if you're low on space. - compressImage = false; - imageName = "zero2.img"; - extraFirmwareConfig = { - # Give up VRAM for more Free System Memory - # - Disable camera which automatically reserves 128MB VRAM - start_x = 0; - # - Reduce allocation of VRAM to 16MB minimum for non-rotated (32MB for rotated) - gpu_mem = 16; - - # Configure display to 800x600 so it fits on most screens - # * See: https://elinux.org/RPi_Configuration - hdmi_group = 2; - hdmi_mode = 8; + fileSystems."/" = { + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; }; - }; + hardware = { enableRedistributableFirmware = lib.mkForce false; diff --git a/hosts/harmonica/sd-image.nix b/hosts/harmonica/sd-image.nix deleted file mode 100644 index 1893925..0000000 --- a/hosts/harmonica/sd-image.nix +++ /dev/null @@ -1,39 +0,0 @@ -# This module extends the official sd-image.nix with the following: -# - ability to add options to the config.txt firmware -{ - config, - lib, - ... -}: { - options.sdImage = with lib; { - extraFirmwareConfig = mkOption { - type = types.attrs; - default = {}; - description = lib.mdDoc '' - Extra configuration to be added to config.txt. - ''; - }; - }; - - config = { - sdImage.populateFirmwareCommands = - lib.mkIf ((lib.length (lib.attrValues config.sdImage.extraFirmwareConfig)) > 0) - ( - let - # Convert the set into a string of lines of "key=value" pairs. - keyValueMap = name: value: name + "=" + toString value; - keyValueList = lib.mapAttrsToList keyValueMap config.sdImage.extraFirmwareConfig; - extraFirmwareConfigString = lib.concatStringsSep "\n" keyValueList; - in - lib.mkAfter - '' - config=firmware/config.txt - # The initial file has just been created without write permissions. Add them to be able to append the file. - chmod u+w $config - echo "\n# Extra configuration" >> $config - echo "${extraFirmwareConfigString}" >> $config - chmod u-w $config - '' - ); - }; -} From 766147962795537037247ea2387fadb67823aa72 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 19:30:34 +0300 Subject: [PATCH 0597/1768] add harmonica sd --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index cff0620..a7cbb0c 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,10 @@ specialArgs = {inherit inputs outputs;}; modules = [./hosts/harmonica/configuration.nix]; }; + harmonica-sd = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [./hosts/harmonica-sd/configuration.nix]; + }; pochita = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [./hosts/pochita/configuration.nix]; From d4ecc60cc62b888651ea3fe79b9d913b4292bbdc Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 19:31:39 +0300 Subject: [PATCH 0598/1768] formatting --- hosts/harmonica/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/harmonica/hardware-configuration.nix index 6e22dea..7186806 100644 --- a/hosts/harmonica/hardware-configuration.nix +++ b/hosts/harmonica/hardware-configuration.nix @@ -20,7 +20,7 @@ fileSystems."/" = { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; fsType = "ext4"; - }; + }; hardware = { From 62ab5d54f1b967d494b184722035f597e6e4d0ed Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 19:31:50 +0300 Subject: [PATCH 0599/1768] formatting --- hosts/harmonica/hardware-configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/harmonica/hardware-configuration.nix index 7186806..1a0ba46 100644 --- a/hosts/harmonica/hardware-configuration.nix +++ b/hosts/harmonica/hardware-configuration.nix @@ -16,13 +16,11 @@ algorithm = "zstd"; }; - fileSystems."/" = { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; fsType = "ext4"; }; - hardware = { enableRedistributableFirmware = lib.mkForce false; firmware = [pkgs.raspberrypiWirelessFirmware]; # Keep this to make sure wifi works From 5e18abfe4be42b30642f4fa424bf651396669fe6 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 19:35:45 +0300 Subject: [PATCH 0600/1768] hotfix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index a7cbb0c..52059b3 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ zero2w = { hostname = "harmonica"; profiles.system.path = - deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.zero2w; + deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.harmonica; }; }; }; From c677b1899698fffa2afea650733cc7da829d78c2 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 22:18:59 +0300 Subject: [PATCH 0601/1768] pochita add forgejo --- hosts/pochita/configuration.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 5acfac5..3489dd7 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -25,9 +25,11 @@ i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method - # enable hyprland - # programs.hyprland.enable = true; - + # enable forgejo + services.forgejo = { + enable = true; + # port = 8080; + }; networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" From 8d48e17c3530d545e909cf0b2d74d31b47a26eac Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Feb 2025 22:19:15 +0300 Subject: [PATCH 0602/1768] lets try this --- flake.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 52059b3..586c5d2 100644 --- a/flake.nix +++ b/flake.nix @@ -96,14 +96,11 @@ formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; - deploy = { - user = "root"; - nodes = { - zero2w = { - hostname = "harmonica"; - profiles.system.path = - deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.harmonica; - }; + deploy.nodes.harmonica = { + hostname = "192.168.0.11"; + profiles.system = { + user = "osbm"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; }; }; }; From 6e1d75ae7e7e7359f9164663185fcb4df68fe9e8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 28 Feb 2025 02:20:39 +0300 Subject: [PATCH 0603/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6e7abda..c2c23c5 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1740624780, - "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", + "lastModified": 1740679976, + "narHash": "sha256-6U/zvgtcGJqpOTKsIgf+mRO7/djwV07ImU/t0nZBix8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", + "rev": "343646e092696d94b6f22b6875ae685756fd4cf0", "type": "github" }, "original": { @@ -306,11 +306,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1739909050, - "narHash": "sha256-BIP6OM1VoiO9vihxqvtpo+Y76DMmvXWFR02NSs+tYjQ=", + "lastModified": 1740680619, + "narHash": "sha256-06UHfULamFsF/kyPnuJEm2EPG0E5A58lwzixU4HkTSc=", "owner": "osbm", "repo": "nix-on-droid", - "rev": "114274bad04436737da8ccf3e912178efef250ff", + "rev": "b030861919a0f6d629c09e88160b92d5341ce475", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { From 2e58955a95360b8fd634c67e373c4551822a7101 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Mar 2025 10:50:39 +0300 Subject: [PATCH 0604/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c2c23c5..61b070c 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1740679976, - "narHash": "sha256-6U/zvgtcGJqpOTKsIgf+mRO7/djwV07ImU/t0nZBix8=", + "lastModified": 1740796616, + "narHash": "sha256-JU97wIfRxeFN6rpTsUVCwWAdix+Wka4Or23907YIrFI=", "owner": "nix-community", "repo": "home-manager", - "rev": "343646e092696d94b6f22b6875ae685756fd4cf0", + "rev": "f0b5e7e8a75abdea32bbff09ddd7b6eeb4b9b445", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { From 95b7c9225958e4173c7e6d3cd44fa1b6202d89ad Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Mar 2025 11:31:30 +0300 Subject: [PATCH 0605/1768] add adb module --- hosts/ymir/configuration.nix | 1 + modules/adb.nix | 20 ++++++++++++++++++++ modules/default.nix | 1 + 3 files changed, 22 insertions(+) create mode 100644 modules/adb.nix diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 5191b46..d98114e 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -24,6 +24,7 @@ disableHibernation = true; enableWakeOnLan = true; enableSound = true; + enableADB = true; }; # Bootloader. diff --git a/modules/adb.nix b/modules/adb.nix new file mode 100644 index 0000000..85e5b48 --- /dev/null +++ b/modules/adb.nix @@ -0,0 +1,20 @@ +{ + lib, + config, + ... +}: { + options = { + myModules.enableADB = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable ADB support"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableADB { + programs.adb.enable = true; + users.users.osbm.extraGroups = ["adbusers"]; + }) + ]; +} diff --git a/modules/default.nix b/modules/default.nix index 9d30420..9f55cdf 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./adb.nix ./arduino.nix ./common-packages.nix ./concentration.nix From b42f986b5edbaecf80f6e4140e05a85ad40011b0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Mar 2025 23:17:14 +0300 Subject: [PATCH 0606/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 61b070c..51e204a 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1740796616, - "narHash": "sha256-JU97wIfRxeFN6rpTsUVCwWAdix+Wka4Or23907YIrFI=", + "lastModified": 1740845322, + "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "f0b5e7e8a75abdea32bbff09ddd7b6eeb4b9b445", + "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", "type": "github" }, "original": { From 79904a3ded3a1b3aaa7a57bc74ca4d4f4eb83a8b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Mar 2025 23:17:39 +0300 Subject: [PATCH 0607/1768] add reverse proxy for git server --- hosts/pochita/configuration.nix | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 3489dd7..cbbf7ff 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -28,8 +28,32 @@ # enable forgejo services.forgejo = { enable = true; - # port = 8080; + settings = { + server = { + DOMAIN = "git.osbm.dev"; + ROOT_URL = "https://git.osbm.dev"; + }; + service = { + DISABLE_REGISTRATION = false; + }; + }; }; + + # i configured so that the git.osbm.dev domain points to tailscale domain + # git.osbm.dev -> pochita.curl-boga.ts.net + # and i want everyone to see the repositories in the git.osbm.dev domain + # but only i want to make changes, login, etc + # so i disabled registration + services.caddy = { + enable = true; + email = "contact@osbm.dev"; + config = '' + git.osbm.dev { + reverse_proxy localhost:3000 + } + ''; + }; + networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" From dff5cff2bc1025968c1a254347337463679d87a8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 00:14:20 +0300 Subject: [PATCH 0608/1768] enable ports? --- hosts/pochita/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index cbbf7ff..0a5881b 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -54,6 +54,9 @@ ''; }; + # now, for the ports of the caddy server + networking.firewall.allowedTCPPorts = [ 80 443 3000 ]; + networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" From afc2c2aaf824448438bff43c881ba6b797b1f67b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 00:32:15 +0300 Subject: [PATCH 0609/1768] add plugin --- hosts/pochita/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 0a5881b..e97b8a0 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -46,6 +46,12 @@ # so i disabled registration services.caddy = { enable = true; + package = pkgs.caddy.withPlugins { + # update time to time + # last update: 2025-03-02 + plugins = [ "github.com/caddy-dns/cloudflare@1fb64108d4debf196b19d7398e763cb78c8a0f41" ]; + hash = ""; + }; email = "contact@osbm.dev"; config = '' git.osbm.dev { From 5157595bc45b74c9148b3c7b3264bf841d0de04a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 00:34:18 +0300 Subject: [PATCH 0610/1768] fill out hash --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index e97b8a0..dc0be0c 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -50,7 +50,7 @@ # update time to time # last update: 2025-03-02 plugins = [ "github.com/caddy-dns/cloudflare@1fb64108d4debf196b19d7398e763cb78c8a0f41" ]; - hash = ""; + hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; }; email = "contact@osbm.dev"; config = '' From 7e9c32fabe3e5390ef95343a4bfb87778597201c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 00:38:11 +0300 Subject: [PATCH 0611/1768] why the fuck --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index dc0be0c..2ef0e6a 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -49,7 +49,7 @@ package = pkgs.caddy.withPlugins { # update time to time # last update: 2025-03-02 - plugins = [ "github.com/caddy-dns/cloudflare@1fb64108d4debf196b19d7398e763cb78c8a0f41" ]; + plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ]; hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; }; email = "contact@osbm.dev"; From 5e555895df68d1a6348ad2475a68f7e5493d1863 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 01:01:08 +0300 Subject: [PATCH 0612/1768] add virtual hosts --- hosts/pochita/configuration.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 2ef0e6a..7558b7b 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -53,11 +53,16 @@ hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; }; email = "contact@osbm.dev"; - config = '' - git.osbm.dev { - reverse_proxy localhost:3000 - } - ''; + virtualHosts = { + "git.osbm.dev" = { + # serverAliases = [ "www.git.osbm.dev" ]; + # hostname = "git.osbm.dev"; + # listenAddresses = [ "0.0.0.0" ]; + extraConfig = '' + reverse_proxy http://localhost:3000 + ''; + }; + }; }; # now, for the ports of the caddy server From 97f77a90892c71626b9612a51633621773d219b4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 02:50:19 +0300 Subject: [PATCH 0613/1768] formatting --- hosts/pochita/configuration.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 7558b7b..410fe45 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -47,11 +47,11 @@ services.caddy = { enable = true; package = pkgs.caddy.withPlugins { - # update time to time - # last update: 2025-03-02 - plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ]; - hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; - }; + # update time to time + # last update: 2025-03-02 + plugins = ["github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de"]; + hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; + }; email = "contact@osbm.dev"; virtualHosts = { "git.osbm.dev" = { @@ -66,7 +66,7 @@ }; # now, for the ports of the caddy server - networking.firewall.allowedTCPPorts = [ 80 443 3000 ]; + networking.firewall.allowedTCPPorts = [80 443 3000]; networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" From 16b73f5e155807fd459e710ccb8212a98ad5668f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 13:11:19 +0300 Subject: [PATCH 0614/1768] add cloudflare secret --- modules/secrets.nix | 1 + secrets/cloudflare.age | 11 +++++++++++ secrets/secrets.nix | 1 + 3 files changed, 13 insertions(+) create mode 100644 secrets/cloudflare.age diff --git a/modules/secrets.nix b/modules/secrets.nix index 5f4af4b..55f9b3d 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -34,6 +34,7 @@ owner = "osbm"; mode = "0644"; }; + cloudflare.file = ../secrets/cloudflare.age; }; }) ]; diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age new file mode 100644 index 0000000..878521d --- /dev/null +++ b/secrets/cloudflare.age @@ -0,0 +1,11 @@ +age-encryption.org/v1 +-> ssh-ed25519 YVcKMQ AcOERGRIWGHPh5Yiyv+qhUeAxvqlVm/CK3ccLUHr+QQ +ikymn9p1hd/WwNBy56zjDCe9PYpzlaNUrsVPLqBmx/E +-> ssh-ed25519 a9zBzw CROEWbssNy0ZR6XAMlZge4WXo9bbIr3STZTbJd60Gy4 +sEm1PQlQqn/YWCd0mFLNPodytjPKzTuKcE4qdzqP5/U +-> ssh-ed25519 lB8z1g 9whbK/aiWpHuJodOV9/9S7HVu627rATrFpa0BNgJJS0 +7NvwByFdit69wGUYqUnbjzOh3FYhFcOm+WFV3+zYIy4 +-> ssh-ed25519 Ws1uag tceqObVyXX5rL4Qnb+a4u684FIurr3t4GBiY3MLPl0Q +DAnrk6TPB019RNYwct0EzJGFtepifabD6p7ALvtyLGw +--- dljwCcBDPCMpDAq4K7d3plHm+9byKYMyTHNwbjSfAho +i;#^ SG |iJʽɐn 4`)H Y%g7"FF5P4u+ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 995fe7a..e82e78d 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -14,4 +14,5 @@ in { "network-manager.age".publicKeys = machines ++ [osbm]; "ssh-key-private.age".publicKeys = machines ++ [osbm]; "ssh-key-public.age".publicKeys = machines ++ [osbm]; + "cloudflare.age".publicKeys = machines ++ [osbm]; } From 63ba081e9c74c0e942472fd9dcfead516826ab8e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Mar 2025 13:27:20 +0300 Subject: [PATCH 0615/1768] make forgejo and caddy into modules --- hosts/pochita/configuration.nix | 44 ++--------------------------- modules/caddy.nix | 49 +++++++++++++++++++++++++++++++++ modules/default.nix | 2 ++ modules/forgejo.nix | 39 ++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 42 deletions(-) create mode 100644 modules/caddy.nix create mode 100644 modules/forgejo.nix diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 410fe45..a243402 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -21,52 +21,12 @@ blockYoutube = false; blockTwitter = false; enableTailscale = true; + enableForgejo = true; + enableCaddy = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method - # enable forgejo - services.forgejo = { - enable = true; - settings = { - server = { - DOMAIN = "git.osbm.dev"; - ROOT_URL = "https://git.osbm.dev"; - }; - service = { - DISABLE_REGISTRATION = false; - }; - }; - }; - - # i configured so that the git.osbm.dev domain points to tailscale domain - # git.osbm.dev -> pochita.curl-boga.ts.net - # and i want everyone to see the repositories in the git.osbm.dev domain - # but only i want to make changes, login, etc - # so i disabled registration - services.caddy = { - enable = true; - package = pkgs.caddy.withPlugins { - # update time to time - # last update: 2025-03-02 - plugins = ["github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de"]; - hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; - }; - email = "contact@osbm.dev"; - virtualHosts = { - "git.osbm.dev" = { - # serverAliases = [ "www.git.osbm.dev" ]; - # hostname = "git.osbm.dev"; - # listenAddresses = [ "0.0.0.0" ]; - extraConfig = '' - reverse_proxy http://localhost:3000 - ''; - }; - }; - }; - - # now, for the ports of the caddy server - networking.firewall.allowedTCPPorts = [80 443 3000]; networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" diff --git a/modules/caddy.nix b/modules/caddy.nix new file mode 100644 index 0000000..bfdeeb3 --- /dev/null +++ b/modules/caddy.nix @@ -0,0 +1,49 @@ +{pkgs, lib, config, ...}: { + + options = { + myModules.enableCaddy = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Caddy server"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableCaddy { + services.caddy = { + enable = true; + package = pkgs.caddy.withPlugins { + # update time to time + # last update: 2025-03-02 + plugins = ["github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de"]; + hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; + }; + email = "contact@osbm.dev"; + extraConfig = '' + (cloudflare) { + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + } + ''; + }; + + networking.firewall.allowedTCPPorts = [80 443 3000]; + + systemd.services.caddy.serviceConfig = { + LoadCredential = "CLOUDFLARE_API_TOKEN:${config.age.secrets.cloudflare.path}"; + EnvironmentFile = "-%t/caddy/secrets.env"; + RuntimeDirectory = "caddy"; + ExecStartPre = [ + ((pkgs.writeShellApplication { + name = "caddy-secrets"; + text = "echo \"CLOUDFLARE_API_TOKEN=\\\"$(<\"$CREDENTIALS_DIRECTORY/CLOUDFLARE_API_TOKEN\")\\\"\" > \"$RUNTIME_DIRECTORY/secrets.env\""; + }) + + "/bin/caddy-secrets") + ]; + AmbientCapabilities = "cap_net_bind_service"; + CapabilityBoundingSet = "cap_net_bind_service"; + }; + }) + ]; +} \ No newline at end of file diff --git a/modules/default.nix b/modules/default.nix index 9f55cdf..b151a3c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,11 +2,13 @@ imports = [ ./adb.nix ./arduino.nix + ./caddy.nix ./common-packages.nix ./concentration.nix ./disable-hibernation.nix ./emulation.nix ./fonts.nix + ./forgejo.nix ./graphical-interface.nix ./i18n.nix ./jellyfin.nix diff --git a/modules/forgejo.nix b/modules/forgejo.nix new file mode 100644 index 0000000..4c65fa4 --- /dev/null +++ b/modules/forgejo.nix @@ -0,0 +1,39 @@ +{ + lib, + config, + ... +}: { + options = { + myModules.enableForgejo = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Forgejo server"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableForgejo { + services.forgejo = { + enable = true; + settings = { + server = { + DOMAIN = "git.osbm.dev"; + ROOT_URL = "https://git.osbm.dev"; + }; + service = { + DISABLE_REGISTRATION = false; + }; + }; + }; + }) + # if enableForgejo and enableCaddy are enabled, add forgejo to caddy + (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) { + services.caddy.virtualHosts."git.osbm.dev" = { + extraConfig = '' + reverse_proxy http://localhost:3000 + import cloudflare + ''; + }; + }) + ]; +} \ No newline at end of file From 94cb81e51353df33aa97689da0c352db2d71ac12 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 3 Mar 2025 03:24:43 +0300 Subject: [PATCH 0616/1768] whut --- modules/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index 4c65fa4..e47848f 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -31,7 +31,7 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy http://localhost:3000 - import cloudflare + tls internal ''; }; }) From b2355dfb37d7e3c031f9589577a4e8dcecfef231 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 3 Mar 2025 06:13:57 +0300 Subject: [PATCH 0617/1768] update flake.lock --- flake.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 51e204a..d6201eb 100644 --- a/flake.lock +++ b/flake.lock @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "lastModified": 1740828860, + "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "type": "github" }, "original": { @@ -547,17 +547,17 @@ "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", - "rpi-linux-6_12_11-src": "rpi-linux-6_12_11-src", - "rpi-linux-6_6_67-src": "rpi-linux-6_6_67-src", + "rpi-linux-6_12_17-src": "rpi-linux-6_12_17-src", + "rpi-linux-6_6_78-src": "rpi-linux-6_6_78-src", "rpi-linux-stable-src": "rpi-linux-stable-src", "rpicam-apps-src": "rpicam-apps-src" }, "locked": { - "lastModified": 1740187527, - "narHash": "sha256-thcUeJlXJ6lD5s1UDKE3jYyzdSRxMjcE/mSWf5Y0KHU=", + "lastModified": 1740928520, + "narHash": "sha256-NL5qZi0iEEvQK9kMF6r48FOk5WMdQExCqodRH3kEr0g=", "owner": "nix-community", "repo": "raspberry-pi-nix", - "rev": "4f6706677c4adeca591ada531fc4d7b7b68c0414", + "rev": "3bfda6add79c55f9bf143fac928f54484d450e87", "type": "github" }, "original": { @@ -631,14 +631,14 @@ "type": "github" } }, - "rpi-linux-6_12_11-src": { + "rpi-linux-6_12_17-src": { "flake": false, "locked": { - "lastModified": 1738149451, - "narHash": "sha256-NGmZcaC2vlewTEV/p0z2+6PWnHB229dkGui45kI8HOE=", + "lastModified": 1740765145, + "narHash": "sha256-hoCsGc4+RC/2LmxDtswLBL5ZhWlw4vSiL4Vkl39r2MU=", "owner": "raspberrypi", "repo": "linux", - "rev": "fab655ee33e6d647da5996c5548cfd7d43447a53", + "rev": "5985ce32e511f4e8279a841a1b06a8c7d972b386", "type": "github" }, "original": { @@ -648,14 +648,14 @@ "type": "github" } }, - "rpi-linux-6_6_67-src": { + "rpi-linux-6_6_78-src": { "flake": false, "locked": { - "lastModified": 1734790986, - "narHash": "sha256-q9swM2TmmuzbUuQnbLZk5PseKWD7/SNPwtth6bpGIqE=", + "lastModified": 1740503700, + "narHash": "sha256-Y8+ot4Yi3UKwlZK3ap15rZZ16VZDvmeFkD46+6Ku7bE=", "owner": "raspberrypi", "repo": "linux", - "rev": "811ff707533bcd67cdcd368bbd46223082009b12", + "rev": "2e071057fded90e789c0101498e45a1778be93fe", "type": "github" }, "original": { From 5393f464b177518d54f2fd617c0c9b9cd29ada5a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 3 Mar 2025 22:17:20 +0300 Subject: [PATCH 0618/1768] add nss to caddy conf --- modules/caddy.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index bfdeeb3..dea8eda 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -30,6 +30,10 @@ networking.firewall.allowedTCPPorts = [80 443 3000]; + environment.systemPackages = with pkgs; [ + nssTools + ]; + systemd.services.caddy.serviceConfig = { LoadCredential = "CLOUDFLARE_API_TOKEN:${config.age.secrets.cloudflare.path}"; EnvironmentFile = "-%t/caddy/secrets.env"; @@ -46,4 +50,4 @@ }; }) ]; -} \ No newline at end of file +} From 0f89b21a418081138f802f2c4fbc476e890cbe58 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 3 Mar 2025 23:13:12 +0300 Subject: [PATCH 0619/1768] use CF SSL --- modules/forgejo.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index e47848f..0663dfc 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -18,7 +18,7 @@ settings = { server = { DOMAIN = "git.osbm.dev"; - ROOT_URL = "https://git.osbm.dev"; + ROOT_URL = "https://git.osbm.dev/"; }; service = { DISABLE_REGISTRATION = false; @@ -31,9 +31,9 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy http://localhost:3000 - tls internal + import cloudflare ''; }; }) ]; -} \ No newline at end of file +} From f5df00db10d089e5d25931adc43da4dc73481569 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 00:09:16 +0300 Subject: [PATCH 0620/1768] update flake.lock --- modules/forgejo.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index 0663dfc..3d5d8da 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -31,7 +31,10 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy http://localhost:3000 - import cloudflare + transport http { + tls + tls_insecure_skip_verify + } ''; }; }) From 0c6c38badbd1aca2a07da99cd7c65827266663c1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 00:13:03 +0300 Subject: [PATCH 0621/1768] i am starting to get crazy --- modules/forgejo.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index 3d5d8da..e90757a 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -31,10 +31,6 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy http://localhost:3000 - transport http { - tls - tls_insecure_skip_verify - } ''; }; }) From a0e373e761ceccf6d5814403c205bdb6d648f03a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 01:33:48 +0300 Subject: [PATCH 0622/1768] lets do this then --- hosts/ymir/configuration.nix | 1 + modules/forgejo.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index d98114e..6a32887 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -25,6 +25,7 @@ enableWakeOnLan = true; enableSound = true; enableADB = true; + enableCaddy = true; }; # Bootloader. diff --git a/modules/forgejo.nix b/modules/forgejo.nix index e90757a..f1eb301 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -30,7 +30,8 @@ (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) { services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' - reverse_proxy http://localhost:3000 + reverse_proxy http://pochita.curl-boga.ts.net:3000 + import cloudflare ''; }; }) From 1acb6db231c5f9dd12e05a4c0b57d853a16d80a6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 01:48:17 +0300 Subject: [PATCH 0623/1768] without https --- modules/forgejo.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index f1eb301..8e2bbe9 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -30,8 +30,7 @@ (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) { services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' - reverse_proxy http://pochita.curl-boga.ts.net:3000 - import cloudflare + reverse_proxy pochita.curl-boga.ts.net:3000 ''; }; }) From c9015f68798b9b89a5576f0811de8dde3bc7d7e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 02:04:40 +0300 Subject: [PATCH 0624/1768] update secret --- modules/secrets.nix | 7 ++++++- secrets/cloudflare.age | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/modules/secrets.nix b/modules/secrets.nix index 55f9b3d..724731b 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -34,7 +34,12 @@ owner = "osbm"; mode = "0644"; }; - cloudflare.file = ../secrets/cloudflare.age; + cloudflare = { + file = ../secrets/cloudflare.age; + path = "/etc/caddy/.env"; + owner = "caddy"; + mode = "0600"; + }; }; }) ]; diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index 878521d..084c3d8 100644 --- a/secrets/cloudflare.age +++ b/secrets/cloudflare.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ AcOERGRIWGHPh5Yiyv+qhUeAxvqlVm/CK3ccLUHr+QQ -ikymn9p1hd/WwNBy56zjDCe9PYpzlaNUrsVPLqBmx/E --> ssh-ed25519 a9zBzw CROEWbssNy0ZR6XAMlZge4WXo9bbIr3STZTbJd60Gy4 -sEm1PQlQqn/YWCd0mFLNPodytjPKzTuKcE4qdzqP5/U --> ssh-ed25519 lB8z1g 9whbK/aiWpHuJodOV9/9S7HVu627rATrFpa0BNgJJS0 -7NvwByFdit69wGUYqUnbjzOh3FYhFcOm+WFV3+zYIy4 --> ssh-ed25519 Ws1uag tceqObVyXX5rL4Qnb+a4u684FIurr3t4GBiY3MLPl0Q -DAnrk6TPB019RNYwct0EzJGFtepifabD6p7ALvtyLGw ---- dljwCcBDPCMpDAq4K7d3plHm+9byKYMyTHNwbjSfAho -i;#^ SG |iJʽɐn 4`)H Y%g7"FF5P4u+ \ No newline at end of file +-> ssh-ed25519 YVcKMQ 1tWQfAEJKh46oMjcJqncys6i2HL8yED0bklnE4yBRRg +D7FTpNYmWBSuop3XB0thbEQF1Eh0KTHcTCplcWJd0ro +-> ssh-ed25519 a9zBzw ughYSYEWcvdaQ2DlUuGxguQhPVmVsmKPGqs1zXJOcxQ +0y5GL39yNEy1peNQhyqGlkpp9GR7iU6BpgELG0i/6TU +-> ssh-ed25519 lB8z1g SX7KTrwg50gt1ad7SPO/3TSvoMGmKyzfMoSIBvikCnk +E17BYBHGlpvT1RZUelWXZ9iPOVMTidJEHBM2DvuqAIk +-> ssh-ed25519 Ws1uag 1zhm1fm7N+sVkAGwPNqouqcVaa1FGoaxZ//hiM6E1wM +0i/+vNFCF0eLRdKJBQMwFwMdfiWY1ps7Gak1YsIBfB8 +--- 4s/L+YyMy/vqcHXEPyHtOi2a1ndzohsYdhhwh6dDNCA +et~2DgAØ :ŘtFsx#L^f/(tծ5Nk 21n4BS \ No newline at end of file From 7d7e2eec37debd2fcb01780434aff20115df3050 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 02:05:17 +0300 Subject: [PATCH 0625/1768] lets try this --- modules/caddy.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index dea8eda..407f891 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -35,18 +35,7 @@ ]; systemd.services.caddy.serviceConfig = { - LoadCredential = "CLOUDFLARE_API_TOKEN:${config.age.secrets.cloudflare.path}"; - EnvironmentFile = "-%t/caddy/secrets.env"; - RuntimeDirectory = "caddy"; - ExecStartPre = [ - ((pkgs.writeShellApplication { - name = "caddy-secrets"; - text = "echo \"CLOUDFLARE_API_TOKEN=\\\"$(<\"$CREDENTIALS_DIRECTORY/CLOUDFLARE_API_TOKEN\")\\\"\" > \"$RUNTIME_DIRECTORY/secrets.env\""; - }) - + "/bin/caddy-secrets") - ]; - AmbientCapabilities = "cap_net_bind_service"; - CapabilityBoundingSet = "cap_net_bind_service"; + EnvironmentFile = "/etc/caddy/.env"; }; }) ]; From 19316502db8bca61ba52bc9989ccbf6b84e49d0c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 02:14:07 +0300 Subject: [PATCH 0626/1768] just use the correct token --- modules/caddy.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index 407f891..3d3e25a 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -22,9 +22,10 @@ extraConfig = '' (cloudflare) { tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} + dns cloudflare {env.CF_API_TOKEN} } } + # acme_dns cloudflare {env.CF_API_TOKEN} ''; }; From a5a2225dd7650b76ecd9ae70cb7c3df46357e62b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 02:14:50 +0300 Subject: [PATCH 0627/1768] reenable cloudflare --- modules/forgejo.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index 8e2bbe9..f1d9346 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -31,6 +31,7 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy pochita.curl-boga.ts.net:3000 + import cloudflare ''; }; }) From 8d649d74e6f8bd210751731400f562b66163276f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 02:36:31 +0300 Subject: [PATCH 0628/1768] just disable caddy for now --- hosts/pochita/configuration.nix | 2 +- hosts/ymir/configuration.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index a243402..cb299dd 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -22,7 +22,7 @@ blockTwitter = false; enableTailscale = true; enableForgejo = true; - enableCaddy = true; + # enableCaddy = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 6a32887..68d7f2b 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -25,7 +25,7 @@ enableWakeOnLan = true; enableSound = true; enableADB = true; - enableCaddy = true; + # enableCaddy = true; }; # Bootloader. From af88a2576765610ab35c9747116c6ba0e381ece7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 18:13:05 +0300 Subject: [PATCH 0629/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index d6201eb..8f54f39 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1740845322, - "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", + "lastModified": 1741056285, + "narHash": "sha256-/JKDMVqq8PIqcGonBVKbKq1SooV3kzGmv+cp3rKAgPA=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", + "rev": "70fbbf05a5594b0a72124ab211bff1d502c89e3f", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1740520037, - "narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", + "lastModified": 1741098523, + "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", + "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "type": "github" }, "original": { From 1cebde6e73da813e87484758901f9df541256ff2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 18:23:58 +0300 Subject: [PATCH 0630/1768] i cant stop --- hosts/pochita/configuration.nix | 2 +- modules/caddy.nix | 12 ++++++------ modules/forgejo.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index cb299dd..a243402 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -22,7 +22,7 @@ blockTwitter = false; enableTailscale = true; enableForgejo = true; - # enableCaddy = true; + enableCaddy = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/modules/caddy.nix b/modules/caddy.nix index 3d3e25a..481c0be 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -20,12 +20,12 @@ }; email = "contact@osbm.dev"; extraConfig = '' - (cloudflare) { - tls { - dns cloudflare {env.CF_API_TOKEN} - } - } - # acme_dns cloudflare {env.CF_API_TOKEN} + # (cloudflare) { + # tls { + # dns cloudflare {env.CF_API_TOKEN} + # } + # } + acme_dns cloudflare {env.CF_API_TOKEN} ''; }; diff --git a/modules/forgejo.nix b/modules/forgejo.nix index f1d9346..d0c5ccf 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -31,7 +31,7 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy pochita.curl-boga.ts.net:3000 - import cloudflare + acme_dns cloudflare {env.CF_API_TOKEN} ''; }; }) From 4efc1d85885264528ab8f231272f93db8db5eee5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 18:26:22 +0300 Subject: [PATCH 0631/1768] how about this --- modules/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index 481c0be..8c18f51 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -25,7 +25,7 @@ # dns cloudflare {env.CF_API_TOKEN} # } # } - acme_dns cloudflare {env.CF_API_TOKEN} + # acme_dns cloudflare {env.CF_API_TOKEN} ''; }; From 779e2c4b174d53ef4067474563318b2d417a5e66 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 18:27:53 +0300 Subject: [PATCH 0632/1768] disable acme --- modules/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index d0c5ccf..2d5a8f3 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -31,7 +31,7 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy pochita.curl-boga.ts.net:3000 - acme_dns cloudflare {env.CF_API_TOKEN} + # acme_dns cloudflare {env.CF_API_TOKEN} ''; }; }) From 60ba5895d37c3f8ef5061eacb22c790eb8fe9ba5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 21:33:06 +0300 Subject: [PATCH 0633/1768] unnecessary arg --- modules/sound.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/sound.nix b/modules/sound.nix index 6c4b379..7b5f550 100644 --- a/modules/sound.nix +++ b/modules/sound.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... From 7d219d06e1e1e823458575c0eff89e5d796540cd Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 21:39:18 +0300 Subject: [PATCH 0634/1768] make ollama into a module --- hosts/ymir/configuration.nix | 20 +----------------- modules/default.nix | 1 + modules/ollama.nix | 40 ++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 19 deletions(-) create mode 100644 modules/ollama.nix diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 68d7f2b..a26d092 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -26,6 +26,7 @@ enableSound = true; enableADB = true; # enableCaddy = true; + enableOllama = true; }; # Bootloader. @@ -96,25 +97,6 @@ nixd ]; - services.ollama = { - enable = true; - acceleration = "cuda"; - loadModels = ["deepseek-r1:7b" "deepseek-r1:14b"]; - }; - - services.open-webui = { - enable = true; - port = 7070; - host = "0.0.0.0"; - openFirewall = true; - environment = { - SCARF_NO_ANALYTICS = "True"; - DO_NOT_TRACK = "True"; - ANONYMIZED_TELEMETRY = "False"; - WEBUI_AUTH = "False"; - ENABLE_LOGIN_FORM = "False"; - }; - }; system.stateVersion = "25.05"; # great taboo of the nixos world } diff --git a/modules/default.nix b/modules/default.nix index b151a3c..9f0fd16 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -13,6 +13,7 @@ ./i18n.nix ./jellyfin.nix ./nix-settings.nix + ./ollama.nix ./remote-builds.nix ./secrets.nix ./sound.nix diff --git a/modules/ollama.nix b/modules/ollama.nix new file mode 100644 index 0000000..4638a99 --- /dev/null +++ b/modules/ollama.nix @@ -0,0 +1,40 @@ +{ + lib, + config, + ... +}: { + options = { + myModules = { + enableOllama = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Ollama services."; + }; + }; + }; + + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableOllama { + services.ollama = { + enable = true; + acceleration = "cuda"; + loadModels = ["deepseek-r1:7b" "deepseek-r1:14b"]; + }; + + services.open-webui = { + enable = true; + port = 7070; + host = "0.0.0.0"; + openFirewall = true; + environment = { + SCARF_NO_ANALYTICS = "True"; + DO_NOT_TRACK = "True"; + ANONYMIZED_TELEMETRY = "False"; + WEBUI_AUTH = "False"; + ENABLE_LOGIN_FORM = "False"; + }; + }; + }) + ]; +} \ No newline at end of file From 644b7b90d3430d426763b68469348717779b9ed2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 21:39:49 +0300 Subject: [PATCH 0635/1768] formatting --- hosts/pochita/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - modules/caddy.nix | 8 ++++++-- modules/forgejo.nix | 20 ++++++++++---------- modules/ollama.nix | 3 +-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index a243402..1c14dd9 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,7 +27,6 @@ i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method - networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a26d092..0f959a7 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -97,6 +97,5 @@ nixd ]; - system.stateVersion = "25.05"; # great taboo of the nixos world } diff --git a/modules/caddy.nix b/modules/caddy.nix index 8c18f51..c071f09 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -1,5 +1,9 @@ -{pkgs, lib, config, ...}: { - +{ + pkgs, + lib, + config, + ... +}: { options = { myModules.enableCaddy = lib.mkOption { type = lib.types.bool; diff --git a/modules/forgejo.nix b/modules/forgejo.nix index 2d5a8f3..5046993 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -13,18 +13,18 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableForgejo { - services.forgejo = { - enable = true; - settings = { - server = { - DOMAIN = "git.osbm.dev"; - ROOT_URL = "https://git.osbm.dev/"; - }; - service = { - DISABLE_REGISTRATION = false; - }; + services.forgejo = { + enable = true; + settings = { + server = { + DOMAIN = "git.osbm.dev"; + ROOT_URL = "https://git.osbm.dev/"; + }; + service = { + DISABLE_REGISTRATION = false; }; }; + }; }) # if enableForgejo and enableCaddy are enabled, add forgejo to caddy (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) { diff --git a/modules/ollama.nix b/modules/ollama.nix index 4638a99..cb5dab8 100644 --- a/modules/ollama.nix +++ b/modules/ollama.nix @@ -13,7 +13,6 @@ }; }; - config = lib.mkMerge [ (lib.mkIf config.myModules.enableOllama { services.ollama = { @@ -37,4 +36,4 @@ }; }) ]; -} \ No newline at end of file +} From 263d2747f364443ab107083d040a46aea7fc1cba Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Mar 2025 22:06:14 +0300 Subject: [PATCH 0636/1768] add other services --- modules/caddy.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/caddy.nix b/modules/caddy.nix index c071f09..1e2387d 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -31,6 +31,18 @@ # } # acme_dns cloudflare {env.CF_API_TOKEN} ''; + virtualHosts = { + "jellyfin.ts.osbm.dev" = { + extraConfig = '' + reverse_proxy ymir.curl-boga.ts.net:8096 + ''; + }; + "chat.ts.osbm.dev" = { + extraConfig = '' + reverse_proxy ymir.curl-boga.ts.net:3000 + ''; + }; + }; }; networking.firewall.allowedTCPPorts = [80 443 3000]; From 1e7166dbdf2b16a6fb719b5b32ac220989187d50 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Mar 2025 00:01:06 +0300 Subject: [PATCH 0637/1768] fuck discord --- modules/graphical-interface.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 4d5733b..576b8c1 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -37,7 +37,6 @@ environment.systemPackages = with pkgs; [ sddm-sugar-dark vscode - discord # discord sucks alacritty obsidian mpv From c118d7290d27713f0cff46553876f1a681164d68 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Mar 2025 13:39:15 +0300 Subject: [PATCH 0638/1768] remove cd command doesnt work --- hosts/atreus/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index a5d7956..97270f8 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -52,9 +52,6 @@ # git commit -m "Android sync" # git push # '') - (pkgs.writeShellScriptBin "cd-rerouting" '' - cd /storage/emulated/0/Documents/rerouting - '') (pkgs.writeShellScriptBin "rerouting-status" '' cd /storage/emulated/0/Documents/rerouting git fetch From 9b16b0c33ef494727332a8047a4f3429032fe391 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Mar 2025 22:48:24 +0300 Subject: [PATCH 0639/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8f54f39..994c188 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741056285, - "narHash": "sha256-/JKDMVqq8PIqcGonBVKbKq1SooV3kzGmv+cp3rKAgPA=", + "lastModified": 1741217763, + "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", "owner": "nix-community", "repo": "home-manager", - "rev": "70fbbf05a5594b0a72124ab211bff1d502c89e3f", + "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { From 98bebc15a24f8523203c3eeefb17e99cd910cd2d Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 03:52:46 +0300 Subject: [PATCH 0640/1768] remove nixd --- hosts/tartarus/configuration.nix | 3 +-- hosts/ymir/configuration.nix | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 2bad20b..538830e 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -43,9 +43,8 @@ hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ inputs.osbm-nvim.packages.x86_64-linux.default - nixd ]; system.stateVersion = "24.05"; # lalalalala diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 0f959a7..6920a0c 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -94,7 +94,6 @@ environment.systemPackages = with pkgs; [ nvidia-container-toolkit inputs.osbm-nvim.packages.x86_64-linux.default - nixd ]; system.stateVersion = "25.05"; # great taboo of the nixos world From 2e85649c2063e7adb391459342f26f0df5e9ba0b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 03:53:07 +0300 Subject: [PATCH 0641/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 994c188..65bafb3 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1740570809, - "narHash": "sha256-zAHVk2TE7mtGIaPauEl/ykqmGy9Xe5Kl0XVYLEAsyBI=", + "lastModified": 1741308748, + "narHash": "sha256-XRgi8z1UycC07ixmCqOUMvMjzfV6WqEad1QAa++nGsE=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "2a8094b5e0a64b139d8ee49804e5173f1d851198", + "rev": "108b93651510d6e90ba079f441c094d26be7381b", "type": "github" }, "original": { From 119f5b3acd088ae000ee6f8c47332557936075c1 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 17:14:01 +0300 Subject: [PATCH 0642/1768] add nix inspect --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 08f27c4..33c92b2 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -34,6 +34,7 @@ ripgrep nh comma + nix-inspect bat ]; From 446c8d7d8784fa6e8517a65432b39c206a5ae3c8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 20:51:33 +0300 Subject: [PATCH 0643/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 65bafb3..0c5b2fa 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741217763, - "narHash": "sha256-g/TrltIjFHIjtzKY5CJpoPANfHQWDD43G5U1a/v5oVg=", + "lastModified": 1741345870, + "narHash": "sha256-KTpoO4oaucdFr3oJJBYpGK+aWVVrLvtiT17EQE7Cf4Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "486b066025dccd8af7fbe5dd2cc79e46b88c80da", + "rev": "04c915bcf1a1eac3519372ff3185beef053fba7c", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741325094, + "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741173522, - "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741308748, - "narHash": "sha256-XRgi8z1UycC07ixmCqOUMvMjzfV6WqEad1QAa++nGsE=", + "lastModified": 1741369684, + "narHash": "sha256-bIzt1It0kyolLk1aKH91ogAkMG9kpWkOR70xBSA+gj8=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "108b93651510d6e90ba079f441c094d26be7381b", + "rev": "eb82e2f01695411f909a45017625f43d8b69d6ac", "type": "github" }, "original": { From 5a813954a64cc873a1970fb5541dd3b18d75c3e7 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 21:11:01 +0300 Subject: [PATCH 0644/1768] update justfile with new system names --- justfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index 7226069..7e4bdb0 100644 --- a/justfile +++ b/justfile @@ -35,7 +35,10 @@ collect-garbage: sudo nix-collect-garbage --delete-older-than 3d build-sd-image-harmonica: check-git - nix build -L .#nixosConfigurations.harmonica.config.system.build.sdImage + nix build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage + +build-sd-image-pochita: check-git + nix build -L .#nixosConfigurations.pochita-sd.config.system.build.sdImage build-iso: check-git nix build -L .#nixosConfigurations.myISO.config.system.build.isoImage @@ -43,6 +46,6 @@ build-iso: check-git flash-sd-image-harmonica: # raise error because this command should be edited before running false - nix build -L .#nixosConfigurations.harmonica.config.system.build.sdImage + nix build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage sudo dd if=result/sd-image/nixos-image-sd-card-25.05.20250224.0196c01-aarch64-linux.img of=/dev/sda bs=4M status=progress conv=fsync From 9fdceff74067e9152cdf91774461ec90f6fe4996 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 21:11:57 +0300 Subject: [PATCH 0645/1768] use nom for better outputs --- justfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/justfile b/justfile index 7e4bdb0..1cb6cf3 100644 --- a/justfile +++ b/justfile @@ -35,17 +35,17 @@ collect-garbage: sudo nix-collect-garbage --delete-older-than 3d build-sd-image-harmonica: check-git - nix build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage + nom build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage build-sd-image-pochita: check-git - nix build -L .#nixosConfigurations.pochita-sd.config.system.build.sdImage + nom build -L .#nixosConfigurations.pochita-sd.config.system.build.sdImage build-iso: check-git - nix build -L .#nixosConfigurations.myISO.config.system.build.isoImage + nom build -L .#nixosConfigurations.myISO.config.system.build.isoImage flash-sd-image-harmonica: # raise error because this command should be edited before running false - nix build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage + nom build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage sudo dd if=result/sd-image/nixos-image-sd-card-25.05.20250224.0196c01-aarch64-linux.img of=/dev/sda bs=4M status=progress conv=fsync From e9b5ffc6268c7115ee902e65ca2e21152b59e49a Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Mar 2025 21:33:44 +0300 Subject: [PATCH 0646/1768] add back nixd --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 33c92b2..16fe2ed 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -26,6 +26,7 @@ jq onefetch just + nixd gh starship tree From 994be0d3e41b6598396d606f95423179072609e3 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 00:53:44 +0300 Subject: [PATCH 0647/1768] disable remote builds for now --- modules/remote-builds.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 6f9684e..4837eaa 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,18 +1,19 @@ { - config, - outputs, +# config, +# outputs, ... }: { - nix.distributedBuilds = true; - nix.settings.builders-use-substitutes = true; - nix.buildMachines = [ - { - hostName = "ymir.curl-boga.ts.net"; - systems = ["x86_64-linux" "aarch64-linux"]; - supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; - sshKey = config.age.secrets.ssh-key-private.path; - sshUser = "osbm"; - protocol = "ssh-ng"; - } - ]; + + # nix.distributedBuilds = true; + # nix.settings.builders-use-substitutes = true; + # nix.buildMachines = [ + # { + # hostName = "ymir.curl-boga.ts.net"; + # systems = ["x86_64-linux" "aarch64-linux"]; + # supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; + # sshKey = config.age.secrets.ssh-key-private.path; + # sshUser = "osbm"; + # protocol = "ssh-ng"; + # } + # ]; } From 27711b0f70a87b0b379ced56983d4b7245f230df Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 00:54:02 +0300 Subject: [PATCH 0648/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0c5b2fa..ffbf183 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741345870, - "narHash": "sha256-KTpoO4oaucdFr3oJJBYpGK+aWVVrLvtiT17EQE7Cf4Y=", + "lastModified": 1741378606, + "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "04c915bcf1a1eac3519372ff3185beef053fba7c", + "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741369684, - "narHash": "sha256-bIzt1It0kyolLk1aKH91ogAkMG9kpWkOR70xBSA+gj8=", + "lastModified": 1741384405, + "narHash": "sha256-ywz2GshIpCc7zBhEtPoCYeN9oEji6JI2F1gxq2G9uE0=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "eb82e2f01695411f909a45017625f43d8b69d6ac", + "rev": "adef6f1d93484d3af6ddc35f7ccf18884f4a5600", "type": "github" }, "original": { From ea1e65b5bd73005e56099740dc3ef75cfe32009e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 03:40:41 +0300 Subject: [PATCH 0649/1768] update flake.loc --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ffbf183..be44789 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741378606, - "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=", + "lastModified": 1741393072, + "narHash": "sha256-+Su28oU1FBvptj1AO0geJP+BcIJghSVxaNFagvW5K2M=", "owner": "nix-community", "repo": "home-manager", - "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2", + "rev": "d2c014e1c73195d1958abec0c5ca6112b07b79da", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741384405, - "narHash": "sha256-ywz2GshIpCc7zBhEtPoCYeN9oEji6JI2F1gxq2G9uE0=", + "lastModified": 1741394417, + "narHash": "sha256-OZth+MV1zzPYM0J2iF+6rjztXzbaNhBVIyCBpPYKE7o=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "adef6f1d93484d3af6ddc35f7ccf18884f4a5600", + "rev": "d8ba9d94018a059a2c8d212ef6544d19edc32631", "type": "github" }, "original": { From 5870b4e6757db6f56074fcbecb9b97fe36bb3e71 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 04:59:28 +0300 Subject: [PATCH 0650/1768] add newline --- home/tmux/wanikani-level.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/tmux/wanikani-level.sh b/home/tmux/wanikani-level.sh index bdb5f8c..3dd6fca 100755 --- a/home/tmux/wanikani-level.sh +++ b/home/tmux/wanikani-level.sh @@ -7,6 +7,7 @@ get_wanikani() wanikani_level=$(echo $wanikani_level_data | jq '.data[-1].data.level') wanikani_level_start_date_string=$(echo $wanikani_level_data | jq '.data[-1].data.started_at') wanikani_level_start_timestamp=$(date -d "${wanikani_level_start_date_string//\"/}" +%s) + current_timestamp=$(date +%s) difference=$((current_timestamp - wanikani_level_start_timestamp)) wanikani_level_creation_date=$((difference / 86400)) @@ -20,4 +21,5 @@ main() sleep 3600 } -main \ No newline at end of file +main + From 01476f4758507f4788579cbe9e6eb6c567a6adab Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 05:02:44 +0300 Subject: [PATCH 0651/1768] formatting --- home/tmux/wanikani-current-reviews.sh | 5 +++-- home/tmux/wanikani-progression.sh | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/home/tmux/wanikani-current-reviews.sh b/home/tmux/wanikani-current-reviews.sh index a6a4b59..f2d2a90 100755 --- a/home/tmux/wanikani-current-reviews.sh +++ b/home/tmux/wanikani-current-reviews.sh @@ -6,7 +6,7 @@ get_wanikani() wanikani_reviews=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count') wanikani_lessons=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq '.total_count') - echo "$wanikani_reviews reviews $wanikani_lessons lessons" + echo "$wanikani_lessons lessons $wanikani_reviews reviews" } main() @@ -16,4 +16,5 @@ main() sleep 600 } -main \ No newline at end of file +main + diff --git a/home/tmux/wanikani-progression.sh b/home/tmux/wanikani-progression.sh index d1ba173..d33476e 100755 --- a/home/tmux/wanikani-progression.sh +++ b/home/tmux/wanikani-progression.sh @@ -32,4 +32,5 @@ main() sleep 3600 } -main \ No newline at end of file +main + From eb74407f88c6bcbda00fda0c1e882b9a63a1df01 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 05:04:51 +0300 Subject: [PATCH 0652/1768] disable youtube again stupid stupid osman --- hosts/ymir/configuration.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 6920a0c..4e7a87a 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -13,12 +13,11 @@ ]; myModules = { - blockYoutube = false; + blockYoutube = true; blockTwitter = true; blockBluesky = false; enableKDE = true; enableTailscale = true; - # jellyfin is unnecessary for now enableJellyfin = true; enableAarch64Emulation = true; disableHibernation = true; From 5c4e5e3bec34d6c0077e849fe06135b3f0e4350d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 05:06:20 +0300 Subject: [PATCH 0653/1768] formatting --- modules/remote-builds.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 4837eaa..27a236b 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,9 +1,8 @@ { -# config, -# outputs, + # config, + # outputs, ... }: { - # nix.distributedBuilds = true; # nix.settings.builders-use-substitutes = true; # nix.buildMachines = [ From bdbae6b0ceca3550ce124e5b481c1b9b7aac6e9a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 17:21:37 +0300 Subject: [PATCH 0654/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index be44789..dd2736c 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741393072, - "narHash": "sha256-+Su28oU1FBvptj1AO0geJP+BcIJghSVxaNFagvW5K2M=", + "lastModified": 1741416850, + "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2c014e1c73195d1958abec0c5ca6112b07b79da", + "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c", "type": "github" }, "original": { From 6a21b9cc7ad0204b193db81ea6bc572ae7173207 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Mar 2025 03:47:56 +0300 Subject: [PATCH 0655/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index dd2736c..042f91e 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741416850, - "narHash": "sha256-iqRxCsRxE/Q/3W1RHxQMthPKEda0hhY65uxEpE5TNk4=", + "lastModified": 1741461731, + "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=", "owner": "nix-community", "repo": "home-manager", - "rev": "26f6b862645ff281f3bada5d406e8c20de8d837c", + "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { From fd75b4cf334b8cf8779d98bb4046756aa6048591 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Mar 2025 15:42:18 +0300 Subject: [PATCH 0656/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 042f91e..0005c16 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741461731, - "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=", + "lastModified": 1741502651, + "narHash": "sha256-7u8FF20WRvQsmfTuNuCerRzstuZ0XgkwWPkq+GoRfiA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44", + "rev": "1fd39a105575ea997b32a043a0dd2c49294add5b", "type": "github" }, "original": { From d7659df1926a4d858df76bc258476c35aacb2df4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 9 Mar 2025 15:45:02 +0300 Subject: [PATCH 0657/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0005c16..9f5df48 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741394417, - "narHash": "sha256-OZth+MV1zzPYM0J2iF+6rjztXzbaNhBVIyCBpPYKE7o=", + "lastModified": 1741524279, + "narHash": "sha256-A2TAU8yH+Egut3N+zOfr3azny8cv/Vpo0aywYL6KwMc=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "d8ba9d94018a059a2c8d212ef6544d19edc32631", + "rev": "ca46eddbe42556317659b35d7fd824fca70e5762", "type": "github" }, "original": { From 47916c423bf9e14ad908b9963c20ab5f670b9196 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 00:40:57 +0300 Subject: [PATCH 0658/1768] move the secrets to its own folder --- modules/caddy.nix | 6 ++++++ modules/secrets.nix | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index 1e2387d..dcca752 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -50,6 +50,12 @@ environment.systemPackages = with pkgs; [ nssTools ]; + age.secrets.cloudflare = { + file = ../secrets/cloudflare.age; + path = "/etc/caddy/.env"; + owner = "caddy"; + mode = "0600"; + }; systemd.services.caddy.serviceConfig = { EnvironmentFile = "/etc/caddy/.env"; diff --git a/modules/secrets.nix b/modules/secrets.nix index 724731b..5f4af4b 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -34,12 +34,6 @@ owner = "osbm"; mode = "0644"; }; - cloudflare = { - file = ../secrets/cloudflare.age; - path = "/etc/caddy/.env"; - owner = "caddy"; - mode = "0600"; - }; }; }) ]; From e7278c26bb0aa1a5b1bb0b11c78e06e7d40407bc Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 19:41:56 +0300 Subject: [PATCH 0659/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 9f5df48..0e8eac4 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741502651, - "narHash": "sha256-7u8FF20WRvQsmfTuNuCerRzstuZ0XgkwWPkq+GoRfiA=", + "lastModified": 1741613526, + "narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=", "owner": "nix-community", "repo": "home-manager", - "rev": "1fd39a105575ea997b32a043a0dd2c49294add5b", + "rev": "3593ee59a44974b8518829a5239b2f77222e3c81", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741524279, - "narHash": "sha256-A2TAU8yH+Egut3N+zOfr3azny8cv/Vpo0aywYL6KwMc=", + "lastModified": 1741622577, + "narHash": "sha256-0KLGu7RW5xn5mDe7wnPP7dDAgEXIZ2MwPQ2QgYRIvlQ=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "ca46eddbe42556317659b35d7fd824fca70e5762", + "rev": "20ad9eaa16d399c4fd8231dd34cd14ef80684fea", "type": "github" }, "original": { From a7edf043b635d260870488081edf092497a85379 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 20:02:33 +0300 Subject: [PATCH 0660/1768] formatting --- modules/caddy.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index dcca752..70a0df7 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -51,11 +51,11 @@ nssTools ]; age.secrets.cloudflare = { - file = ../secrets/cloudflare.age; - path = "/etc/caddy/.env"; - owner = "caddy"; - mode = "0600"; - }; + file = ../secrets/cloudflare.age; + path = "/etc/caddy/.env"; + owner = "caddy"; + mode = "0600"; + }; systemd.services.caddy.serviceConfig = { EnvironmentFile = "/etc/caddy/.env"; From 99a16daece02b3a0bc3432acc02e98d1f0d37165 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Mar 2025 20:57:09 +0300 Subject: [PATCH 0661/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0e8eac4..47de92e 100644 --- a/flake.lock +++ b/flake.lock @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741622577, - "narHash": "sha256-0KLGu7RW5xn5mDe7wnPP7dDAgEXIZ2MwPQ2QgYRIvlQ=", + "lastModified": 1741626381, + "narHash": "sha256-xAsBGrWxw1GRNVLXEBSd/zWGa0y9mnQsRywRycoNhOc=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "20ad9eaa16d399c4fd8231dd34cd14ef80684fea", + "rev": "60cfc451ef8d6b8741645368018df26f3ecee261", "type": "github" }, "original": { From 8a1133f0429b15cd1c9fb140282d4ecd4955ca4c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 03:10:24 +0300 Subject: [PATCH 0662/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 47de92e..10ef0ca 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741613526, - "narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=", + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", "owner": "nix-community", "repo": "home-manager", - "rev": "3593ee59a44974b8518829a5239b2f77222e3c81", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741626381, - "narHash": "sha256-xAsBGrWxw1GRNVLXEBSd/zWGa0y9mnQsRywRycoNhOc=", + "lastModified": 1741630473, + "narHash": "sha256-P/RR53L+G6IgEtAbZPsnxNxFleWcm4F3BuuuvniVBjg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "60cfc451ef8d6b8741645368018df26f3ecee261", + "rev": "1287118d162e6448d74b2ae36149b5d4a1337585", "type": "github" }, "original": { From db7c65f0443f15507bb6938c54d8a3aa6c5db13f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 03:20:33 +0300 Subject: [PATCH 0663/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 10ef0ca..bed8f67 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741630473, - "narHash": "sha256-P/RR53L+G6IgEtAbZPsnxNxFleWcm4F3BuuuvniVBjg=", + "lastModified": 1741651957, + "narHash": "sha256-qQIgyJhSzPVb5rBIVpp8EhJxJIN9pQWM01NxJAJ0Li4=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "1287118d162e6448d74b2ae36149b5d4a1337585", + "rev": "7b0b562950a1d4122c8654da5a1a61d1fd62ec51", "type": "github" }, "original": { From 47eb45570d55bcee2d7e71556ed9262085e29d65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 06:19:43 +0000 Subject: [PATCH 0664/1768] Bump cachix/install-nix-action from 30 to 31 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 30 to 31. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v30...v31) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-sd-image.yml | 2 +- .github/workflows/nix.yml | 4 ++-- .github/workflows/test-my-packages.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index 36ea47a..887aac0 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -14,7 +14,7 @@ jobs: run: sudo apt-get install qemu-user-static - name: Install Nix - uses: cachix/install-nix-action@v30 + uses: cachix/install-nix-action@v31 with: extra_nix_config: | system = aarch64-linux diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 5679e5d..25c8d7c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 + - uses: cachix/install-nix-action@v31 # TODO: add a binary cache # - uses: cachix/cachix-action@v10 # with: @@ -33,5 +33,5 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 + - uses: cachix/install-nix-action@v31 - run: nix shell nixpkgs#alejandra -c alejandra -c . diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index 124bc94..c2f8b1b 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Install Nix - uses: cachix/install-nix-action@v30 + uses: cachix/install-nix-action@v31 # with: # extra_nix_config: | # # system = ${{ matrix.platform }} From 334b45e8bbc368e938dcfe67500b8215b8de05c2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 15:44:56 +0300 Subject: [PATCH 0665/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bed8f67..8bf36f7 100644 --- a/flake.lock +++ b/flake.lock @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", + "lastModified": 1741637833, + "narHash": "sha256-1uBkdOwxNmkdXXjoycnEBZUoHZ/22GitQRVXjZlsVK0=", "owner": "nix-community", "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", + "rev": "bc34099731a7e3799c0d52ccdf4599409a2ef9b9", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741651957, - "narHash": "sha256-qQIgyJhSzPVb5rBIVpp8EhJxJIN9pQWM01NxJAJ0Li4=", + "lastModified": 1741657876, + "narHash": "sha256-gLDhlLy92UZhhmaWtEGxccuMyDnqLuzDTzw2ULi1OMI=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "7b0b562950a1d4122c8654da5a1a61d1fd62ec51", + "rev": "541d921b78a33be189933a65475f0931f5645059", "type": "github" }, "original": { From 4c8bb2bf3f715783e36ab784b40f1ddade74e9d5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 15:45:37 +0300 Subject: [PATCH 0666/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8bf36f7..58caa8e 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741657876, - "narHash": "sha256-gLDhlLy92UZhhmaWtEGxccuMyDnqLuzDTzw2ULi1OMI=", + "lastModified": 1741697108, + "narHash": "sha256-lSVvta1nHnQwlBSP+zgyy461t6zA00tj/qrBLmFoues=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "541d921b78a33be189933a65475f0931f5645059", + "rev": "3cb80069c957779499c5cd8a19ec7081f965103e", "type": "github" }, "original": { From 655d06d849067779043c2116e7db8657332bb000 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Mar 2025 22:05:24 +0300 Subject: [PATCH 0667/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 58caa8e..77f76e3 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741635347, - "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", + "lastModified": 1741701235, + "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741637833, - "narHash": "sha256-1uBkdOwxNmkdXXjoycnEBZUoHZ/22GitQRVXjZlsVK0=", + "lastModified": 1741709061, + "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", "owner": "nix-community", "repo": "nixvim", - "rev": "bc34099731a7e3799c0d52ccdf4599409a2ef9b9", + "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", "type": "github" }, "original": { From ec0f0faea2b23a8b42232f9885dd4d7aae4afe2a Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Mar 2025 00:11:52 +0300 Subject: [PATCH 0668/1768] add script manager and clearurls --- home/firefox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/firefox.nix b/home/firefox.nix index 4c20aca..8e8ccf1 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -41,11 +41,11 @@ (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") (extension "motivation-new-tab" "") (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") - + (extension "violentmonkey" "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}") # (extension "tabliss" "extension@tabliss.io") # (extension "umatrix" "uMatrix@raymondhill.net") # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") - # (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") + (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") ]; # To add additional extensions, find it on addons.mozilla.org, find # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) From ff61d2d4d4734f75a8c1e8433517a2f695069be3 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 12 Mar 2025 22:21:01 +0300 Subject: [PATCH 0669/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 77f76e3..2cdc16f 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741701235, - "narHash": "sha256-gBlb8R9gnjUAT5XabJeel3C2iEUiBHx3+91651y3Sqo=", + "lastModified": 1741791118, + "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c630dfa8abcc65984cc1e47fb25d4552c81dd37e", + "rev": "18780912345970e5b546b1b085385789b6935a83", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741697108, - "narHash": "sha256-lSVvta1nHnQwlBSP+zgyy461t6zA00tj/qrBLmFoues=", + "lastModified": 1741807247, + "narHash": "sha256-/Y5ytJK7u6yS6k6aC97IFUFCdGE7kU6s/ySJkxQcydY=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "3cb80069c957779499c5cd8a19ec7081f965103e", + "rev": "1f2042d897eb65419a72933a15c5e5ba481ca1da", "type": "github" }, "original": { From 2b66d8817743f3ce8a1f944084c1dea473a36058 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 17:29:25 +0300 Subject: [PATCH 0670/1768] add cascadia code font --- modules/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/fonts.nix b/modules/fonts.nix index 892220e..97a0a3d 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -15,6 +15,7 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableFonts { fonts.packages = with pkgs; [ + cascadia-code noto-fonts noto-fonts-cjk-sans noto-fonts-emoji From c84ee3de66acaecd5b5d30d15e24cb462059d61e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 17:39:27 +0300 Subject: [PATCH 0671/1768] add alacritty configuration --- home/alacritty.nix | 17 +++++++++++++++++ home/home.nix | 1 + 2 files changed, 18 insertions(+) create mode 100644 home/alacritty.nix diff --git a/home/alacritty.nix b/home/alacritty.nix new file mode 100644 index 0000000..c644ddd --- /dev/null +++ b/home/alacritty.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + programs.alacritty = { + enable = true; + settings = { + font.size = 12; + terminal.shell = { + args = ["new-session" "-A" "-s" "general"]; + program = pkgs.tmux; + }; + window = { + decorations = "None"; + opacity = 1; + startup_mode = "Maximized"; + }; + }; + }; +} diff --git a/home/home.nix b/home/home.nix index 93f7d00..b3921f4 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,5 +1,6 @@ {config, ...}: { imports = [ + ./alacritty.nix ./tmux ./git.nix ./ssh.nix From 7a55c6a79ffa09fb9a7859c638ad95c2d9c03f6b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 17:46:05 +0300 Subject: [PATCH 0672/1768] make this asshole module happy --- home/home.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/home.nix b/home/home.nix index b3921f4..d90ced6 100644 --- a/home/home.nix +++ b/home/home.nix @@ -16,5 +16,8 @@ # dont install packages here, just use normal nixpkgs ]; + # i hate the error home manager error message + home.backupFileExtension = ".backup"; + home.stateVersion = config.system.stateVersion; } From 42cc57a3f3dfbe3885814db07245eb5977f65864 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 17:48:31 +0300 Subject: [PATCH 0673/1768] i will fix this someday i promise --- home/home.nix | 3 --- hosts/pochita/configuration.nix | 1 + hosts/tartarus/configuration.nix | 1 + hosts/ymir/configuration.nix | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/home.nix b/home/home.nix index d90ced6..b3921f4 100644 --- a/home/home.nix +++ b/home/home.nix @@ -16,8 +16,5 @@ # dont install packages here, just use normal nixpkgs ]; - # i hate the error home manager error message - home.backupFileExtension = ".backup"; - home.stateVersion = config.system.stateVersion; } diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 1c14dd9..0f51d18 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -34,6 +34,7 @@ home-manager.useUserPackages = true; home-manager.users.osbm = import ../../home/home.nix { inherit config pkgs; + backupFileExtension = "hmbak"; }; environment.systemPackages = []; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 538830e..ea0e3da 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -26,6 +26,7 @@ home-manager.useUserPackages = true; home-manager.users.osbm = import ../../home/home.nix { inherit config pkgs; + backupFileExtension = "hmbak"; }; virtualisation.virtualbox.host.enable = true; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 4e7a87a..198c28d 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -38,6 +38,7 @@ home-manager.useUserPackages = true; home-manager.users.osbm = import ../../home/home.nix { inherit config pkgs; + backupFileExtension = "hmbak"; }; # Enable networking From 14a116b18be1893480666837e5ce8799a08ce92f Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 18:02:01 +0300 Subject: [PATCH 0674/1768] much closer to the turth now --- home/alacritty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/alacritty.nix b/home/alacritty.nix index c644ddd..7fbb894 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -2,10 +2,10 @@ programs.alacritty = { enable = true; settings = { - font.size = 12; + font.size = 12.0; terminal.shell = { args = ["new-session" "-A" "-s" "general"]; - program = pkgs.tmux; + program = pkgs.tmux + "/bin/tmux"; }; window = { decorations = "None"; From f7db183202da1db1de88affa6203a59bb806a20a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 18:25:15 +0300 Subject: [PATCH 0675/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2cdc16f..188ab28 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741791118, - "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", + "lastModified": 1741877836, + "narHash": "sha256-dInGmyx0eG9ETEyyLZ6J+S7Mj9HNhT9wuh/iYHM1l/k=", "owner": "nix-community", "repo": "home-manager", - "rev": "18780912345970e5b546b1b085385789b6935a83", + "rev": "56374cc64d58451b359bb4e8502387d3a96e7c7b", "type": "github" }, "original": { From da571e0717c14be86ae0af8ee41f9d282529b46c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 18:33:46 +0300 Subject: [PATCH 0676/1768] add direnv to home manager --- home/direnv.nix | 7 +++++++ home/home.nix | 1 + modules/common-packages.nix | 12 ------------ 3 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 home/direnv.nix diff --git a/home/direnv.nix b/home/direnv.nix new file mode 100644 index 0000000..06d9779 --- /dev/null +++ b/home/direnv.nix @@ -0,0 +1,7 @@ +{ + programs.direnv = { + enable = true; + enableFishIntegration = true; + nix-direnv.enable = true; + }; +} \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index b3921f4..863686c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -5,6 +5,7 @@ ./git.nix ./ssh.nix ./bash.nix + ./direnv.nix ./tlrc.nix ./firefox.nix ]; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 16fe2ed..d833852 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -44,18 +44,6 @@ enableSSHSupport = true; }; - programs.direnv = { - enable = true; - package = pkgs.direnv; - silent = false; - loadInNixShell = true; - direnvrcExtra = ""; - nix-direnv = { - enable = true; - package = pkgs.nix-direnv; - }; - }; - virtualisation.docker.enable = true; # Enable the OpenSSH daemon. From fb44140e47c8e25646c687ab11330fb406f11bf2 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 18:34:14 +0300 Subject: [PATCH 0677/1768] remove unused parameters --- home/bash.nix | 2 +- home/firefox.nix | 2 +- home/tmux/default.nix | 1 - hosts/atreus/configuration.nix | 1 - hosts/pochita/hardware-configuration.nix | 2 -- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/home/bash.nix b/home/bash.nix index b29a484..90649bc 100644 --- a/home/bash.nix +++ b/home/bash.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ programs.bash = { enable = true; bashrcExtra = '' diff --git a/home/firefox.nix b/home/firefox.nix index 8e8ccf1..bf577a8 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ programs.firefox = { enable = true; languagePacks = [ diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 847b3b6..b58b8c3 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: let diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 97270f8..984c931 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -1,5 +1,4 @@ { - config, lib, pkgs, ... diff --git a/hosts/pochita/hardware-configuration.nix b/hosts/pochita/hardware-configuration.nix index 073bec0..90ca28b 100644 --- a/hosts/pochita/hardware-configuration.nix +++ b/hosts/pochita/hardware-configuration.nix @@ -2,9 +2,7 @@ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { - config, lib, - pkgs, modulesPath, ... }: { From 006daba31323475851a04474bb711e25b942ddc3 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 19:04:24 +0300 Subject: [PATCH 0678/1768] lets do this then --- home/fish.nix | 12 ++++++++++++ home/home.nix | 4 +++- home/starship.nix | 6 ++++++ home/zoxide.nix | 6 ++++++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 home/fish.nix create mode 100644 home/starship.nix create mode 100644 home/zoxide.nix diff --git a/home/fish.nix b/home/fish.nix new file mode 100644 index 0000000..8f06736 --- /dev/null +++ b/home/fish.nix @@ -0,0 +1,12 @@ +{ + programs.fish = { + enable = true; + shellAliases = { + c = "code ."; + l = "ls -lah"; + free = "free -h"; + df = "df -h"; + du = "du -h"; + }; + }; +} \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index 863686c..634fbed 100644 --- a/home/home.nix +++ b/home/home.nix @@ -6,8 +6,10 @@ ./ssh.nix ./bash.nix ./direnv.nix - ./tlrc.nix ./firefox.nix + ./tlrc.nix + ./starship.nix + ./zoxide.nix ]; home.username = "osbm"; diff --git a/home/starship.nix b/home/starship.nix new file mode 100644 index 0000000..522832b --- /dev/null +++ b/home/starship.nix @@ -0,0 +1,6 @@ +{ + programs.starship = { + enable = true; + enableFishIntegration = true; + }; +} \ No newline at end of file diff --git a/home/zoxide.nix b/home/zoxide.nix new file mode 100644 index 0000000..07991a1 --- /dev/null +++ b/home/zoxide.nix @@ -0,0 +1,6 @@ +{ + programs.zoxide = { + enable = true; + enableFishIntegration = true; + }; +} \ No newline at end of file From 9bf2adcd6105aedf97570c8b57a29d515173b793 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 19:06:53 +0300 Subject: [PATCH 0679/1768] mention the fish --- home/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/home.nix b/home/home.nix index 634fbed..5ef706c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -7,6 +7,7 @@ ./bash.nix ./direnv.nix ./firefox.nix + ./fish.nix ./tlrc.nix ./starship.nix ./zoxide.nix From b76b116bce891d14919c785b9a1ff1fad72e6835 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 19:11:52 +0300 Subject: [PATCH 0680/1768] weird decision --- home/direnv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/direnv.nix b/home/direnv.nix index 06d9779..1ea482d 100644 --- a/home/direnv.nix +++ b/home/direnv.nix @@ -1,7 +1,7 @@ { programs.direnv = { enable = true; - enableFishIntegration = true; + # enableFishIntegration = true; # why add a read-only option? nix-direnv.enable = true; }; } \ No newline at end of file From b38eb8c95635f871c30133a07809bdf8193d55c4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 19:45:12 +0300 Subject: [PATCH 0681/1768] select font --- home/alacritty.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home/alacritty.nix b/home/alacritty.nix index 7fbb894..cd83663 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -2,7 +2,10 @@ programs.alacritty = { enable = true; settings = { - font.size = 12.0; + font = { + size = 12.0; + normal.family = "Cascadia Code"; + }; terminal.shell = { args = ["new-session" "-A" "-s" "general"]; program = pkgs.tmux + "/bin/tmux"; @@ -12,6 +15,7 @@ opacity = 1; startup_mode = "Maximized"; }; + env.TERM = "xterm-256color"; }; }; } From dcbe2406c92d7b91a3489ec0a1cbf5258251dc0f Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 19:47:45 +0300 Subject: [PATCH 0682/1768] i hate the universe in its entirety --- home/fish.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/fish.nix b/home/fish.nix index 8f06736..11f5e6b 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -1,6 +1,9 @@ { programs.fish = { enable = true; + interactiveShellInit = '' + set -g fish_greeting + ''; shellAliases = { c = "code ."; l = "ls -lah"; From 9f636334b1f07466320b504e0eeb58473f76be9b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 20:01:32 +0300 Subject: [PATCH 0683/1768] use fish functions and add lazygit --- home/fish.nix | 8 ++++++++ home/home.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/home/fish.nix b/home/fish.nix index 11f5e6b..06fe65e 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -10,6 +10,14 @@ free = "free -h"; df = "df -h"; du = "du -h"; + lg = "lazygit"; + }; + functions = { + gitu = '' + git add --all + git commit -m "$argv" + git push + ''; }; }; } \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index 5ef706c..a3a3707 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{config, pkgs, ...}: { imports = [ ./alacritty.nix ./tmux @@ -17,7 +17,7 @@ home.homeDirectory = "/home/osbm"; home.packages = [ - # dont install packages here, just use normal nixpkgs + pkgs.lazygit ]; home.stateVersion = config.system.stateVersion; From c6927a28e2c119cdf8da8acb082fe5841d1970d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 20:21:44 +0300 Subject: [PATCH 0684/1768] add starship settings --- home/starship.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/starship.nix b/home/starship.nix index 522832b..10ac453 100644 --- a/home/starship.nix +++ b/home/starship.nix @@ -2,5 +2,11 @@ programs.starship = { enable = true; enableFishIntegration = true; + settings = { + add_newline = false; + dart.disabled = true; + python.disabled = true; + nodejs.disabled = true; + }; }; } \ No newline at end of file From 341f24f211eef6dee745172e8889dcdf1fba2f4d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Mar 2025 20:29:00 +0300 Subject: [PATCH 0685/1768] formatting --- home/direnv.nix | 2 +- home/fish.nix | 2 +- home/home.nix | 6 +++++- home/starship.nix | 2 +- home/tmux/default.nix | 5 +---- home/zoxide.nix | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/home/direnv.nix b/home/direnv.nix index 1ea482d..fa8bdde 100644 --- a/home/direnv.nix +++ b/home/direnv.nix @@ -4,4 +4,4 @@ # enableFishIntegration = true; # why add a read-only option? nix-direnv.enable = true; }; -} \ No newline at end of file +} diff --git a/home/fish.nix b/home/fish.nix index 06fe65e..bc10284 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -20,4 +20,4 @@ ''; }; }; -} \ No newline at end of file +} diff --git a/home/home.nix b/home/home.nix index a3a3707..375925a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,8 @@ -{config, pkgs, ...}: { +{ + config, + pkgs, + ... +}: { imports = [ ./alacritty.nix ./tmux diff --git a/home/starship.nix b/home/starship.nix index 10ac453..49fa9b6 100644 --- a/home/starship.nix +++ b/home/starship.nix @@ -9,4 +9,4 @@ nodejs.disabled = true; }; }; -} \ No newline at end of file +} diff --git a/home/tmux/default.nix b/home/tmux/default.nix index b58b8c3..23bab1c 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: let +{pkgs, ...}: let wanikani-current-reviews-script = builtins.path {path = ./wanikani-current-reviews.sh;}; wanikani-level-script = builtins.path {path = ./wanikani-level.sh;}; wanikani-progression-script = builtins.path {path = ./wanikani-progression.sh;}; diff --git a/home/zoxide.nix b/home/zoxide.nix index 07991a1..1c20b97 100644 --- a/home/zoxide.nix +++ b/home/zoxide.nix @@ -3,4 +3,4 @@ enable = true; enableFishIntegration = true; }; -} \ No newline at end of file +} From c0c95372577718e635017bad53557f737c1aeb46 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Mar 2025 01:54:29 +0300 Subject: [PATCH 0686/1768] lets just sit on this for now --- hosts/pochita/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 0f51d18..79c65e5 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -44,6 +44,11 @@ wheelNeedsPassword = false; }; + security.acme.defaults = { + email = "osmanfbayram@gmail.com"; + acceptTerms = true; + }; + services.getty.autologinUser = "osbm"; # The board and wanted kernel version From 6291d3bb2a20c4eae65ecea58d4bdb741079d3d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Mar 2025 01:57:53 +0300 Subject: [PATCH 0687/1768] finally fix the damn issue --- flake.lock | 12 ++++++------ hosts/ymir/configuration.nix | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 188ab28..48c67df 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741877836, - "narHash": "sha256-dInGmyx0eG9ETEyyLZ6J+S7Mj9HNhT9wuh/iYHM1l/k=", + "lastModified": 1741894454, + "narHash": "sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc=", "owner": "nix-community", "repo": "home-manager", - "rev": "56374cc64d58451b359bb4e8502387d3a96e7c7b", + "rev": "0b0baed7b2bf6a5e365d4cba042b580a2bc32e34", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 198c28d..148ce23 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -49,9 +49,6 @@ # Enable OpenGL programs.nix-required-mounts.enable = true; programs.nix-required-mounts.presets.nvidia-gpu.enable = true; - # TODO: this ugly thing is necessary until this issue is resolved - # https://github.com/NixOS/nixpkgs/issues/380601 - nix.settings.system-features = ["nixos-test" "benchmark" "big-parallel" "kvm" "gpu" "nvidia-gpu" "opengl" "cuda"]; hardware.graphics = { enable = true; From dd12ae5359722ca50884a397d4cb8e62640e3bd2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Mar 2025 15:57:39 +0300 Subject: [PATCH 0688/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 48c67df..edc53a9 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741894454, - "narHash": "sha256-Mu2YXrGr/8Cid6W44AXci/YYnASoXjGrMV9Sjs66oyc=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b0baed7b2bf6a5e365d4cba042b580a2bc32e34", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { From b6428a680e44dc803baf46e71bfc510456a7f426 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Mar 2025 19:05:26 +0300 Subject: [PATCH 0689/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index edc53a9..8c5103b 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741807247, - "narHash": "sha256-/Y5ytJK7u6yS6k6aC97IFUFCdGE7kU6s/ySJkxQcydY=", + "lastModified": 1741958838, + "narHash": "sha256-2t4DTjIzII0HFLH/ECSwG0crmdaHKHIqdMQkNH9Ns4g=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "1f2042d897eb65419a72933a15c5e5ba481ca1da", + "rev": "341d0cc713d4b4ace717a59f6be6e6becbd271ac", "type": "github" }, "original": { From 32ec8827f5a955e67584cc9bd51f01fd0d2faa18 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 14 Mar 2025 23:32:41 +0300 Subject: [PATCH 0690/1768] enable youtube --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 148ce23..a224df3 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -13,7 +13,7 @@ ]; myModules = { - blockYoutube = true; + blockYoutube = false; blockTwitter = true; blockBluesky = false; enableKDE = true; From 5b0319154ef4f11f2d0927e89b53f517fca4376a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 15 Mar 2025 12:07:24 +0300 Subject: [PATCH 0691/1768] bigger font on alacritty --- home/alacritty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/alacritty.nix b/home/alacritty.nix index cd83663..94e4bf7 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -3,7 +3,7 @@ enable = true; settings = { font = { - size = 12.0; + size = 17.0; normal.family = "Cascadia Code"; }; terminal.shell = { From 0efec3709ade18eb5fbc0ce1a04ad6a85da8723c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 00:33:30 +0300 Subject: [PATCH 0692/1768] update caddy hash This is a stupid way to update a package. It gives me an build error to let me know of an update --- modules/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/caddy.nix b/modules/caddy.nix index 70a0df7..0eed372 100644 --- a/modules/caddy.nix +++ b/modules/caddy.nix @@ -20,7 +20,7 @@ # update time to time # last update: 2025-03-02 plugins = ["github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de"]; - hash = "sha256-3nvVGW+ZHLxQxc1VCc/oTzCLZPBKgw4mhn+O3IoyiSs="; + hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; }; email = "contact@osbm.dev"; extraConfig = '' From 8d073338e67350347626fe51086e72b163718599 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 03:41:43 +0300 Subject: [PATCH 0693/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8c5103b..750db78 100644 --- a/flake.lock +++ b/flake.lock @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741709061, - "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=", + "lastModified": 1741814789, + "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=", "owner": "nix-community", "repo": "nixvim", - "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974", + "rev": "33097dcf776d1fad0ff3842096c4e3546312f251", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1741958838, - "narHash": "sha256-2t4DTjIzII0HFLH/ECSwG0crmdaHKHIqdMQkNH9Ns4g=", + "lastModified": 1742080647, + "narHash": "sha256-9+Qw6/UqQ57kUNqSawYXhZVzgLmVqZOHCDRsU7wz714=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "341d0cc713d4b4ace717a59f6be6e6becbd271ac", + "rev": "970cc18d62047ecda5d0e5e72d2e0bc1919bc5f2", "type": "github" }, "original": { From 016ff419f1610738eb28644dfad08858732f8469 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 16:48:07 +0300 Subject: [PATCH 0694/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 750db78..e187ecc 100644 --- a/flake.lock +++ b/flake.lock @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742080647, - "narHash": "sha256-9+Qw6/UqQ57kUNqSawYXhZVzgLmVqZOHCDRsU7wz714=", + "lastModified": 1742132865, + "narHash": "sha256-frvFKyXvrJ1xgO0xqrASGrfZwFWefHZXz7p9hxSMpcg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "970cc18d62047ecda5d0e5e72d2e0bc1919bc5f2", + "rev": "9addbe931a76349b8529077164dd9917c586197f", "type": "github" }, "original": { From d677361fa171f7889fc67d15a750f666b7a492b4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 21:21:41 +0300 Subject: [PATCH 0695/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e187ecc..b6aa771 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742132865, - "narHash": "sha256-frvFKyXvrJ1xgO0xqrASGrfZwFWefHZXz7p9hxSMpcg=", + "lastModified": 1742148918, + "narHash": "sha256-aVNHHNeuNy32rw1O++IW4YxHzm6v+Fjra3n5kBdEQdQ=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "9addbe931a76349b8529077164dd9917c586197f", + "rev": "7e2b6e5906ce84692e0452376a6c4f3cb8f0272c", "type": "github" }, "original": { From 535652fb84c6028d70a5bbe32f10710f26180292 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 16 Mar 2025 21:29:00 +0300 Subject: [PATCH 0696/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b6aa771..c48d2c8 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742148918, - "narHash": "sha256-aVNHHNeuNy32rw1O++IW4YxHzm6v+Fjra3n5kBdEQdQ=", + "lastModified": 1742149406, + "narHash": "sha256-kSdcE8ykXSvjzMgR0kRZiCFDhH/4cfpLs4t7wXv1zYE=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "7e2b6e5906ce84692e0452376a6c4f3cb8f0272c", + "rev": "3b828b947fdd35f02a4438ff54e9528b7c519f41", "type": "github" }, "original": { From 85294fd79d65c229cea6d29d2577eb2f2944efce Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 17 Mar 2025 00:06:23 +0300 Subject: [PATCH 0697/1768] dont need node globally --- modules/common-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index d833852..6e93a38 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -18,8 +18,6 @@ '') btop pciutils - nodePackages.npm - nodejs cloc neofetch inxi From a7e2a2fe3cca6d92bf3f5eec8ba888f193b1c287 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 17 Mar 2025 00:30:05 +0300 Subject: [PATCH 0698/1768] set emoji font to fix alacritty --- modules/fonts.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/fonts.nix b/modules/fonts.nix index 97a0a3d..a0ace6f 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -34,6 +34,9 @@ font-awesome_5 roboto ]; + fonts.fontconfig = { + defaultFonts.emoji = [ "Noto Color Emoji" ]; + }; }) ]; } From 1ad9ffebd454b4ac4692572a782acbe08fc05bb7 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 17 Mar 2025 15:08:39 +0300 Subject: [PATCH 0699/1768] add 8889 port --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a224df3..a559d52 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -34,6 +34,7 @@ networking.hostName = "ymir"; # Define your hostname. + networking.firewall.allowedTCPPorts = [ 8889]; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ../../home/home.nix { From 8c783ea14d3e4b869adc77420537a73dfc9ed5e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Mar 2025 02:23:59 +0300 Subject: [PATCH 0700/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c48d2c8..88c1f9a 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1741955947, - "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", + "lastModified": 1742246081, + "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", + "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742217307, + "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", "type": "github" }, "original": { @@ -553,11 +553,11 @@ "rpicam-apps-src": "rpicam-apps-src" }, "locked": { - "lastModified": 1740928520, - "narHash": "sha256-NL5qZi0iEEvQK9kMF6r48FOk5WMdQExCqodRH3kEr0g=", + "lastModified": 1742223591, + "narHash": "sha256-ZNTz8r5jlJ1jvpqf5+aUYgpnYJSVX0iP14doOc1Hm0E=", "owner": "nix-community", "repo": "raspberry-pi-nix", - "rev": "3bfda6add79c55f9bf143fac928f54484d450e87", + "rev": "3e8100d5e976a6a2be363015cb33463af9ef441a", "type": "github" }, "original": { From 37546a037c9cb409aabd5e035ed4cd6b73b3ab63 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Mar 2025 18:29:21 +0300 Subject: [PATCH 0701/1768] use lib more --- home/alacritty.nix | 4 ++-- home/tmux/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home/alacritty.nix b/home/alacritty.nix index 94e4bf7..f2fe141 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, lib, ...}: { programs.alacritty = { enable = true; settings = { @@ -8,7 +8,7 @@ }; terminal.shell = { args = ["new-session" "-A" "-s" "general"]; - program = pkgs.tmux + "/bin/tmux"; + program = lib.getExe pkgs.tmux; }; window = { decorations = "None"; diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 23bab1c..728cd8b 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: let +{pkgs, lib, ...}: let wanikani-current-reviews-script = builtins.path {path = ./wanikani-current-reviews.sh;}; wanikani-level-script = builtins.path {path = ./wanikani-level.sh;}; wanikani-progression-script = builtins.path {path = ./wanikani-progression.sh;}; @@ -32,7 +32,7 @@ in { baseIndex = 1; shortcut = "s"; mouse = true; - shell = "${pkgs.fish}/bin/fish"; + shell = lib.getExe pkgs.fish; plugins = with pkgs; [ tmuxPlugins.sensible tmuxPlugins.better-mouse-mode From 056e1777fdbb730befd60f28ada1bd42d62e07fe Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Mar 2025 18:30:41 +0300 Subject: [PATCH 0702/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 88c1f9a..b59441b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742246081, - "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", + "lastModified": 1742305478, + "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", + "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", "type": "github" }, "original": { @@ -281,11 +281,11 @@ "nmt": "nmt_2" }, "locked": { - "lastModified": 1734904675, - "narHash": "sha256-MoYUUxiLcNwC9woNLoCfXfzcCAHE310DqDcJd/GjM98=", + "lastModified": 1742249870, + "narHash": "sha256-U37ECk3zpfp92D3H0gzfWPyb5sf0RdOdublCq1zjq+w=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "19e8cb01a078fea1e6cf824097978c41af74e24b", + "rev": "fe5b4498e3161191bd93fe0683dff347f6f689df", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741814789, - "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=", + "lastModified": 1742255305, + "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", "owner": "nix-community", "repo": "nixvim", - "rev": "33097dcf776d1fad0ff3842096c4e3546312f251", + "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742149406, - "narHash": "sha256-kSdcE8ykXSvjzMgR0kRZiCFDhH/4cfpLs4t7wXv1zYE=", + "lastModified": 1742311823, + "narHash": "sha256-Grsp78Pm3S6BtHvkWwp8kJPwFsfYDGIHylP/y4O2d90=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "3b828b947fdd35f02a4438ff54e9528b7c519f41", + "rev": "91bca05eb6d7e9591b0c35f68b3029c451e92490", "type": "github" }, "original": { From 97b1e705b21204826df45776f7d7e2a0629904ba Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Mar 2025 19:11:35 +0300 Subject: [PATCH 0703/1768] add lfs support --- home/git.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home/git.nix b/home/git.nix index 063b155..7fa7129 100644 --- a/home/git.nix +++ b/home/git.nix @@ -35,6 +35,12 @@ push = { autoSetupRemote = true; }; + filter.lfs = { + clean = "git-lfs clean -- %f"; + smudge = "git-lfs smudge -- %f"; + process = "git-lfs filter-process"; + required = true; + }; }; }; } From 2cca8ffeea1da564700fa59bc6facf76220d871c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Mar 2025 23:23:23 +0300 Subject: [PATCH 0704/1768] formatting --- home/alacritty.nix | 6 +++++- home/tmux/default.nix | 6 +++++- hosts/ymir/configuration.nix | 2 +- modules/fonts.nix | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/home/alacritty.nix b/home/alacritty.nix index f2fe141..3237b7b 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -1,4 +1,8 @@ -{pkgs, lib, ...}: { +{ + pkgs, + lib, + ... +}: { programs.alacritty = { enable = true; settings = { diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 728cd8b..32f60b6 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -1,4 +1,8 @@ -{pkgs, lib, ...}: let +{ + pkgs, + lib, + ... +}: let wanikani-current-reviews-script = builtins.path {path = ./wanikani-current-reviews.sh;}; wanikani-level-script = builtins.path {path = ./wanikani-level.sh;}; wanikani-progression-script = builtins.path {path = ./wanikani-progression.sh;}; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index a559d52..30b26c5 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -34,7 +34,7 @@ networking.hostName = "ymir"; # Define your hostname. - networking.firewall.allowedTCPPorts = [ 8889]; + networking.firewall.allowedTCPPorts = [8889]; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ../../home/home.nix { diff --git a/modules/fonts.nix b/modules/fonts.nix index a0ace6f..3a04e65 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -35,7 +35,7 @@ roboto ]; fonts.fontconfig = { - defaultFonts.emoji = [ "Noto Color Emoji" ]; + defaultFonts.emoji = ["Noto Color Emoji"]; }; }) ]; From 04f6c53eb74004204e2d6b54a46a501da33343a3 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 19 Mar 2025 20:02:06 +0300 Subject: [PATCH 0705/1768] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b59441b..bc176fe 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742305478, - "narHash": "sha256-iYCinzZnnUeCkZ031qGRwPdwRsqW6o9Y0MgGpA7Zva4=", + "lastModified": 1742326330, + "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb74bb76d94a6c55632376c931fc108131260ee9", + "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742217307, - "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", + "lastModified": 1742376361, + "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", + "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742255305, - "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", + "lastModified": 1742396414, + "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", "owner": "nix-community", "repo": "nixvim", - "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", + "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742311823, - "narHash": "sha256-Grsp78Pm3S6BtHvkWwp8kJPwFsfYDGIHylP/y4O2d90=", + "lastModified": 1742403709, + "narHash": "sha256-KTlZG+mUCIDDuiKUlR4EGtM8P73s4nFmYN6cTsyCGyg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "91bca05eb6d7e9591b0c35f68b3029c451e92490", + "rev": "a8b87b89ef3b9d7e63f9f0a354f0c43b6c149dc2", "type": "github" }, "original": { From 09015d1c8289821e7b468bed8392d094cf49f3d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 20 Mar 2025 04:19:20 +0300 Subject: [PATCH 0706/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bc176fe..9fc6935 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742326330, - "narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=", + "lastModified": 1742416832, + "narHash": "sha256-ycok0eJJcoknqaibdv/TEEEOUqovC42XCqbfLDYmnoQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee", + "rev": "eb0f617aecbaf1eff5bacec789891e775af2f5a3", "type": "github" }, "original": { From 9a1a5bcd45721715d61dc14ce512b6575c64ee20 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 00:01:02 +0300 Subject: [PATCH 0707/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9fc6935..f6c3613 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742416832, - "narHash": "sha256-ycok0eJJcoknqaibdv/TEEEOUqovC42XCqbfLDYmnoQ=", + "lastModified": 1742501496, + "narHash": "sha256-LYwyZmhckDKK7i4avmbcs1pBROpOaHi98lbjX1fmVpU=", "owner": "nix-community", "repo": "home-manager", - "rev": "eb0f617aecbaf1eff5bacec789891e775af2f5a3", + "rev": "d725df5ad8cee60e61ee6fe3afb735e4fbc1ff41", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742396414, - "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "lastModified": 1742488644, + "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=", "owner": "nix-community", "repo": "nixvim", - "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742403709, - "narHash": "sha256-KTlZG+mUCIDDuiKUlR4EGtM8P73s4nFmYN6cTsyCGyg=", + "lastModified": 1742492005, + "narHash": "sha256-sKRbnaTTfkT0bitTGXuD24s76DdwQSyEssfVYSrvwMU=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "a8b87b89ef3b9d7e63f9f0a354f0c43b6c149dc2", + "rev": "5bb771b253493042079712487d4f92a72837b361", "type": "github" }, "original": { From 6a4fb6d647f2e39462282f0b6e8919923b4a4f5f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 12:27:56 +0300 Subject: [PATCH 0708/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f6c3613..c1ef203 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742501496, - "narHash": "sha256-LYwyZmhckDKK7i4avmbcs1pBROpOaHi98lbjX1fmVpU=", + "lastModified": 1742530487, + "narHash": "sha256-yjBjRn294NpPagPAQCio20X5BzBXiOoz2+xF3/YmEkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d725df5ad8cee60e61ee6fe3afb735e4fbc1ff41", + "rev": "d61711497be9ad6a6633aaf203b038b5a970621f", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742492005, - "narHash": "sha256-sKRbnaTTfkT0bitTGXuD24s76DdwQSyEssfVYSrvwMU=", + "lastModified": 1742549264, + "narHash": "sha256-HCkNDryv+wrG/EGM24V+ar6j7SDZpKWq/NCvm6stCL4=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "5bb771b253493042079712487d4f92a72837b361", + "rev": "2dccc8f65561e3b03334ef99ffbc49b407cfbd13", "type": "github" }, "original": { From b81ca86a8f9fccc1e3d2e041d8bb83ed5048d248 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 13:35:36 +0300 Subject: [PATCH 0709/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c1ef203..b276e25 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742549264, - "narHash": "sha256-HCkNDryv+wrG/EGM24V+ar6j7SDZpKWq/NCvm6stCL4=", + "lastModified": 1742553323, + "narHash": "sha256-lSMsZV9DlubI+9WxSatG02pmjhkdOW3++n+AtytfJ9Q=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "2dccc8f65561e3b03334ef99ffbc49b407cfbd13", + "rev": "a2066fc6d5de55002301f4081f4d056824ab63fa", "type": "github" }, "original": { From f002c5ee37e7e39f919abb5b43e2a41a247df7be Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 16:38:33 +0300 Subject: [PATCH 0710/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b276e25..81da60b 100644 --- a/flake.lock +++ b/flake.lock @@ -409,11 +409,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742488644, - "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=", + "lastModified": 1742559284, + "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", "owner": "nix-community", "repo": "nixvim", - "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13", + "rev": "c980271267ef146a6c30394c611a97e077471cf2", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742553323, - "narHash": "sha256-lSMsZV9DlubI+9WxSatG02pmjhkdOW3++n+AtytfJ9Q=", + "lastModified": 1742564297, + "narHash": "sha256-GH1ePMGNzMPUZssz7aUFuVIQ8k4eQ4BDIe32LeauaEg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "a2066fc6d5de55002301f4081f4d056824ab63fa", + "rev": "e91c012933e8914bef59d08395ae897ba2461012", "type": "github" }, "original": { From 61312a5928289898a8dbd6ac173ef763326332df Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 22:49:52 +0300 Subject: [PATCH 0711/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 81da60b..84dd281 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742530487, - "narHash": "sha256-yjBjRn294NpPagPAQCio20X5BzBXiOoz2+xF3/YmEkU=", + "lastModified": 1742569620, + "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d61711497be9ad6a6633aaf203b038b5a970621f", + "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742564297, - "narHash": "sha256-GH1ePMGNzMPUZssz7aUFuVIQ8k4eQ4BDIe32LeauaEg=", + "lastModified": 1742586580, + "narHash": "sha256-8TxJcrjEKoYsG9sGuIV8VIeT9jZjCYyIJX05PKtMz/0=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "e91c012933e8914bef59d08395ae897ba2461012", + "rev": "32fe78420b2a335e504d1a391776e08fe3f45e02", "type": "github" }, "original": { From 4fd01b1d27a5f751672696a14faf24c4c178f049 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 21 Mar 2025 23:00:33 +0300 Subject: [PATCH 0712/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 84dd281..308363e 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1742586580, - "narHash": "sha256-8TxJcrjEKoYsG9sGuIV8VIeT9jZjCYyIJX05PKtMz/0=", + "lastModified": 1742587215, + "narHash": "sha256-Fo2YG3yWFXMYd/4XAK4iCxcNgwdv2056T6JksbVCik4=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "32fe78420b2a335e504d1a391776e08fe3f45e02", + "rev": "24d256c3dc261725b00c31c3913fe5fcc34e54f0", "type": "github" }, "original": { From 9d3c03f849f0bedeab6af177e684f6e07d1b001e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 00:56:18 +0300 Subject: [PATCH 0713/1768] add minegrub theme --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 4 ++++ home/starship.nix | 1 + modules/default.nix | 1 + modules/minegrub.nix | 26 ++++++++++++++++++++++++++ 5 files changed, 53 insertions(+) create mode 100644 modules/minegrub.nix diff --git a/flake.lock b/flake.lock index 308363e..f3289b6 100644 --- a/flake.lock +++ b/flake.lock @@ -245,6 +245,26 @@ "type": "github" } }, + "minegrub-theme": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742563259, + "narHash": "sha256-OLFbGacrRFqSoqUc+pf66eb1xd0aU/crKfpiWSpJ0fw=", + "owner": "Lxtharia", + "repo": "minegrub-theme", + "rev": "b1caebbd5ab96f6afbfcd735b58fab9b9d8cf54b", + "type": "github" + }, + "original": { + "owner": "Lxtharia", + "repo": "minegrub-theme", + "type": "github" + } + }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -571,6 +591,7 @@ "agenix": "agenix", "deploy-rs": "deploy-rs", "home-manager": "home-manager", + "minegrub-theme": "minegrub-theme", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 586c5d2..6b650cd 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,10 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + minegrub-theme = { + url = "github:Lxtharia/minegrub-theme"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixvim = { diff --git a/home/starship.nix b/home/starship.nix index 49fa9b6..517f6d8 100644 --- a/home/starship.nix +++ b/home/starship.nix @@ -7,6 +7,7 @@ dart.disabled = true; python.disabled = true; nodejs.disabled = true; + c.disabled = true; }; }; } diff --git a/modules/default.nix b/modules/default.nix index 9f0fd16..ad0ccb4 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -12,6 +12,7 @@ ./graphical-interface.nix ./i18n.nix ./jellyfin.nix + ./minegrub.nix ./nix-settings.nix ./ollama.nix ./remote-builds.nix diff --git a/modules/minegrub.nix b/modules/minegrub.nix new file mode 100644 index 0000000..6f887de --- /dev/null +++ b/modules/minegrub.nix @@ -0,0 +1,26 @@ +{config, inputs, lib, ...}: { + imports = [ + inputs.minegrub-theme.nixosModules.default + ]; + options = { + myModules.enableMinegrubTheme = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Minecraft theme for grub."; + }; + }; + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableMinegrubTheme { + + + boot.loader.grub = { + minegrub-theme = { + enable = true; + splash = "100% Flakes!"; + background = "background_options/1.8 - [Classic Minecraft].png"; + boot-options-count = 4; + }; + }; + }) + ]; +} From 19a4952658cd43433c975e00f1057e0ffb6b8575 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 01:07:13 +0300 Subject: [PATCH 0714/1768] update flake.lock --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 30b26c5..0878535 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -26,6 +26,7 @@ enableADB = true; # enableCaddy = true; enableOllama = true; + enableMinegrubTheme = true; }; # Bootloader. From 7c033b9f701a64ba11e261131439c794b007cce7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 01:17:52 +0300 Subject: [PATCH 0715/1768] formatting --- modules/minegrub.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/minegrub.nix b/modules/minegrub.nix index 6f887de..1b4747f 100644 --- a/modules/minegrub.nix +++ b/modules/minegrub.nix @@ -1,4 +1,9 @@ -{config, inputs, lib, ...}: { +{ + config, + inputs, + lib, + ... +}: { imports = [ inputs.minegrub-theme.nixosModules.default ]; @@ -11,8 +16,6 @@ }; config = lib.mkMerge [ (lib.mkIf config.myModules.enableMinegrubTheme { - - boot.loader.grub = { minegrub-theme = { enable = true; From 7b05e7a156985e636ebf49d3d91a69843d028d40 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 02:01:08 +0300 Subject: [PATCH 0716/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f3289b6..1b29ad8 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742569620, - "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", + "lastModified": 1742588233, + "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", + "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", "type": "github" }, "original": { From 203f0bbc6f096c416c7d83c875ee0bc04618b723 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 21:40:34 +0300 Subject: [PATCH 0717/1768] try this instead --- modules/minegrub.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/minegrub.nix b/modules/minegrub.nix index 1b4747f..02090f1 100644 --- a/modules/minegrub.nix +++ b/modules/minegrub.nix @@ -2,11 +2,12 @@ config, inputs, lib, + pkgs, ... }: { - imports = [ - inputs.minegrub-theme.nixosModules.default - ]; + # imports = [ + # inputs.minegrub-theme.nixosModules.default + # ]; options = { myModules.enableMinegrubTheme = lib.mkOption { type = lib.types.bool; @@ -17,12 +18,20 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableMinegrubTheme { boot.loader.grub = { - minegrub-theme = { - enable = true; - splash = "100% Flakes!"; - background = "background_options/1.8 - [Classic Minecraft].png"; - boot-options-count = 4; - }; + # minegrub-theme = { + # enable = true; + # splash = "100% Flakes!"; + # background = "background_options/1.8 - [Classic Minecraft].png"; + # boot-options-count = 4; + # }; + theme = + pkgs.fetchFromGitHub + { + owner = "Lxtharia"; + repo = "minegrub-theme"; + rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; + sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; + }; }; }) ]; From 58e560b52792e9f8afaa73b6a34c76f186b6a59a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 23:30:31 +0300 Subject: [PATCH 0718/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 1b29ad8..f0a72f7 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", + "lastModified": 1742670145, + "narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", "owner": "nix-community", "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", + "rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742376361, - "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1742587215, - "narHash": "sha256-Fo2YG3yWFXMYd/4XAK4iCxcNgwdv2056T6JksbVCik4=", + "lastModified": 1742675416, + "narHash": "sha256-5Hl1K4JvvG1qfvnoP9yqzkiAS0k/Iqd48a6DqmZkRx4=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "24d256c3dc261725b00c31c3913fe5fcc34e54f0", + "rev": "8c827aae95783aae3c0805ea2fac339d1f655767", "type": "github" }, "original": { From 075dc867f60ae44561b266dd18b5197556199154 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Mar 2025 23:59:48 +0300 Subject: [PATCH 0719/1768] what even is this --- modules/common-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 6e93a38..d0456c3 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -37,11 +37,6 @@ bat ]; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - virtualisation.docker.enable = true; # Enable the OpenSSH daemon. From 9b0b4f86272d29920340b433208a1598c0533ce2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 01:20:43 +0300 Subject: [PATCH 0720/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f0a72f7..76d07fb 100644 --- a/flake.lock +++ b/flake.lock @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1742675416, - "narHash": "sha256-5Hl1K4JvvG1qfvnoP9yqzkiAS0k/Iqd48a6DqmZkRx4=", + "lastModified": 1742682023, + "narHash": "sha256-NTUDhKEX4FukF2WRr6gboEK/RxPxpBOnEqecYTNSs34=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8c827aae95783aae3c0805ea2fac339d1f655767", + "rev": "8595d33ba5a1520fff57eb42dab159c5f00a2224", "type": "github" }, "original": { From aff6c75e3be61f6760846dd2382ba9ab39c0590f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Mar 2025 02:24:50 +0300 Subject: [PATCH 0721/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 76d07fb..2de8831 100644 --- a/flake.lock +++ b/flake.lock @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1742682023, - "narHash": "sha256-NTUDhKEX4FukF2WRr6gboEK/RxPxpBOnEqecYTNSs34=", + "lastModified": 1742682600, + "narHash": "sha256-OcT25DP5dK7tdpDYtt3gHnhU6MLUOtPryko1c4ch0E8=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8595d33ba5a1520fff57eb42dab159c5f00a2224", + "rev": "e6f6e243bfe740008701551a6e003cc8b6dd222b", "type": "github" }, "original": { From 13ca93f2c130bc1de975ed7da3571085f4662464 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Mar 2025 10:35:26 +0300 Subject: [PATCH 0722/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2de8831..2595b2b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742670145, - "narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742631601, - "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "380ed15bcd6440606c6856db44a99140d422b46f", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742559284, - "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", + "lastModified": 1742862631, + "narHash": "sha256-TGeFlONiQxKbgt39pKPnh5gD0NQ/DD8v6FRisD7q+MI=", "owner": "nix-community", "repo": "nixvim", - "rev": "c980271267ef146a6c30394c611a97e077471cf2", + "rev": "ec92a1816e7deb33d03ff0ab7692fa504e3d1910", "type": "github" }, "original": { @@ -522,11 +522,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1742682600, - "narHash": "sha256-OcT25DP5dK7tdpDYtt3gHnhU6MLUOtPryko1c4ch0E8=", + "lastModified": 1742888113, + "narHash": "sha256-0761im6mPt5SyKLn4mIqViAHw9G0OfUzjsumEwqewUo=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "e6f6e243bfe740008701551a6e003cc8b6dd222b", + "rev": "943a474095c9b9d80b289b5fdf3b7d03830f9073", "type": "github" }, "original": { From 33c6f2492c46310cefd2d0a532976f3a02b19365 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Mar 2025 10:39:47 +0300 Subject: [PATCH 0723/1768] add just recipe for listing generations --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index 1cb6cf3..d8393ea 100644 --- a/justfile +++ b/justfile @@ -34,6 +34,9 @@ collect-garbage: # home-manager expire-generations now sudo nix-collect-garbage --delete-older-than 3d +list-generations: + nixos-rebuild list-generations + build-sd-image-harmonica: check-git nom build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage From cc030ddcd0549d410282faa9a9e79b01e9f137d8 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Mar 2025 13:20:36 +0300 Subject: [PATCH 0724/1768] no need for allowing discord --- modules/nix-settings.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 7590074..3c81aec 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -4,11 +4,9 @@ ... }: { # Allow unfree packages - # nixpkgs.config.allowUnfree = true; # TODO: replace this with allowUnfreePredicate nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "vscode" # TODO: remove this - "discord" # TODO: remove this "obsidian" "steam" "steam-unwrapped" From c6d4281f7f6ba16933f429e86b6236b71c5a500f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Mar 2025 21:25:49 +0300 Subject: [PATCH 0725/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2595b2b..731dbe9 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1742926508, + "narHash": "sha256-wgfY302ZaOsBCXb8aZDTG3Zt2kg3jDDaRrmtUw8nz00=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "8bef8b7a0a95d347018f09b291e2fa0a77abd23f", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742862631, - "narHash": "sha256-TGeFlONiQxKbgt39pKPnh5gD0NQ/DD8v6FRisD7q+MI=", + "lastModified": 1742916868, + "narHash": "sha256-2eN75OsaNpL3FzAs3hz9Xm3+htIP3iLdfRP6PGfOoS8=", "owner": "nix-community", "repo": "nixvim", - "rev": "ec92a1816e7deb33d03ff0ab7692fa504e3d1910", + "rev": "6b95b825529aa2d8536f7684fe64382ef4d15d84", "type": "github" }, "original": { From 76e84be989fa2c5352453552b6fe49e38dc2ea44 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Mar 2025 19:14:58 +0300 Subject: [PATCH 0726/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 731dbe9..a1780df 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742926508, - "narHash": "sha256-wgfY302ZaOsBCXb8aZDTG3Zt2kg3jDDaRrmtUw8nz00=", + "lastModified": 1742996658, + "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8bef8b7a0a95d347018f09b291e2fa0a77abd23f", + "rev": "693840c01b9bef9e54100239cef937e53d4661bf", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742916868, - "narHash": "sha256-2eN75OsaNpL3FzAs3hz9Xm3+htIP3iLdfRP6PGfOoS8=", + "lastModified": 1742991302, + "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=", "owner": "nix-community", "repo": "nixvim", - "rev": "6b95b825529aa2d8536f7684fe64382ef4d15d84", + "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1742888113, - "narHash": "sha256-0761im6mPt5SyKLn4mIqViAHw9G0OfUzjsumEwqewUo=", + "lastModified": 1743005685, + "narHash": "sha256-cGfF80tFaVHWO9MfEhR4N3zMS3hAlni0Yl6VwK4Lwn4=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "943a474095c9b9d80b289b5fdf3b7d03830f9073", + "rev": "710f53089d3a3eef5119a99a754e2c8028c27dcb", "type": "github" }, "original": { From e7f9560f6d0c814e416eb00315c5c9b8f8d12c45 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 15:50:30 +0300 Subject: [PATCH 0727/1768] remove unnecessary argument --- modules/jellyfin.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/jellyfin.nix b/modules/jellyfin.nix index e2f48c5..43f1fb8 100644 --- a/modules/jellyfin.nix +++ b/modules/jellyfin.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: { From 8d54f3f5dbc05c9e76d2301773db0984db1fe1d5 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 15:50:44 +0300 Subject: [PATCH 0728/1768] lets see if this works --- modules/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index 5046993..1736a8d 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -30,7 +30,7 @@ (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) { services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' - reverse_proxy pochita.curl-boga.ts.net:3000 + reverse_proxy pochita.curl-boga.ts.net:${config.services.forgejo.settings.server.HTTP_PORT} # acme_dns cloudflare {env.CF_API_TOKEN} ''; }; From 545e3d17a9dfa931627781471a8f8de5e10542c2 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 16:32:12 +0300 Subject: [PATCH 0729/1768] add vaultwarden option --- modules/default.nix | 1 + modules/vaultwarden.nix | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 modules/vaultwarden.nix diff --git a/modules/default.nix b/modules/default.nix index ad0ccb4..facab04 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -20,6 +20,7 @@ ./sound.nix ./tailscale.nix ./users.nix + ./vaultwarden.nix ./wake-on-lan.nix ]; } diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix new file mode 100644 index 0000000..01e0043 --- /dev/null +++ b/modules/vaultwarden.nix @@ -0,0 +1,20 @@ +{ + config, + lib, + ... +}: { + options = { + myModules.enableVaultwarden = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Vaultwarden server"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableVaultwarden { + services.vaultwarden.enable = true; + }) + ]; +} + From 7e60e9f24aea5462b61ccef7bf336c3b005d4f6c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 16:32:27 +0300 Subject: [PATCH 0730/1768] fix the int to string issue --- modules/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/forgejo.nix b/modules/forgejo.nix index 1736a8d..da85309 100644 --- a/modules/forgejo.nix +++ b/modules/forgejo.nix @@ -30,7 +30,7 @@ (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) { services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' - reverse_proxy pochita.curl-boga.ts.net:${config.services.forgejo.settings.server.HTTP_PORT} + reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} # acme_dns cloudflare {env.CF_API_TOKEN} ''; }; From 8788bafd0193309591f31478c3130cbd0261db74 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 16:32:48 +0300 Subject: [PATCH 0731/1768] stupid alejandro --- modules/vaultwarden.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/vaultwarden.nix b/modules/vaultwarden.nix index 01e0043..be20468 100644 --- a/modules/vaultwarden.nix +++ b/modules/vaultwarden.nix @@ -17,4 +17,3 @@ }) ]; } - From 4ab8147bd7005c606e76c962ca8b0b204ece19eb Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 21:11:10 +0300 Subject: [PATCH 0732/1768] move services --- modules/default.nix | 7 +------ modules/{ => services}/caddy.nix | 0 modules/services/default.nix | 10 ++++++++++ modules/{ => services}/forgejo.nix | 0 modules/{ => services}/jellyfin.nix | 0 modules/{ => services}/ollama.nix | 0 modules/{ => services}/tailscale.nix | 0 modules/{ => services}/vaultwarden.nix | 0 8 files changed, 11 insertions(+), 6 deletions(-) rename modules/{ => services}/caddy.nix (100%) create mode 100644 modules/services/default.nix rename modules/{ => services}/forgejo.nix (100%) rename modules/{ => services}/jellyfin.nix (100%) rename modules/{ => services}/ollama.nix (100%) rename modules/{ => services}/tailscale.nix (100%) rename modules/{ => services}/vaultwarden.nix (100%) diff --git a/modules/default.nix b/modules/default.nix index facab04..2f4429a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,26 +1,21 @@ { imports = [ + ./services ./adb.nix ./arduino.nix - ./caddy.nix ./common-packages.nix ./concentration.nix ./disable-hibernation.nix ./emulation.nix ./fonts.nix - ./forgejo.nix ./graphical-interface.nix ./i18n.nix - ./jellyfin.nix ./minegrub.nix ./nix-settings.nix - ./ollama.nix ./remote-builds.nix ./secrets.nix ./sound.nix - ./tailscale.nix ./users.nix - ./vaultwarden.nix ./wake-on-lan.nix ]; } diff --git a/modules/caddy.nix b/modules/services/caddy.nix similarity index 100% rename from modules/caddy.nix rename to modules/services/caddy.nix diff --git a/modules/services/default.nix b/modules/services/default.nix new file mode 100644 index 0000000..a88f3c4 --- /dev/null +++ b/modules/services/default.nix @@ -0,0 +1,10 @@ +{ + import = [ + ./caddy.nix + ./ollama.nix + ./forgejo.nix + ./jellyfin.nix + ./tailscale.nix + ./vaultwarden.nix + ]; +} diff --git a/modules/forgejo.nix b/modules/services/forgejo.nix similarity index 100% rename from modules/forgejo.nix rename to modules/services/forgejo.nix diff --git a/modules/jellyfin.nix b/modules/services/jellyfin.nix similarity index 100% rename from modules/jellyfin.nix rename to modules/services/jellyfin.nix diff --git a/modules/ollama.nix b/modules/services/ollama.nix similarity index 100% rename from modules/ollama.nix rename to modules/services/ollama.nix diff --git a/modules/tailscale.nix b/modules/services/tailscale.nix similarity index 100% rename from modules/tailscale.nix rename to modules/services/tailscale.nix diff --git a/modules/vaultwarden.nix b/modules/services/vaultwarden.nix similarity index 100% rename from modules/vaultwarden.nix rename to modules/services/vaultwarden.nix From 1f496ff252eabf6e9b495072fd6aaba9e1a1dea7 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 21:14:00 +0300 Subject: [PATCH 0733/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a1780df..e2b6b3f 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1742996658, - "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", + "lastModified": 1743097780, + "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=", "owner": "nix-community", "repo": "home-manager", - "rev": "693840c01b9bef9e54100239cef937e53d4661bf", + "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52", "type": "github" }, "original": { From f3783c600b19106ab887e3cda31045f360c0d5db Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 21:14:48 +0300 Subject: [PATCH 0734/1768] typo fix --- modules/services/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/default.nix b/modules/services/default.nix index a88f3c4..ac6a279 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,5 +1,5 @@ { - import = [ + imports = [ ./caddy.nix ./ollama.nix ./forgejo.nix From 528f6af517f29adeb1956816008f55d3db133e60 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Mar 2025 21:27:16 +0300 Subject: [PATCH 0735/1768] ok it should see it now --- modules/services/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 0eed372..728cdc6 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -51,7 +51,7 @@ nssTools ]; age.secrets.cloudflare = { - file = ../secrets/cloudflare.age; + file = ../../secrets/cloudflare.age; path = "/etc/caddy/.env"; owner = "caddy"; mode = "0600"; From b9289d9c31eded7603bd1681d27397d3b2c4eac1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 29 Mar 2025 16:47:02 +0300 Subject: [PATCH 0736/1768] add cloudflare service --- modules/services/cloudflare-dyndns.nix | 21 +++++++++++++++++++++ modules/services/default.nix | 1 + 2 files changed, 22 insertions(+) create mode 100644 modules/services/cloudflare-dyndns.nix diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix new file mode 100644 index 0000000..2d0d1e3 --- /dev/null +++ b/modules/services/cloudflare-dyndns.nix @@ -0,0 +1,21 @@ +{ + lib, + config, + ... +}: { + options = { + myModules.enableCloudflareDyndns = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable a service to push my public IP address to my Cloudflare domain."; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableCloudflareDyndns { + services.cloudflare-dyndns = { + enable = true; + }; + }) + ]; +} diff --git a/modules/services/default.nix b/modules/services/default.nix index ac6a279..d8c5b96 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,6 +1,7 @@ { imports = [ ./caddy.nix + ./cloudflare-dyndns.nix ./ollama.nix ./forgejo.nix ./jellyfin.nix From 705236a26ff7a22af9776ffa6bfc992447ed251d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 29 Mar 2025 16:51:17 +0300 Subject: [PATCH 0737/1768] enable cloudflare dynamic dns on the pochita --- hosts/pochita/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 79c65e5..a019a79 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -23,6 +23,7 @@ enableTailscale = true; enableForgejo = true; enableCaddy = true; + enableCloudflareDyndns = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From 2df92f7a3d8c1a1ab79dc13eea3216380bf43f33 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 29 Mar 2025 16:53:13 +0300 Subject: [PATCH 0738/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e2b6b3f..1d939a1 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743097780, - "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1743167577, + "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742991302, - "narHash": "sha256-5S+qnc5ijgFWlAWS9+L7uAgpDnL0RtVEDhVpHWGoavA=", + "lastModified": 1743157969, + "narHash": "sha256-ldlSyVKNaXL7ys7Jr7mLhlpGDE4VPVcWmV7Odupn5TY=", "owner": "nix-community", "repo": "nixvim", - "rev": "1c0dd320d9c4f250ac33382e11d370b7abe97622", + "rev": "95573411bc9be155a93b0f15d2bad62c6b43b3cc", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1743005685, - "narHash": "sha256-cGfF80tFaVHWO9MfEhR4N3zMS3hAlni0Yl6VwK4Lwn4=", + "lastModified": 1743166499, + "narHash": "sha256-rbqxxEm8jyaVpICLPpGNZjD4l4Ob35YtVR/krH8cvoA=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "710f53089d3a3eef5119a99a754e2c8028c27dcb", + "rev": "1668b8bc97238feff395d7d2fd81997ee6911261", "type": "github" }, "original": { From e9bbcb6c92abd4cf6eda105bf7c9ce7db6f16142 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 29 Mar 2025 19:10:17 +0300 Subject: [PATCH 0739/1768] import agenix at the module --- hosts/harmonica-sd/configuration.nix | 1 - hosts/harmonica/configuration.nix | 1 - hosts/pochita/configuration.nix | 1 - hosts/tartarus/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - modules/secrets.nix | 3 +++ 6 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/harmonica-sd/configuration.nix index dfe7fd2..b97b36f 100644 --- a/hosts/harmonica-sd/configuration.nix +++ b/hosts/harmonica-sd/configuration.nix @@ -8,7 +8,6 @@ "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ./hardware-configuration.nix ../../modules - inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager inputs.vscode-server.nixosModules.default ]; diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index ce7cdd4..0e13ced 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -6,7 +6,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager inputs.vscode-server.nixosModules.default ]; diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index a019a79..0e09203 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -11,7 +11,6 @@ inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.nixos-hardware.nixosModules.raspberry-pi-5 inputs.vscode-server.nixosModules.default - inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager ]; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index ea0e3da..391e51b 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -8,7 +8,6 @@ ./hardware-configuration.nix ../../modules inputs.vscode-server.nixosModules.default - inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager ]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 0878535..0a710b3 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -8,7 +8,6 @@ ./hardware-configuration.nix ../../modules inputs.vscode-server.nixosModules.default - inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.home-manager ]; diff --git a/modules/secrets.nix b/modules/secrets.nix index 5f4af4b..f22761c 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -5,6 +5,9 @@ lib, ... }: { + imports = [ + inputs.agenix.nixosModules.default + ]; options = { myModules.enableSecrets = lib.mkOption { type = lib.types.bool; From b2ec857881a2793168c9054a54dc1c7694c78366 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 29 Mar 2025 19:16:21 +0300 Subject: [PATCH 0740/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1d939a1..68405f1 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743136572, - "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", + "lastModified": 1743259333, + "narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", + "rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68", "type": "github" }, "original": { From be13c81a08c59d45900b622f8f895d61e77f3395 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Mar 2025 00:39:34 +0300 Subject: [PATCH 0741/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 68405f1..7acb35a 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743259333, - "narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=", + "lastModified": 1743267068, + "narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68", + "rev": "b431496538b0e294fbe44a1441b24ae8195c63f0", "type": "github" }, "original": { From 4339490e5f1c36c3536ca1b5e12404d0cbac4f02 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Mar 2025 22:19:06 +0300 Subject: [PATCH 0742/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7acb35a..67cfec0 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743267068, - "narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=", + "lastModified": 1743360001, + "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b431496538b0e294fbe44a1441b24ae8195c63f0", + "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743157969, - "narHash": "sha256-ldlSyVKNaXL7ys7Jr7mLhlpGDE4VPVcWmV7Odupn5TY=", + "lastModified": 1743350730, + "narHash": "sha256-i44zW+TWC74EhmhUBpvnt5ZfYDVbZjRzSZdy4vGrKkY=", "owner": "nix-community", "repo": "nixvim", - "rev": "95573411bc9be155a93b0f15d2bad62c6b43b3cc", + "rev": "a3b16fa00404dce7eccc289ce0b54a8111628d4f", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1743166499, - "narHash": "sha256-rbqxxEm8jyaVpICLPpGNZjD4l4Ob35YtVR/krH8cvoA=", + "lastModified": 1743362333, + "narHash": "sha256-gdn5odInjh7llRHYOPFforJXWNcWsWXk/cdv7pLiATg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "1668b8bc97238feff395d7d2fd81997ee6911261", + "rev": "8047dfe331af73305f1ad5278416847030751147", "type": "github" }, "original": { From 3225b5e94dd27cf3f974cb9af0943866c0d55cb0 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 1 Apr 2025 07:50:10 +0300 Subject: [PATCH 0743/1768] add new modules --- modules/graphical-interface.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 576b8c1..88d786a 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -38,8 +38,10 @@ sddm-sugar-dark vscode alacritty + ghostty obsidian mpv + pomodoro-gtk libreoffice gimp kitty @@ -57,7 +59,6 @@ ]; text = '' # check if logged in to huggingface - # hugingface-cli whoami == "Not logged in" means not logged in if [ "$(huggingface-cli whoami)" == "Not logged in" ]; then echo "Please log in to huggingface" exit 1 From 319f2b65629bc50733a314ded9a61112400fe605 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 1 Apr 2025 08:16:49 +0300 Subject: [PATCH 0744/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 67cfec0..47c494a 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743360001, - "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", + "lastModified": 1743482579, + "narHash": "sha256-u81nqA4UuRatKDkzUuIfVYdLMw8birEy+99oXpdyXhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", + "rev": "c21383b556609ce1ad901aa08b4c6fbd9e0c7af0", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743350730, - "narHash": "sha256-i44zW+TWC74EhmhUBpvnt5ZfYDVbZjRzSZdy4vGrKkY=", + "lastModified": 1743362786, + "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "owner": "nix-community", "repo": "nixvim", - "rev": "a3b16fa00404dce7eccc289ce0b54a8111628d4f", + "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "type": "github" }, "original": { From 1be0bd4857d8b3b274e8446530ba00b65ccac608 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 00:44:24 +0300 Subject: [PATCH 0745/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 47c494a..21a9cd7 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743482579, - "narHash": "sha256-u81nqA4UuRatKDkzUuIfVYdLMw8birEy+99oXpdyXhY=", + "lastModified": 1743607567, + "narHash": "sha256-kTzKPDFmNzwO1cK4fiJgPB/iSw7HgBAmknRTeAPJAeI=", "owner": "nix-community", "repo": "home-manager", - "rev": "c21383b556609ce1ad901aa08b4c6fbd9e0c7af0", + "rev": "49748c74cdbae03d70381f150b810f92617f23aa", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743362786, - "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", + "lastModified": 1743598191, + "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=", "owner": "nix-community", "repo": "nixvim", - "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", + "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e", "type": "github" }, "original": { @@ -522,11 +522,11 @@ ] }, "locked": { - "lastModified": 1742659553, - "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", + "lastModified": 1743201766, + "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", "owner": "NuschtOS", "repo": "search", - "rev": "508752835128a3977985a4d5225ff241f7756181", + "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1743362333, - "narHash": "sha256-gdn5odInjh7llRHYOPFforJXWNcWsWXk/cdv7pLiATg=", + "lastModified": 1743629502, + "narHash": "sha256-Lk8s0cp1E4/zKhWUvDzPTAiotw2HOaYzsRxxoBqjk6A=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8047dfe331af73305f1ad5278416847030751147", + "rev": "864da9f45001e8319328fc44902ff920f1cf9dfc", "type": "github" }, "original": { From 13fcdbb413ffcdaa63609887829c71a11a6c6fac Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 00:44:33 +0300 Subject: [PATCH 0746/1768] set the token path --- modules/services/cloudflare-dyndns.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index 2d0d1e3..e22b92e 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -15,6 +15,7 @@ (lib.mkIf config.myModules.enableCloudflareDyndns { services.cloudflare-dyndns = { enable = true; + apiTokenFile = "/persist/cloudflare-dyndns"; }; }) ]; From d32ec7c7026cc4955b2f381475d773ea779b5075 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 01:16:03 +0300 Subject: [PATCH 0747/1768] specify domains --- modules/services/cloudflare-dyndns.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index e22b92e..e360a3b 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -16,6 +16,11 @@ services.cloudflare-dyndns = { enable = true; apiTokenFile = "/persist/cloudflare-dyndns"; + proxied = true; + domains = [ + "git.osbm.dev" + "aifred.osbm.dev" + ]; }; }) ]; From 049941aa265cfbe69a7974537d248613e75dfa75 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 13:28:17 +0300 Subject: [PATCH 0748/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 21a9cd7..95ea502 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743607567, - "narHash": "sha256-kTzKPDFmNzwO1cK4fiJgPB/iSw7HgBAmknRTeAPJAeI=", + "lastModified": 1743648554, + "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", "owner": "nix-community", "repo": "home-manager", - "rev": "49748c74cdbae03d70381f150b810f92617f23aa", + "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743448293, - "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { From e46fadeb3511e261fa79e3bc270651606c4b00bb Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 15:24:21 +0300 Subject: [PATCH 0749/1768] add eeprom software to pochita --- hosts/pochita/configuration.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 0e09203..4ac29ef 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -37,7 +37,9 @@ backupFileExtension = "hmbak"; }; - environment.systemPackages = []; + environment.systemPackages = [ + pkgs.raspberrypi-eeprom + ]; security.sudo = { enable = true; From d9bb81e2af1aa03a69c51cfebe028c6dd07aca30 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 21:37:08 +0300 Subject: [PATCH 0750/1768] lets override this shit --- modules/services/cloudflare-dyndns.nix | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index e360a3b..ecc9b5c 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -1,8 +1,28 @@ { lib, config, + pkgs, ... -}: { +}: +let + # https://github.com/NixOS/nixpkgs/pull/394352 + cloudflare-dyndns-5-3 = pkgs.cloudflare-dyndns.overrideAttrs rec { + version = "5.3"; + src = pkgs.fetchFromGitHub { + owner = "kissgyorgy"; + repo = "cloudflare-dyndns"; + rev = "v${version}"; + hash = "sha256-t0MqH9lDfl+cAnPYSG7P32OGO8Qpo1ep0Hj3Xl76lhU="; + }; + dependencies = with pkgs.python3Packages; [ + click + httpx + pydantic + truststore + ]; + }; +in +{ options = { myModules.enableCloudflareDyndns = lib.mkOption { type = lib.types.bool; @@ -14,6 +34,7 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableCloudflareDyndns { services.cloudflare-dyndns = { + package = cloudflare-dyndns-5-3; enable = true; apiTokenFile = "/persist/cloudflare-dyndns"; proxied = true; From 82cb10cecf00c4e60fbce20152454ab13bacba49 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 21:57:15 +0300 Subject: [PATCH 0751/1768] i actually wrote some nix code i am so proud of myself i am going to cry just like natsuki subaru i cant believe the lenght of this commit message is getting too long i dont even know if this sentence makes grammatical sense anymore --- modules/services/cloudflare-dyndns.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index ecc9b5c..a426c67 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -7,13 +7,16 @@ let # https://github.com/NixOS/nixpkgs/pull/394352 cloudflare-dyndns-5-3 = pkgs.cloudflare-dyndns.overrideAttrs rec { - version = "5.3"; + version = lib.warnIfNot (pkgs.cloudflare-dyndns.version == "5.0") "The cloudflare-dyndns package is updated, you should remove this override" "5.3"; src = pkgs.fetchFromGitHub { owner = "kissgyorgy"; repo = "cloudflare-dyndns"; rev = "v${version}"; hash = "sha256-t0MqH9lDfl+cAnPYSG7P32OGO8Qpo1ep0Hj3Xl76lhU="; }; + build-system = with pkgs.python3Packages; [ + hatchling + ]; dependencies = with pkgs.python3Packages; [ click httpx From 26880c8539de012d06740fe82ef69c81e402372f Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 22:27:25 +0300 Subject: [PATCH 0752/1768] try overridePythonAttrs for some fucking reason --- modules/services/cloudflare-dyndns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index a426c67..56ee2ff 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -6,7 +6,7 @@ }: let # https://github.com/NixOS/nixpkgs/pull/394352 - cloudflare-dyndns-5-3 = pkgs.cloudflare-dyndns.overrideAttrs rec { + cloudflare-dyndns-5-3 = pkgs.cloudflare-dyndns.overridePythonAttrs rec { version = lib.warnIfNot (pkgs.cloudflare-dyndns.version == "5.0") "The cloudflare-dyndns package is updated, you should remove this override" "5.3"; src = pkgs.fetchFromGitHub { owner = "kissgyorgy"; From 568455f496361ba78656669279f548a9dc4eeaf1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 22:50:25 +0300 Subject: [PATCH 0753/1768] enable nvim everywhere --- hosts/tartarus/configuration.nix | 4 ---- hosts/ymir/configuration.nix | 1 - modules/common-packages.nix | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 391e51b..f96a909 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -43,9 +43,5 @@ hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - environment.systemPackages = [ - inputs.osbm-nvim.packages.x86_64-linux.default - ]; - system.stateVersion = "24.05"; # lalalalala } diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 0a710b3..0a21fd0 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -91,7 +91,6 @@ environment.systemPackages = with pkgs; [ nvidia-container-toolkit - inputs.osbm-nvim.packages.x86_64-linux.default ]; system.stateVersion = "25.05"; # great taboo of the nixos world diff --git a/modules/common-packages.nix b/modules/common-packages.nix index d0456c3..a43229e 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -1,5 +1,6 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ + inputs.osbm-nvim.packages.x86_64-linux.default wget git git-lfs From 26b6e975e9e7a43062d59ead01027df99415ceea Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 22:54:03 +0300 Subject: [PATCH 0754/1768] add inputs arg --- modules/common-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index a43229e..61e7092 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { environment.systemPackages = with pkgs; [ inputs.osbm-nvim.packages.x86_64-linux.default wget From 2a819fa9848c01cce76e2f65383238c844b98e57 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 22:55:14 +0300 Subject: [PATCH 0755/1768] formatting --- modules/services/cloudflare-dyndns.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index 56ee2ff..e7c81a7 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -3,8 +3,7 @@ config, pkgs, ... -}: -let +}: let # https://github.com/NixOS/nixpkgs/pull/394352 cloudflare-dyndns-5-3 = pkgs.cloudflare-dyndns.overridePythonAttrs rec { version = lib.warnIfNot (pkgs.cloudflare-dyndns.version == "5.0") "The cloudflare-dyndns package is updated, you should remove this override" "5.3"; @@ -24,8 +23,7 @@ let truststore ]; }; -in -{ +in { options = { myModules.enableCloudflareDyndns = lib.mkOption { type = lib.types.bool; From 20f6be5409cd42be46041d5ad91a47a9f36d2e30 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 3 Apr 2025 23:05:37 +0300 Subject: [PATCH 0756/1768] lets use this generalized case --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 61e7092..3044276 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -4,7 +4,7 @@ ... }: { environment.systemPackages = with pkgs; [ - inputs.osbm-nvim.packages.x86_64-linux.default + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default wget git git-lfs From 6734d153c5ee37468d792c6595a02ee36891980d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 5 Apr 2025 01:59:18 +0300 Subject: [PATCH 0757/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 95ea502..af6198d 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743648554, - "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", + "lastModified": 1743788974, + "narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", + "rev": "0f5908daf890c3d7e7052bef1d6deb0f2710aaa1", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743598191, - "narHash": "sha256-30aI8rWjX64E9vIlE4iqgQguTjItvTnQLTqHtFppF/w=", + "lastModified": 1743723573, + "narHash": "sha256-yxONmoimNU0hy0s8pF5lKCSZNqxVmbIHuag3sdk3R30=", "owner": "nix-community", "repo": "nixvim", - "rev": "a183298bf67307bdb7a25a2a3c565e76029f1b9e", + "rev": "9f495dda930ceca1653813ded11859d6b1342803", "type": "github" }, "original": { From 38f1e07a97308fffbcba5d8c71475857f0812084 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 5 Apr 2025 23:24:20 +0300 Subject: [PATCH 0758/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index af6198d..560abe8 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743788974, - "narHash": "sha256-2LeVyQZI2wTkSzMLvnN/kJjXVWp4HCVUoq17Bv8TNTk=", + "lastModified": 1743869639, + "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "0f5908daf890c3d7e7052bef1d6deb0f2710aaa1", + "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743723573, - "narHash": "sha256-yxONmoimNU0hy0s8pF5lKCSZNqxVmbIHuag3sdk3R30=", + "lastModified": 1743844372, + "narHash": "sha256-59T+ikFiTt0CiSvuja3/xYahT6SL2s3XtNykfG8l0gk=", "owner": "nix-community", "repo": "nixvim", - "rev": "9f495dda930ceca1653813ded11859d6b1342803", + "rev": "7b4311333b542178828e90f6997d8f03e8327b89", "type": "github" }, "original": { From 2eda0133006002c9cc2e43dd071a63c3fe69798c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 6 Apr 2025 13:40:20 +0300 Subject: [PATCH 0759/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 560abe8..13fd251 100644 --- a/flake.lock +++ b/flake.lock @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743844372, - "narHash": "sha256-59T+ikFiTt0CiSvuja3/xYahT6SL2s3XtNykfG8l0gk=", + "lastModified": 1743928368, + "narHash": "sha256-FszotfwK8DbVIVRZtwLVA8nCXpyz5PGVHiLtW42cxFY=", "owner": "nix-community", "repo": "nixvim", - "rev": "7b4311333b542178828e90f6997d8f03e8327b89", + "rev": "5908b5a7377348047aa77e2a432323f7b8f65073", "type": "github" }, "original": { @@ -522,11 +522,11 @@ ] }, "locked": { - "lastModified": 1743201766, - "narHash": "sha256-bb/dqoIjtIWtJRzASOe8g4m8W2jUIWtuoGPXdNjM/Tk=", + "lastModified": 1743683223, + "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", "owner": "NuschtOS", "repo": "search", - "rev": "2651dbfad93d6ef66c440cbbf23238938b187bde", + "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", "type": "github" }, "original": { From 6ae1273a17a3cac0a5816de095464ad035494037 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 6 Apr 2025 13:40:27 +0300 Subject: [PATCH 0760/1768] enable dyndns on ymir --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 0a21fd0..34756e0 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -26,6 +26,7 @@ # enableCaddy = true; enableOllama = true; enableMinegrubTheme = true; + enableCloudflareDyndns = true; }; # Bootloader. From 3aaf3d11e8a27eb9accb81521cf8d36b40861631 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 6 Apr 2025 13:49:04 +0300 Subject: [PATCH 0761/1768] open up 8000 port --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 34756e0..7380ea1 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -35,7 +35,7 @@ networking.hostName = "ymir"; # Define your hostname. - networking.firewall.allowedTCPPorts = [8889]; + networking.firewall.allowedTCPPorts = [8889 8000]; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ../../home/home.nix { From 4661fa86b4280bc7fe6e5f9aa25dc2f0d50d6790 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 6 Apr 2025 14:08:09 +0300 Subject: [PATCH 0762/1768] enable caddy for my machine --- hosts/ymir/configuration.nix | 2 +- modules/services/caddy.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 7380ea1..d1e9554 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -23,7 +23,7 @@ enableWakeOnLan = true; enableSound = true; enableADB = true; - # enableCaddy = true; + enableCaddy = true; enableOllama = true; enableMinegrubTheme = true; enableCloudflareDyndns = true; diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 728cdc6..bdfc138 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -42,6 +42,11 @@ reverse_proxy ymir.curl-boga.ts.net:3000 ''; }; + "aifred.osbm.dev" = { + extraConfig = '' + reverse_proxy localhost:8000 + ''; + }; }; }; From f2818f3115cebd80005025e9e46289dab0befaf7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 6 Apr 2025 14:16:08 +0300 Subject: [PATCH 0763/1768] disable proxy --- modules/services/cloudflare-dyndns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index e7c81a7..b298692 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -38,7 +38,7 @@ in { package = cloudflare-dyndns-5-3; enable = true; apiTokenFile = "/persist/cloudflare-dyndns"; - proxied = true; + proxied = false; # TODO please revert domains = [ "git.osbm.dev" "aifred.osbm.dev" From b5cbb971ba167b7501c433bc7c0dfab501a2cd2e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 7 Apr 2025 04:16:43 +0300 Subject: [PATCH 0764/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 13fd251..170bdcb 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1743948087, + "narHash": "sha256-B6cIi2ScgVSROPPlTti6len+TdR0K25B9R3oKvbw3M8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "ef3b2a6b602c3f1a80c6897d6de3ee62339a3eb7", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743928368, - "narHash": "sha256-FszotfwK8DbVIVRZtwLVA8nCXpyz5PGVHiLtW42cxFY=", + "lastModified": 1743964204, + "narHash": "sha256-DFktXTeZWVM4kEET+GQHhI0XlrUG0HUAi+hZ7C/MEp0=", "owner": "nix-community", "repo": "nixvim", - "rev": "5908b5a7377348047aa77e2a432323f7b8f65073", + "rev": "99a2f96cf0f54034201b40d878aa9bb21b72cdf2", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1743629502, - "narHash": "sha256-Lk8s0cp1E4/zKhWUvDzPTAiotw2HOaYzsRxxoBqjk6A=", + "lastModified": 1743988571, + "narHash": "sha256-yn1XEsgGIcNQU83Ocves/R3FBcgu4F1e4RYIUe5fYx4=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "864da9f45001e8319328fc44902ff920f1cf9dfc", + "rev": "6368ad14ec6b4fd167204d046590eef2afdff455", "type": "github" }, "original": { From ff196ad39e2b13d686271e9ea5c16bea7ba89126 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 8 Apr 2025 16:04:05 +0300 Subject: [PATCH 0765/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 170bdcb..dcaf3db 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1743948087, - "narHash": "sha256-B6cIi2ScgVSROPPlTti6len+TdR0K25B9R3oKvbw3M8=", + "lastModified": 1744038920, + "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef3b2a6b602c3f1a80c6897d6de3ee62339a3eb7", + "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1743964447, + "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743964204, - "narHash": "sha256-DFktXTeZWVM4kEET+GQHhI0XlrUG0HUAi+hZ7C/MEp0=", + "lastModified": 1744028177, + "narHash": "sha256-etbUDe2Httgl6oI14M1nTV39+478dJ0UyLJKx/DtZi8=", "owner": "nix-community", "repo": "nixvim", - "rev": "99a2f96cf0f54034201b40d878aa9bb21b72cdf2", + "rev": "cc8918663a711a10cd45650e7bb4c933c5ec4ad7", "type": "github" }, "original": { From 2e890bf611645835074b671f0a77ca76c4ba282e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 8 Apr 2025 22:08:09 +0300 Subject: [PATCH 0766/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index dcaf3db..ec100be 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744038920, - "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=", + "lastModified": 1744138333, + "narHash": "sha256-l0Vjq1EZoYTfWImVmwsvMEuIdasrBRRCoNTV0rNtYi0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a", + "rev": "760eed59594f2f258db0d66b7ca4a5138681fd97", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744028177, - "narHash": "sha256-etbUDe2Httgl6oI14M1nTV39+478dJ0UyLJKx/DtZi8=", + "lastModified": 1744119992, + "narHash": "sha256-XtwL/QfMjJtqO//mAjEfiC7noaAtH/gtQttcBE8dufs=", "owner": "nix-community", "repo": "nixvim", - "rev": "cc8918663a711a10cd45650e7bb4c933c5ec4ad7", + "rev": "7114362f36123a8401f4905c2e833fd9a0c2ddd1", "type": "github" }, "original": { From 01a4d94cc46d2f9ec14bbf25c408fe33c59d56d7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 8 Apr 2025 23:17:56 +0300 Subject: [PATCH 0767/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ec100be..32ebac8 100644 --- a/flake.lock +++ b/flake.lock @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1743988571, - "narHash": "sha256-yn1XEsgGIcNQU83Ocves/R3FBcgu4F1e4RYIUe5fYx4=", + "lastModified": 1744143465, + "narHash": "sha256-arQlp+5vFBWNKBKLTS9wpTGkOVivAqNGD2ZTjx0JOak=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "6368ad14ec6b4fd167204d046590eef2afdff455", + "rev": "0bafaff3fe5a24b2b3f36e638ef9695d5c651735", "type": "github" }, "original": { From 56389b433793b5b5a64e0b712d0ed4c1e9879d65 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 8 Apr 2025 23:22:29 +0300 Subject: [PATCH 0768/1768] decrease this to 7 days --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 3c81aec..0289b84 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -35,7 +35,7 @@ nix.gc = { automatic = true; dates = "weekly"; - options = "--delete-older-than 30d"; + options = "--delete-older-than 7d"; }; # nix.nixPath = ["nixpkgs=${pkgs.path}"]; From 8fcdeb4082547eceeca2bbc15a22d71ed12a80f4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 9 Apr 2025 01:32:47 +0300 Subject: [PATCH 0769/1768] daily gc --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 0289b84..ebd9c87 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -34,7 +34,7 @@ nix.gc = { automatic = true; - dates = "weekly"; + dates = "01:37"; options = "--delete-older-than 7d"; }; From 2bd898efacc51bab3a624761aba786c89afae1e6 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 10 Apr 2025 22:09:26 +0300 Subject: [PATCH 0770/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 32ebac8..18ed383 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744138333, - "narHash": "sha256-l0Vjq1EZoYTfWImVmwsvMEuIdasrBRRCoNTV0rNtYi0=", + "lastModified": 1744307861, + "narHash": "sha256-c4i69OsEMi3e5+HuWrwgcx9sOsn1Z1hxLlyiQOiWJi8=", "owner": "nix-community", "repo": "home-manager", - "rev": "760eed59594f2f258db0d66b7ca4a5138681fd97", + "rev": "140a7df916f6257c755b8663fb27ed79e81c8e89", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744119992, - "narHash": "sha256-XtwL/QfMjJtqO//mAjEfiC7noaAtH/gtQttcBE8dufs=", + "lastModified": 1744272522, + "narHash": "sha256-cFuxYOLp/6L0eu5wX7xmaF4VhqEm/aT08awzEHGMMQE=", "owner": "nix-community", "repo": "nixvim", - "rev": "7114362f36123a8401f4905c2e833fd9a0c2ddd1", + "rev": "33c3f98fdc9a62183ec7d535bf910e04f141284b", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1744143465, - "narHash": "sha256-arQlp+5vFBWNKBKLTS9wpTGkOVivAqNGD2ZTjx0JOak=", + "lastModified": 1744312157, + "narHash": "sha256-GYUj5IRqtt513l2tc2rJTh9dUo5Rh1LAvOpWpcFEjKs=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "0bafaff3fe5a24b2b3f36e638ef9695d5c651735", + "rev": "d9af039bc613f843b6c613381a9a71b8ad08457e", "type": "github" }, "original": { From 4e9493f5c2be413b865e9774bbe407c524ae9098 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 11 Apr 2025 20:13:54 +0300 Subject: [PATCH 0771/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 18ed383..0741e9b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744307861, - "narHash": "sha256-c4i69OsEMi3e5+HuWrwgcx9sOsn1Z1hxLlyiQOiWJi8=", + "lastModified": 1744380363, + "narHash": "sha256-cXjAUuAfQDPSLSsckZuTioQ986iqSPTzx8D7dLAcC+Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "140a7df916f6257c755b8663fb27ed79e81c8e89", + "rev": "e43c6bcb101ba3301522439c459288c4a248f624", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1744366945, + "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744098102, - "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "lastModified": 1744232761, + "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744272522, - "narHash": "sha256-cFuxYOLp/6L0eu5wX7xmaF4VhqEm/aT08awzEHGMMQE=", + "lastModified": 1744383153, + "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", "owner": "nix-community", "repo": "nixvim", - "rev": "33c3f98fdc9a62183ec7d535bf910e04f141284b", + "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", "type": "github" }, "original": { From 1d2696fa414d819ec78c416dd2598b1835e0588b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 11 Apr 2025 21:06:12 +0300 Subject: [PATCH 0772/1768] rekey for the new pochita key --- secrets/cloudflare.age | 20 ++++++++++---------- secrets/network-manager.age | Bin 594 -> 594 bytes secrets/secrets.nix | 2 +- secrets/ssh-key-private.age | Bin 941 -> 941 bytes secrets/ssh-key-public.age | Bin 623 -> 623 bytes 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index 084c3d8..c43d8ec 100644 --- a/secrets/cloudflare.age +++ b/secrets/cloudflare.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ 1tWQfAEJKh46oMjcJqncys6i2HL8yED0bklnE4yBRRg -D7FTpNYmWBSuop3XB0thbEQF1Eh0KTHcTCplcWJd0ro --> ssh-ed25519 a9zBzw ughYSYEWcvdaQ2DlUuGxguQhPVmVsmKPGqs1zXJOcxQ -0y5GL39yNEy1peNQhyqGlkpp9GR7iU6BpgELG0i/6TU --> ssh-ed25519 lB8z1g SX7KTrwg50gt1ad7SPO/3TSvoMGmKyzfMoSIBvikCnk -E17BYBHGlpvT1RZUelWXZ9iPOVMTidJEHBM2DvuqAIk --> ssh-ed25519 Ws1uag 1zhm1fm7N+sVkAGwPNqouqcVaa1FGoaxZ//hiM6E1wM -0i/+vNFCF0eLRdKJBQMwFwMdfiWY1ps7Gak1YsIBfB8 ---- 4s/L+YyMy/vqcHXEPyHtOi2a1ndzohsYdhhwh6dDNCA -et~2DgAØ :ŘtFsx#L^f/(tծ5Nk 21n4BS \ No newline at end of file +-> ssh-ed25519 YVcKMQ FDX3lqi4gIU8QwUnebNptpZk6q5as9K6g6Wwcukl6lg +g6PHmM+Vc2jL1jBKUWAUvm4qUGt1Q6UobhVBqARqx+Q +-> ssh-ed25519 a9zBzw AYWrtriYEYbl1vmQ0Q6w7Ayq3joFwYqUXx/JvOnYjyo +x/ddxTLgsN/u0yAKuNunah2/9DvfstIa8OBAhRKKqG8 +-> ssh-ed25519 /0F2+A ufYJ59uEJI5O+i9ImQRC7d3ER4xfyobCUWHBqCJIl3c +cFHxCgspwWFbHmBMH9UNoJ6HggGsVS2sHnEsdsAp8Jo +-> ssh-ed25519 Ws1uag qiau+LxFT+QDWCwKsgj7euj2i5+bWxVcJbuQMZiQfXY +VfCymx3lHUS89YoRwyUzksNFTNLlbvMyBeTOgNV5qRE +--- ENo/uYdRFpuHn9ZlC2sNN7+hu9v5eJERz8hixxorAog +~>fjV~ Qhx4٠7FYױ:.&޹b* ,FI=(UI')nȠgэ~Yх \ No newline at end of file diff --git a/secrets/network-manager.age b/secrets/network-manager.age index 7ab96e26f99d809a2ed3aa18b08c01226efbeb1b..db4fda682b4e7d33bf0a09775279f21138fa5ca7 100644 GIT binary patch delta 542 zcmcb_a*1VvPJLcTae;Gskh!C$r*BGXa&mrZsj)|8T2e_sMOn6IN~*I-qEl#@qnTT- zBUgHwYrelxkfU!{qIp@Bd%l5Bk&lOKmA*wmfq71LQCL8BNwQ&iKv0f{1(&X!LUD11 zZfc5=si~o*LZW4rQ&qV_c)4SiVQyeqX_jSKXqJb+TYY4hlR;2gdWe5vR&kcEZ%Vk4 zQ*n}GK}Co!msf6Xu6B7@iHk>Rv7fI+Zh=>Fj(KoocBG+GVrXV&db+cAV1z+_WQt29 zx^?;nZbsUU3Qn2E{uxFUiK$*DiGGRRrDfUf1_h~6jwU%JCKeW%kzVPh8O~WI+UeP$ z$z16!=|vW##p`{N zOA`GvBb~D=Qhg({T}(_(t4hKnoLsa$y{gELBf z%#sr=QbGy>)4ih#U4yipoJu{+-D3lMvNBRCe9O614#)*xyRzh*o#eHK-xm{v?Veqm zRG!q_9lWWt9CA5oGG<2U&8p_N%K1P4%=(9CZ_LSrvB~Yzud9RXlYi2tFu#ymw%yWa;Sl6nQ>-Pm{XXs zCzn%1Uan6{a)qOFWtv|_ibc3{a*}0aW^kcVs8dO0LAg&}NPw4bewt@yK9{bYLUD11 zZfc5=si~o*LZW4rQ&qWwf1rDmf3QVCRY0bvOTK?nR()b*VODBHK~AE1NNHh_Q%XQZ zm3B^6YD$$SS4Ln#ptFCVX=ZRixtD2vx}k?#jz?l;v1?g)P*$0!3LHARn8$9K7JOC$!W&LPU!(biD4oB0p{8129x6%#q0G; zO^jS~N{UL$N-|2FA_FW9jPjlGA`8>q{QMKmgI%-pq5}PWQj#q~lDP_fa>7cIB9hXa za~u}w7`y8=*SHI73b4lG+jzwdPp?P`FUH3!=e1ZaD~t!{iW=; TgV}1;uM|DLw|jO{tMPdNq;kBr diff --git a/secrets/secrets.nix b/secrets/secrets.nix index e82e78d..17e8614 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,7 +1,7 @@ let ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFgjjvukAG0RvQfHj5Iy64XOFh9YbdnNAmgFUvzlnAEt"; tartarus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxbIyQnQFA1RFQKH4eHHWcT7Z0tCumerCsRMjlHgSPd"; - pochita = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICZIeS3r55uBJS1sXyVNlGsVY1wxqgy0lsoFBQo4ZD/F"; + pochita = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHpE9pf7ZeNvpW1GxLLF8kB0Q8HQO7XSIea1Oe9qubKt"; osbm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"; diff --git a/secrets/ssh-key-private.age b/secrets/ssh-key-private.age index a5c86ebbbf8e3317b510e0688ba73bafff13ad30..31d5d9d3496f392f0a8b4a08cbddb281fc27ecc5 100644 GIT binary patch delta 892 zcmZ3>zLtH0PQ67|WTB5?aISW)d5C*KfU#p`Xq1m}RZezTdWfrgXj)LQZ;o%UW3E@F zD_3!4N?K5qaY(tlWtp*~Ye=Pja)?t%RJdbBX=YMXPLPFbfq7wJP==35GMBEMLUD11 zZfc5=si~o*LZW4rQ&qV_a;jsRuZOX(m%BxQmqAH>QN2^1g{8N#cUV-Czh#b-Nnw_w zWu;qKabA`qS4B~UyLN!FuYP_~Ubw!8leSr&u}e`(YHp-Q4-DIsZQVQx-A`IF-r#p|7Y z!?Qh;9fO@yvVu*Dj9sgWgI$b*LZh^+l8m*pOv?>jyaIw;49lHDT)8p=Grf|XT{BG0 zazb+5BXazbs|s_>eGA;Ol1z&#iwjJOBZ5*blFBl@Jh^mrbrt+A^vhgRqfAl?GlTS9 zQ$x*M4U;o6v?DW&Jsq=*Jp+s^{Of%k{r!rK%d)w64mkaeG2eP^vhe&krprH5bC0pN zmd$iEPYB*!>^q$`r(ZUq%S2Tyu=GdrA(<~ujJKGR%YBWE`i$efe3qT^d;j=R!B5`b z^EdN1{mQZQFy(h!{P5&G3tj1Z9A|{tvSO1QY+NVAB!523;J3A8za+!9Nx!#pq)x8q zdAslboQ2=D3O&Ef6IUutYtV0fdA@^>t0Cytw|@4Z@9q-$-tr;o#%~sQGbS2u`w(!V z#A^E|E44dvHyU&fa(^yka7p~emc7OB#unG5E~3x&F-|kN5-*&)Ttv_@ye)_+dGC7T zHB8G^->ej!;NB_GbA0{vt*2df&&acpt>;+ytv=DFujYO4pCj)jg{0Oz+`lhfTWry? ztjqduk1n08W+{F7oUY~E5B;xCtu5#|uXRE9z}~g|5|IJM`@SVbZ?~EltCMx&i?7Si zS<`Lw8uC*evz*mqC6)|_TgImX|8dh5_XhtJF6<<(dDX!?cN YwzLtH0PQ7+%x^t*;W{6pZOJ4?ct~iPt4T_tWw@bXK~98Ec4bIKNTNYTpng$FMYcs+AeXM4LUD11 zZfc5=si~o*LZW4rQ&qV_ioREtdsvludQL=nV1~A*QN4waQF>u`Vt%l9k)dUVx0!xs zK%#ecp+UL{m!-dUczUjXnX7SBZn|ecq`6CocCfyux0i{RwtGcVk(p6mU}<<+c8YN% zx^+2D7FCAn3dUisr5?HYsfBs|Ug##p_Fw z(^B-E!cvP(Q}U`RjRP$!vRukb{Zh*;(*yLqLdqR00t~aX12Y3c47gI9{VM#mlT8iX zvq~}z(h5sWD+9BO6LXx>iyf1V3>44piR zvOL0EJdCsb(gMON%u@n$EJ6%3GU|gOeO!{G%!;{g=T9hVbe_BR&h+omi>~slT)zFW z>EZjWYyH0md~$0o+3-N_l4~OWDql7+hf^!=&(&f1bTEH)m)Apsi#{3A4}PeZ?p<1V zHNC`&@3cic^T{d9Rcqr9O`Cc8_#>0ub<<}&n8L>IpA)-7m z+4_#SezsDVWSQzZx2WW~RxQyn_Znjbra$smO=k3KTb|v|crT*KaG%cmNvymV9*3E= z?D_fj?6wQd2VJ$$_`)`CF&HerIZu>>| z64tf@hIXM#yseEh`HHPBzKZ^}?E1?9wW-WYmo7f^ZgZ*MbcsbZPFguR;TUA(QdU!=}UTUgqc!0m3uVrqaQ;>mWu4|}0Xx#O4jr_d}Gop;$ z($gJ%^etVzowb9E0-_8eijpF#3^N?HEi)@J(vx!iOt^G)brt+d47`HFje?!reX`uE zT*6FJN?am>vm$(avx=(xT*I>UqpDIWEWC{KiY>V0U+!NWcFt;<$5VmG#7Z;v@7r%r zxZLBS{c>KqRnW1n)51z=VQdn=OaD&no2R+!hiAsSsd}D8J8YtJ@2}2UqoA-sX7T)A yXO2G%yO%qM#ks`z; zEK9Q^^z%%@{QTU)LM+lkLc+3xl3j~a158abo%M~4sZx3@j283$g-B z!?NAYs|-p5EG^5tO1&ea+=_!k0$mGDbJEK_ay@(^xpZ}P6`b;29DOSDO~Z;xDheZt z-7FK+gFU=m{d^)#D|}PT6ZH#Bsv?XHGn~_$BDqdWe!F@wi*v)qVExKY`3CRj zxZA+a-sZ*}cFo9e@k!RSg0}ALw-pgbFI|{b6<&YJMJ7}3@?6_bUy@C}^5|(kY`NgQ x{KArTY^Q`%n$9oU_MxfooaY(t@EKE_1i1|P)#i1JW{T- Date: Fri, 11 Apr 2025 21:21:38 +0300 Subject: [PATCH 0773/1768] disable ddns in pochita --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 4ac29ef..97499ea 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -22,7 +22,7 @@ enableTailscale = true; enableForgejo = true; enableCaddy = true; - enableCloudflareDyndns = true; + enableCloudflareDyndns = false; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From 3fd154d993c4003477fd5a0f3f9f51e7bede88fe Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 11 Apr 2025 21:30:21 +0300 Subject: [PATCH 0774/1768] lets try this permissions --- modules/secrets.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/secrets.nix b/modules/secrets.nix index f22761c..b71b622 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -29,13 +29,15 @@ file = ../secrets/ssh-key-private.age; path = "/home/osbm/.ssh/id_ed25519"; owner = "osbm"; - mode = "0600"; + group = "users"; + mode = "600"; }; ssh-key-public = { file = ../secrets/ssh-key-public.age; path = "/home/osbm/.ssh/id_ed25519.pub"; owner = "osbm"; - mode = "0644"; + group = "users"; + mode = "644"; }; }; }) From a9ed8406da2959c1a4bd4a99b7685a7881318d37 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Apr 2025 18:41:09 +0300 Subject: [PATCH 0775/1768] add sensors --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 3044276..bf2ecd2 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -23,6 +23,7 @@ '') btop pciutils + lm_sensors cloc neofetch inxi From c88d3c2d669c65299d6223a0bff5e71e69557e7c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Apr 2025 22:00:04 +0300 Subject: [PATCH 0776/1768] make this option default --- hosts/harmonica/configuration.nix | 1 - hosts/pochita/configuration.nix | 1 - hosts/tartarus/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - modules/services/tailscale.nix | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 0e13ced..787311f 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -15,7 +15,6 @@ enableFonts = false; blockYoutube = false; blockTwitter = false; - enableTailscale = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 97499ea..b438db6 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -19,7 +19,6 @@ enableFonts = false; blockYoutube = false; blockTwitter = false; - enableTailscale = true; enableForgejo = true; enableCaddy = true; enableCloudflareDyndns = false; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index f96a909..4565eec 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -16,7 +16,6 @@ blockTwitter = true; blockBluesky = false; enableKDE = true; - enableTailscale = true; enableAarch64Emulation = true; enableSound = true; }; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index d1e9554..1c36b21 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -16,7 +16,6 @@ blockTwitter = true; blockBluesky = false; enableKDE = true; - enableTailscale = true; enableJellyfin = true; enableAarch64Emulation = true; disableHibernation = true; diff --git a/modules/services/tailscale.nix b/modules/services/tailscale.nix index 0037beb..ace140f 100644 --- a/modules/services/tailscale.nix +++ b/modules/services/tailscale.nix @@ -7,7 +7,7 @@ options = { myModules.enableTailscale = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = "Enable Tailscale VPN"; }; }; From 9fe7530c16d7bdab4fdcf19a32934f67f9333fe7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 04:04:00 +0300 Subject: [PATCH 0777/1768] move the services to pochita --- hosts/pochita/configuration.nix | 2 +- hosts/ymir/configuration.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index b438db6..fa82b01 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -21,7 +21,7 @@ blockTwitter = false; enableForgejo = true; enableCaddy = true; - enableCloudflareDyndns = false; + enableCloudflareDyndns = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 1c36b21..8e50147 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -22,10 +22,8 @@ enableWakeOnLan = true; enableSound = true; enableADB = true; - enableCaddy = true; enableOllama = true; enableMinegrubTheme = true; - enableCloudflareDyndns = true; }; # Bootloader. From f02baedfb3713d0d6a1c4f8d390c8803b04a9205 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 05:55:22 +0300 Subject: [PATCH 0778/1768] disable dyndns for now --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index fa82b01..d9b9160 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -21,7 +21,7 @@ blockTwitter = false; enableForgejo = true; enableCaddy = true; - enableCloudflareDyndns = true; + # enableCloudflareDyndns = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From a47f80f8754d4370d2d276ff8bc27497393f9d82 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 06:11:08 +0300 Subject: [PATCH 0779/1768] use cloudflare token --- modules/services/caddy.nix | 16 ++++++---------- modules/services/forgejo.nix | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index bdfc138..b5ffa1f 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -24,19 +24,14 @@ }; email = "contact@osbm.dev"; extraConfig = '' - # (cloudflare) { - # tls { - # dns cloudflare {env.CF_API_TOKEN} - # } - # } + (cloudflare) { + tls { + dns cloudflare {env.CF_API_TOKEN} + } + } # acme_dns cloudflare {env.CF_API_TOKEN} ''; virtualHosts = { - "jellyfin.ts.osbm.dev" = { - extraConfig = '' - reverse_proxy ymir.curl-boga.ts.net:8096 - ''; - }; "chat.ts.osbm.dev" = { extraConfig = '' reverse_proxy ymir.curl-boga.ts.net:3000 @@ -45,6 +40,7 @@ "aifred.osbm.dev" = { extraConfig = '' reverse_proxy localhost:8000 + import cloudflare ''; }; }; diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index da85309..be5e0ff 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -31,7 +31,7 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} - # acme_dns cloudflare {env.CF_API_TOKEN} + import cloudflare ''; }; }) From 517f9186d94ef08003c7792be15b686a0ffc0583 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 06:25:14 +0300 Subject: [PATCH 0780/1768] just try this also --- modules/services/caddy.nix | 12 ++++++------ modules/services/forgejo.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index b5ffa1f..fac5773 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -24,11 +24,11 @@ }; email = "contact@osbm.dev"; extraConfig = '' - (cloudflare) { - tls { - dns cloudflare {env.CF_API_TOKEN} - } - } + # (cloudflare) { + # tls { + # dns cloudflare {env.CF_API_TOKEN} + # } + # } # acme_dns cloudflare {env.CF_API_TOKEN} ''; virtualHosts = { @@ -40,7 +40,7 @@ "aifred.osbm.dev" = { extraConfig = '' reverse_proxy localhost:8000 - import cloudflare + # import cloudflare ''; }; }; diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index be5e0ff..e566223 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -31,7 +31,7 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} - import cloudflare + # import cloudflare ''; }; }) From e9bf3e10ee0325f17567fe31d934145661f03485 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 06:34:00 +0300 Subject: [PATCH 0781/1768] update the url --- modules/services/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index fac5773..8088b21 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -32,7 +32,7 @@ # acme_dns cloudflare {env.CF_API_TOKEN} ''; virtualHosts = { - "chat.ts.osbm.dev" = { + "chat.osbm.dev" = { extraConfig = '' reverse_proxy ymir.curl-boga.ts.net:3000 ''; From c45d3bc321b24b3d549326fb69d780dadfe338e0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 07:19:16 +0300 Subject: [PATCH 0782/1768] try this --- modules/services/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 8088b21..0ec1ab0 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -29,7 +29,7 @@ # dns cloudflare {env.CF_API_TOKEN} # } # } - # acme_dns cloudflare {env.CF_API_TOKEN} + acme_dns cloudflare {env.CF_API_TOKEN} ''; virtualHosts = { "chat.osbm.dev" = { From a04bab34beb952ab94924f926d5720432bb576f9 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 07:23:03 +0300 Subject: [PATCH 0783/1768] why this happens --- modules/services/caddy.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 0ec1ab0..4ecfcb1 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -24,11 +24,6 @@ }; email = "contact@osbm.dev"; extraConfig = '' - # (cloudflare) { - # tls { - # dns cloudflare {env.CF_API_TOKEN} - # } - # } acme_dns cloudflare {env.CF_API_TOKEN} ''; virtualHosts = { From d1332d562f343825e1f95fcd0c94dd814477b3d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 07:27:10 +0300 Subject: [PATCH 0784/1768] if this was the problem i will kill myself --- modules/services/caddy.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 4ecfcb1..787587b 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -23,8 +23,13 @@ hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; }; email = "contact@osbm.dev"; - extraConfig = '' - acme_dns cloudflare {env.CF_API_TOKEN} + globalConfig = '' + (cloudflare) { + tls { + dns cloudflare {env.CF_API_TOKEN} + } + } + # acme_dns cloudflare {env.CF_API_TOKEN} ''; virtualHosts = { "chat.osbm.dev" = { From 6d1d1389d8b227d6fa3731565bd2a576ed448a0a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 07:32:20 +0300 Subject: [PATCH 0785/1768] i wanna cry i hate dns --- modules/services/caddy.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 787587b..5a2f327 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -23,13 +23,10 @@ hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; }; email = "contact@osbm.dev"; - globalConfig = '' - (cloudflare) { - tls { - dns cloudflare {env.CF_API_TOKEN} - } + extraConfig = '' + tls { + dns cloudflare {env.CF_API_TOKEN} } - # acme_dns cloudflare {env.CF_API_TOKEN} ''; virtualHosts = { "chat.osbm.dev" = { From c782101e96a0e0c85b122428235fbb6aeb449796 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 07:36:22 +0300 Subject: [PATCH 0786/1768] i wanna sleep --- modules/services/caddy.nix | 8 +++++--- modules/services/forgejo.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 5a2f327..53580ba 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -24,8 +24,10 @@ }; email = "contact@osbm.dev"; extraConfig = '' - tls { - dns cloudflare {env.CF_API_TOKEN} + (cloudflare) { + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } } ''; virtualHosts = { @@ -37,7 +39,7 @@ "aifred.osbm.dev" = { extraConfig = '' reverse_proxy localhost:8000 - # import cloudflare + import cloudflare ''; }; }; diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index e566223..be5e0ff 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -31,7 +31,7 @@ services.caddy.virtualHosts."git.osbm.dev" = { extraConfig = '' reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} - # import cloudflare + import cloudflare ''; }; }) From e59dbbc74f76859ec5fd4bf5a51fe5c22dab9584 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 15:37:12 +0300 Subject: [PATCH 0787/1768] i just wanna die --- modules/services/caddy.nix | 24 ++++++++++++++++-------- modules/services/forgejo.nix | 8 -------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 53580ba..474733d 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -23,13 +23,13 @@ hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; }; email = "contact@osbm.dev"; - extraConfig = '' - (cloudflare) { - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - } - ''; + # extraConfig = '' + # (cloudflare) { + # tls { + # dns cloudflare {env.CLOUDFLARE_API_TOKEN} + # } + # } + # ''; virtualHosts = { "chat.osbm.dev" = { extraConfig = '' @@ -39,7 +39,15 @@ "aifred.osbm.dev" = { extraConfig = '' reverse_proxy localhost:8000 - import cloudflare + ''; + }; + "git.osbm.dev" = { + serverAliases = [ + "git.osbm.dev" + "www.git.osbm.dev" + ]; + extraConfig = '' + reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} ''; }; }; diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index be5e0ff..1b36d9e 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -26,14 +26,6 @@ }; }; }) - # if enableForgejo and enableCaddy are enabled, add forgejo to caddy - (lib.mkIf (config.myModules.enableForgejo && config.myModules.enableCaddy) { - services.caddy.virtualHosts."git.osbm.dev" = { - extraConfig = '' - reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} - import cloudflare - ''; - }; }) ]; } From f19a6ac7957652f8fee01dfb09776a8b1af14814 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 15:37:46 +0300 Subject: [PATCH 0788/1768] typo --- modules/services/forgejo.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 1b36d9e..6eae830 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -26,6 +26,5 @@ }; }; }) - }) ]; } From ea8c4447bbaf980bbd303286c04126434f5d6558 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 15:46:33 +0300 Subject: [PATCH 0789/1768] i feel like i have tried this before --- modules/services/caddy.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 474733d..173511c 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -23,22 +23,24 @@ hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; }; email = "contact@osbm.dev"; - # extraConfig = '' - # (cloudflare) { - # tls { - # dns cloudflare {env.CLOUDFLARE_API_TOKEN} - # } - # } - # ''; + extraConfig = '' + (cloudflare) { + tls { + dns cloudflare {env.CLOUDFLARE_API_TOKEN} + } + } + ''; virtualHosts = { "chat.osbm.dev" = { extraConfig = '' reverse_proxy ymir.curl-boga.ts.net:3000 + import cloudflare ''; }; "aifred.osbm.dev" = { extraConfig = '' - reverse_proxy localhost:8000 + reverse_proxy ymir.curl-boga.ts.net:8000 + import cloudflare ''; }; "git.osbm.dev" = { @@ -46,8 +48,9 @@ "git.osbm.dev" "www.git.osbm.dev" ]; - extraConfig = '' + extraConfig = ''k reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} + import cloudflare ''; }; }; From d09cdbb40cab6427b22e9578b8e14b38480282e1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 15:53:08 +0300 Subject: [PATCH 0790/1768] typo --- modules/services/caddy.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 173511c..b56a710 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -45,10 +45,9 @@ }; "git.osbm.dev" = { serverAliases = [ - "git.osbm.dev" "www.git.osbm.dev" ]; - extraConfig = ''k + extraConfig = '' reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} import cloudflare ''; From 4f21ff94567d6bb02649c503f2ccffe4c3a71596 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 16:05:46 +0300 Subject: [PATCH 0791/1768] cant believe this --- modules/services/caddy.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index b56a710..685178b 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -26,10 +26,13 @@ extraConfig = '' (cloudflare) { tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} + dns cloudflare {env.CF_API_TOKEN} } } ''; + # globalConfig = '' + # acme_dns cloudflare {env.CF_API_TOKEN} + # ''; virtualHosts = { "chat.osbm.dev" = { extraConfig = '' From 9b30ae22167b417491c4704d0746062320114bf5 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 16:24:42 +0300 Subject: [PATCH 0792/1768] add dig --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index bf2ecd2..23466a7 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -28,6 +28,7 @@ neofetch inxi jq + dig onefetch just nixd From 1de45dbbd9500bd46342177228d718d6693a92ee Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 16:53:58 +0300 Subject: [PATCH 0793/1768] add cloudflared --- hosts/pochita/configuration.nix | 3 ++- modules/services/cloudflared.nix | 30 ++++++++++++++++++++++++++++++ modules/services/default.nix | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 modules/services/cloudflared.nix diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index d9b9160..c2fb78f 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -20,8 +20,9 @@ blockYoutube = false; blockTwitter = false; enableForgejo = true; - enableCaddy = true; + # enableCaddy = true; # enableCloudflareDyndns = true; + enableCloudflared = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix new file mode 100644 index 0000000..fa82b9c --- /dev/null +++ b/modules/services/cloudflared.nix @@ -0,0 +1,30 @@ +{ + config, + lib, + ... +}: { + options = { + myModules.enableCloudflared = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Cloudflare tunnels"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableCloudflared { + services.cloudflared = { + enable = true; + credentialsFile = "/home/osbm/.cloudflared/cert.pem"; + tunnels."ffe51e83-5516-44e5-9c8b-2b140cdfece9" = { + default = "http_status:404"; + ingress = { + "git.osbm.dev" = { + service = "http://localhost:3000"; + }; + }; + }; + }; + }) + ]; +} diff --git a/modules/services/default.nix b/modules/services/default.nix index d8c5b96..90f60f1 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -2,6 +2,7 @@ imports = [ ./caddy.nix ./cloudflare-dyndns.nix + ./cloudflared.nix ./ollama.nix ./forgejo.nix ./jellyfin.nix From 0c67c49a6ab9c40f26df9064ec4a233dd61d12b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 16:57:33 +0300 Subject: [PATCH 0794/1768] try --- modules/services/cloudflared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index fa82b9c..43e48d4 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -15,7 +15,7 @@ (lib.mkIf config.myModules.enableCloudflared { services.cloudflared = { enable = true; - credentialsFile = "/home/osbm/.cloudflared/cert.pem"; + certificateFile = "/home/osbm/.cloudflared/cert.pem"; tunnels."ffe51e83-5516-44e5-9c8b-2b140cdfece9" = { default = "http_status:404"; ingress = { From 3a2b3126bfb6b8bf43131e9fdd259c1110f9851e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 17:31:04 +0300 Subject: [PATCH 0795/1768] try this --- modules/services/cloudflared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 43e48d4..60c2e65 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -16,7 +16,7 @@ services.cloudflared = { enable = true; certificateFile = "/home/osbm/.cloudflared/cert.pem"; - tunnels."ffe51e83-5516-44e5-9c8b-2b140cdfece9" = { + tunnels."forgejo-service" = { default = "http_status:404"; ingress = { "git.osbm.dev" = { From 32ad68199560674e115dc04d043610bee39c0721 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 17:39:57 +0300 Subject: [PATCH 0796/1768] add creds --- modules/services/cloudflared.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 60c2e65..203bb73 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -18,6 +18,7 @@ certificateFile = "/home/osbm/.cloudflared/cert.pem"; tunnels."forgejo-service" = { default = "http_status:404"; + credentialsFile = "/persist/cloudflare-forgejo.json"; ingress = { "git.osbm.dev" = { service = "http://localhost:3000"; From 43012935d039c51b7dc2c894979fe857d4f3231a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 17:48:02 +0300 Subject: [PATCH 0797/1768] add option --- modules/services/cloudflared.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 203bb73..cb2921c 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -26,6 +26,10 @@ }; }; }; + boot.kernel.sysctl = { + "net.core.rmem_max" = 7500000; + "net.core.wmem_max" = 7500000; + }; }) ]; } From 26fc6ce4b4c6544bf207dafd2d12c30128cd4c84 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 17:55:30 +0300 Subject: [PATCH 0798/1768] move file --- modules/services/cloudflared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index cb2921c..30284fe 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -15,7 +15,7 @@ (lib.mkIf config.myModules.enableCloudflared { services.cloudflared = { enable = true; - certificateFile = "/home/osbm/.cloudflared/cert.pem"; + certificateFile = "/persist/cert.pem"; tunnels."forgejo-service" = { default = "http_status:404"; credentialsFile = "/persist/cloudflare-forgejo.json"; From da14c704ead37616ca8c7ae7498cb409da4cbb50 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 18:09:00 +0300 Subject: [PATCH 0799/1768] i wanna die --- modules/services/cloudflared.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 30284fe..6c28333 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -15,10 +15,10 @@ (lib.mkIf config.myModules.enableCloudflared { services.cloudflared = { enable = true; - certificateFile = "/persist/cert.pem"; - tunnels."forgejo-service" = { + certificateFile = "/home/osbm/.cloudflared/cert.pem"; + tunnels."eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { default = "http_status:404"; - credentialsFile = "/persist/cloudflare-forgejo.json"; + credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; ingress = { "git.osbm.dev" = { service = "http://localhost:3000"; From b6c03cb2ff1d73d0101ca5ce54ac69f9d7aa0257 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 18:29:38 +0300 Subject: [PATCH 0800/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0741e9b..884ac6a 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744380363, - "narHash": "sha256-cXjAUuAfQDPSLSsckZuTioQ986iqSPTzx8D7dLAcC+Q=", + "lastModified": 1744498625, + "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", "owner": "nix-community", "repo": "home-manager", - "rev": "e43c6bcb101ba3301522439c459288c4a248f624", + "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744383153, - "narHash": "sha256-We4ePUixXnMOIqA9IRMWXGEW6efZRTGwTVCv5/yCvcU=", + "lastModified": 1744429493, + "narHash": "sha256-T3nhF5uBFaLSoR4EM7/Yf5TuD2kghyqRlNCmcN4tQx0=", "owner": "nix-community", "repo": "nixvim", - "rev": "e537d4a6b4c1c81f8b71dfd916fdf970d0d5c987", + "rev": "1095b7f89192c1e2bc9b52d0d9660c02752afe5a", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1744312157, - "narHash": "sha256-GYUj5IRqtt513l2tc2rJTh9dUo5Rh1LAvOpWpcFEjKs=", + "lastModified": 1744400212, + "narHash": "sha256-jGiYQIz9vTd1gF+DkhWAP7H4UKzW9q/xPEXA1Dgsi18=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "d9af039bc613f843b6c613381a9a71b8ad08457e", + "rev": "00ba86a8620c479d0300c2af922a123226e0c234", "type": "github" }, "original": { From 305f43272293128175874db31787d71281ae469b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 18:37:57 +0300 Subject: [PATCH 0801/1768] e --- modules/services/cloudflared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 6c28333..6d3a725 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -21,7 +21,7 @@ credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; ingress = { "git.osbm.dev" = { - service = "http://localhost:3000"; + service = "http://localhost:30010"; }; }; }; From 94bbf7718c59a8732c410048300cdeff3a1d86a8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 18:39:30 +0300 Subject: [PATCH 0802/1768] revert --- modules/services/cloudflared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 6d3a725..6c28333 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -21,7 +21,7 @@ credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; ingress = { "git.osbm.dev" = { - service = "http://localhost:30010"; + service = "http://localhost:3000"; }; }; }; From 7a5a41be185ed14d964f9d8abe0c1b8a6ee56567 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 13 Apr 2025 19:12:18 +0300 Subject: [PATCH 0803/1768] disable registration --- modules/services/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 6eae830..f0a1cfe 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -21,7 +21,7 @@ ROOT_URL = "https://git.osbm.dev/"; }; service = { - DISABLE_REGISTRATION = false; + DISABLE_REGISTRATION = true; }; }; }; From 0260148512076995c607cbf1bd6646fc0ae5a0f0 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 13:37:33 +0300 Subject: [PATCH 0804/1768] enable dump and lfs in forgejo --- modules/services/forgejo.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index f0a1cfe..9f42b03 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -15,6 +15,10 @@ (lib.mkIf config.myModules.enableForgejo { services.forgejo = { enable = true; + lfs.enable = true; + dump = { + enable = true; + }; settings = { server = { DOMAIN = "git.osbm.dev"; @@ -22,6 +26,7 @@ }; service = { DISABLE_REGISTRATION = true; + LANDING_PAGE = "osbm"; }; }; }; From 4b73049ff0869d40692eed2c278f4530e5f608be Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 13:38:19 +0300 Subject: [PATCH 0805/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 884ac6a..bfcbf05 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744498625, - "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", + "lastModified": 1744618730, + "narHash": "sha256-n3gN7aHwVRnnBZI64EDoKyJnWidNYJ0xezhqQtdjH2Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", + "rev": "85dd758c703ffbf9d97f34adcef3a898b54b4014", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744429493, - "narHash": "sha256-T3nhF5uBFaLSoR4EM7/Yf5TuD2kghyqRlNCmcN4tQx0=", + "lastModified": 1744588744, + "narHash": "sha256-57yF0pk7IUMiwq5XA9X/TX1fuIJYVnBfqhJWD/1+W0Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "1095b7f89192c1e2bc9b52d0d9660c02752afe5a", + "rev": "d15f5e6f422e353901a425f26925129929e8a38a", "type": "github" }, "original": { From 1f7c0fe779f1e99789e54a605e5f3b940ccbce66 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 14:24:00 +0300 Subject: [PATCH 0806/1768] maybe this will work --- modules/services/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 9f42b03..f8b58bb 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -26,7 +26,7 @@ }; service = { DISABLE_REGISTRATION = true; - LANDING_PAGE = "osbm"; + LANDING_PAGE = "/osbm"; }; }; }; From f892d59217acbd4df3a35c748d5132ae6a013af5 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 16:22:36 +0300 Subject: [PATCH 0807/1768] specify more commands --- modules/services/forgejo.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index f8b58bb..1bb6bc1 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -18,6 +18,8 @@ lfs.enable = true; dump = { enable = true; + type = "zip"; + interval = "01:01"; }; settings = { server = { From b1f2915ba847d3272650eb585818ac4600d93b25 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 16:26:48 +0300 Subject: [PATCH 0808/1768] add lazygit shortcut --- hosts/atreus/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 984c931..febbf82 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -34,6 +34,9 @@ openssh just nh + (pkgs.writeShellScriptBin "lg-rerouting" '' + ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting + '') (pkgs.writeShellScriptBin "sshd-start" '' echo "Starting sshd on port 8022" ${pkgs.openssh}/bin/sshd @@ -74,14 +77,11 @@ # Read the changelog before changing this value system.stateVersion = "24.05"; - #services.openssh.enable=true; # Set up nix for flakes nix.extraOptions = '' experimental-features = nix-command flakes ''; - # Set your time zone - #time.timeZone = "Europe/Berlin"; build.activation.sshd = '' if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then From 6d3f95e6a8d3cd0c2586c54ae8b3271b5f4918a6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 17:56:26 +0300 Subject: [PATCH 0809/1768] set app name --- modules/services/forgejo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 1bb6bc1..4910748 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -22,6 +22,10 @@ interval = "01:01"; }; settings = { + DEFAULT = { + APP_NAME = "osbm's self hosted git service"; + APP_SLOGAN = "\"After all, all devices have their dangers. The discovery of speech introduced communication and lies.\" -Isaac Asimov"; + }; server = { DOMAIN = "git.osbm.dev"; ROOT_URL = "https://git.osbm.dev/"; From 3c7832a1ac0623ad21c5ade65095b266c410d409 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 18:08:57 +0300 Subject: [PATCH 0810/1768] try this --- modules/services/forgejo.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 4910748..ef87196 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -24,12 +24,15 @@ settings = { DEFAULT = { APP_NAME = "osbm's self hosted git service"; - APP_SLOGAN = "\"After all, all devices have their dangers. The discovery of speech introduced communication and lies.\" -Isaac Asimov"; }; server = { DOMAIN = "git.osbm.dev"; ROOT_URL = "https://git.osbm.dev/"; }; + ui.meta = { + AUTHOR = "osbm"; + DESCRIPTION = "\"After all, all devices have their dangers. The discovery of speech introduced communication and lies.\" -Isaac Asimov"; + }; service = { DISABLE_REGISTRATION = true; LANDING_PAGE = "/osbm"; From 70b77c8fc928c6b3f906a2fe4fcbd63d7044c458 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 18:13:59 +0300 Subject: [PATCH 0811/1768] weird syntax --- modules/services/forgejo.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index ef87196..dd51099 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -29,9 +29,10 @@ DOMAIN = "git.osbm.dev"; ROOT_URL = "https://git.osbm.dev/"; }; - ui.meta = { + "ui.meta" = { AUTHOR = "osbm"; DESCRIPTION = "\"After all, all devices have their dangers. The discovery of speech introduced communication and lies.\" -Isaac Asimov"; + KEYWORDS = "git,self-hosted,gitea,forgejo,osbm,open-source,nix,nixos"; }; service = { DISABLE_REGISTRATION = true; From 237f1fa1b3b77d8a394397f8a55c20e32df69d3a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 18:15:47 +0300 Subject: [PATCH 0812/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bfcbf05..6778b5a 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744618730, - "narHash": "sha256-n3gN7aHwVRnnBZI64EDoKyJnWidNYJ0xezhqQtdjH2Q=", + "lastModified": 1744637364, + "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "85dd758c703ffbf9d97f34adcef3a898b54b4014", + "rev": "337541447773985f825512afd0f9821a975186be", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744366945, - "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { From 3adaf4048d28cb45dbaa30ce559f7b8be3ef5e05 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 14 Apr 2025 23:57:04 +0300 Subject: [PATCH 0813/1768] enable vaultwarden in pochita --- hosts/pochita/configuration.nix | 1 + modules/services/vaultwarden.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index c2fb78f..c7865b6 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -23,6 +23,7 @@ # enableCaddy = true; # enableCloudflareDyndns = true; enableCloudflared = true; + enableVaultvarden = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/modules/services/vaultwarden.nix b/modules/services/vaultwarden.nix index be20468..1e8bd3c 100644 --- a/modules/services/vaultwarden.nix +++ b/modules/services/vaultwarden.nix @@ -13,7 +13,9 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableVaultwarden { - services.vaultwarden.enable = true; + services.vaultwarden = { + enable = true; + }; }) ]; } From 3d8422014633398c402333e3cdb33a4a7adbad93 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 00:14:03 +0300 Subject: [PATCH 0814/1768] hotfix --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index c7865b6..1dd7e33 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -23,7 +23,7 @@ # enableCaddy = true; # enableCloudflareDyndns = true; enableCloudflared = true; - enableVaultvarden = true; + enableVaultwarden = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From e8653bf1785f43297d7355475cb15501807f0fb1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 00:31:29 +0300 Subject: [PATCH 0815/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6778b5a..7df9eda 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744637364, - "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", + "lastModified": 1744663884, + "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "337541447773985f825512afd0f9821a975186be", + "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1744400212, - "narHash": "sha256-jGiYQIz9vTd1gF+DkhWAP7H4UKzW9q/xPEXA1Dgsi18=", + "lastModified": 1744666245, + "narHash": "sha256-o8dAX+c+rhsBIo+nCcxPCcO/MUvOjSRuPQhUOrHBokw=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "00ba86a8620c479d0300c2af922a123226e0c234", + "rev": "2621cc6f3e9fb503cfc086f42f3e5ca317760cdc", "type": "github" }, "original": { From 2d5222587d4bfa2d23e267b561ba0ccd9dcf6a24 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 00:38:32 +0300 Subject: [PATCH 0816/1768] i dont want to compile my own index --- flake.nix | 2 ++ modules/nix-settings.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index 6b650cd..7fb21f8 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,8 @@ url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index ebd9c87..ca7ed97 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -3,6 +3,10 @@ lib, ... }: { + imports = [ + inputs.nix-index-database.nixosModules.nix-index + ]; + programs.nix-index-database.comma.enable = true; # Allow unfree packages nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ From dee4f360915f540b1726b347fc48a1a37fbd5b08 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 00:39:23 +0300 Subject: [PATCH 0817/1768] =?UTF-8?q?i=20forgor=20=F0=9F=92=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/flake.lock b/flake.lock index 7df9eda..715aeb2 100644 --- a/flake.lock +++ b/flake.lock @@ -314,6 +314,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744518957, + "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nix-on-droid": { "inputs": { "home-manager": "home-manager_2", @@ -592,6 +612,7 @@ "deploy-rs": "deploy-rs", "home-manager": "home-manager", "minegrub-theme": "minegrub-theme", + "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", From a2948ac477adab4e803d1bb84653844f48f4207a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 18:36:54 +0300 Subject: [PATCH 0818/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 715aeb2..8efa6d4 100644 --- a/flake.lock +++ b/flake.lock @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744588744, - "narHash": "sha256-57yF0pk7IUMiwq5XA9X/TX1fuIJYVnBfqhJWD/1+W0Q=", + "lastModified": 1744669903, + "narHash": "sha256-gtfLmGx/N+BzIck9sGLIfzETxocYjVKo4gmSeH6zfaY=", "owner": "nix-community", "repo": "nixvim", - "rev": "d15f5e6f422e353901a425f26925129929e8a38a", + "rev": "ee9655637cbf898415e09c399bc504180e246d42", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1744666245, - "narHash": "sha256-o8dAX+c+rhsBIo+nCcxPCcO/MUvOjSRuPQhUOrHBokw=", + "lastModified": 1744731399, + "narHash": "sha256-BzaH8TSVAsQSXfyCSi5EapdxuDfCA21JXPlRssYGFDk=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "2621cc6f3e9fb503cfc086f42f3e5ca317760cdc", + "rev": "8c1c951d7201d1e4fa1fa7864e34fff56e5e9d44", "type": "github" }, "original": { From f571699b931ffa4fb44e6f7d0dd78c33d0016a9d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 15 Apr 2025 22:48:51 +0300 Subject: [PATCH 0819/1768] disable yt --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 8e50147..17d92ac 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -12,7 +12,7 @@ ]; myModules = { - blockYoutube = false; + blockYoutube = true; blockTwitter = true; blockBluesky = false; enableKDE = true; From 345e6e597cd851d1d0f6df0fdfa1bff1136dc85c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 16 Apr 2025 18:22:22 +0300 Subject: [PATCH 0820/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8efa6d4..2c52aa1 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744663884, - "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", + "lastModified": 1744812667, + "narHash": "sha256-2AJZwXMO82YGw6B/RRCPz8Wz2zSRCZIdjhdFuiw7Ymg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", + "rev": "5d48f3ded3b55ef32d5853c9022fb4df29b3fc45", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744669903, - "narHash": "sha256-gtfLmGx/N+BzIck9sGLIfzETxocYjVKo4gmSeH6zfaY=", + "lastModified": 1744753228, + "narHash": "sha256-Re8g2pby4sr4hgzJmQJxeH/9PtgX85nivkWibapRI5s=", "owner": "nix-community", "repo": "nixvim", - "rev": "ee9655637cbf898415e09c399bc504180e246d42", + "rev": "d4dada282aeac94b5d53dd70e276a2f5f534f783", "type": "github" }, "original": { From 55f08c41684f34b93ec28f21b53401462c2b6d24 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 18 Apr 2025 23:38:43 +0300 Subject: [PATCH 0821/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2c52aa1..10f2104 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1744812667, - "narHash": "sha256-2AJZwXMO82YGw6B/RRCPz8Wz2zSRCZIdjhdFuiw7Ymg=", + "lastModified": 1745001336, + "narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d48f3ded3b55ef32d5853c9022fb4df29b3fc45", + "rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744753228, - "narHash": "sha256-Re8g2pby4sr4hgzJmQJxeH/9PtgX85nivkWibapRI5s=", + "lastModified": 1744874965, + "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=", "owner": "nix-community", "repo": "nixvim", - "rev": "d4dada282aeac94b5d53dd70e276a2f5f534f783", + "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719", "type": "github" }, "original": { From 95d103767a83946a9933b621f3d44f8dbcdcd388 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 19 Apr 2025 12:38:34 +0300 Subject: [PATCH 0822/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 10f2104..adcba3b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745001336, - "narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=", + "lastModified": 1745033012, + "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9", + "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", "type": "github" }, "original": { From 5fd3fba8d3c4bc13511af767561bff1e78af1719 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 19 Apr 2025 20:43:21 +0300 Subject: [PATCH 0823/1768] gitu add discord --- modules/graphical-interface.nix | 1 + modules/nix-settings.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 88d786a..b34af00 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -51,6 +51,7 @@ ani-cli prismlauncher qbittorrent + discord (pkgs.writeShellApplication { name = "sync-terraria"; runtimeInputs = [ diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index ca7ed97..051f17a 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -11,6 +11,7 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "vscode" # TODO: remove this + "discord" "obsidian" "steam" "steam-unwrapped" From 9bfcee3f87951affb990554109b11876e78f8228 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 20 Apr 2025 01:15:22 +0300 Subject: [PATCH 0824/1768] update flake.lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index adcba3b..bbb6f6c 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745033012, - "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", + "lastModified": 1745071558, + "narHash": "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", + "rev": "9676e8a52a177d80c8a42f66566362a6d74ecf78", "type": "github" }, "original": { @@ -197,16 +197,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1744874965, - "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=", + "lastModified": 1745099712, + "narHash": "sha256-fj/S+L9nQyJYdWFk3+8BGPp4tg5rY3uaF6jGADm7OA0=", "owner": "nix-community", "repo": "nixvim", - "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719", + "rev": "710f9cbd520b8e78fa95d4c5d255891e2b14a277", "type": "github" }, "original": { @@ -542,11 +542,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { From 603e84d7ed5d558545646dab32726f88eeac28f5 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 20 Apr 2025 15:30:15 +0300 Subject: [PATCH 0825/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bbb6f6c..13534bc 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745071558, - "narHash": "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=", + "lastModified": 1745128386, + "narHash": "sha256-xnNxL9lZC5Ez8AxTgHZZu8pYSNM34+5GD5jGSs8Vq4M=", "owner": "nix-community", "repo": "home-manager", - "rev": "9676e8a52a177d80c8a42f66566362a6d74ecf78", + "rev": "f98314bb064cf8f8446c44afbadaaad2505875a7", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1744518957, - "narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=", + "lastModified": 1745120797, + "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd", + "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", "type": "github" }, "original": { From e4e7fbf7a63040dd9129f711be01f9e6cc40ba3a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 20 Apr 2025 16:01:46 +0300 Subject: [PATCH 0826/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 13534bc..cc2a737 100644 --- a/flake.lock +++ b/flake.lock @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1744731399, - "narHash": "sha256-BzaH8TSVAsQSXfyCSi5EapdxuDfCA21JXPlRssYGFDk=", + "lastModified": 1745152271, + "narHash": "sha256-TeW3UW/hHWm54iofwn1e+wE44+SvABRDfbo0+I9Lrpw=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8c1c951d7201d1e4fa1fa7864e34fff56e5e9d44", + "rev": "c88d9dbecdbc1846c864cc3140310a587268dd37", "type": "github" }, "original": { From 36fea9600c8fd15c18859dd707519224aa709951 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 13:07:18 +0300 Subject: [PATCH 0827/1768] add screenkey --- modules/graphical-interface.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index b34af00..02b82b4 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -36,6 +36,7 @@ environment.systemPackages = with pkgs; [ sddm-sugar-dark + screenkey vscode alacritty ghostty From 97df4cd65c9609b796aac1e45a08595fe8e366d9 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 13:07:32 +0300 Subject: [PATCH 0828/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index cc2a737..8911763 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745128386, - "narHash": "sha256-xnNxL9lZC5Ez8AxTgHZZu8pYSNM34+5GD5jGSs8Vq4M=", + "lastModified": 1745205007, + "narHash": "sha256-k67bEcLkSo13TIBfs0CGYkJjG12aaikabMtxWbSeqr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f98314bb064cf8f8446c44afbadaaad2505875a7", + "rev": "3fbe9a2b76ff5c4dcb2a2a2027dac31cfc993c8c", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745099712, - "narHash": "sha256-fj/S+L9nQyJYdWFk3+8BGPp4tg5rY3uaF6jGADm7OA0=", + "lastModified": 1745228623, + "narHash": "sha256-gW+U99BB+s4erguNC3izqcabE9iRvr4+wNbrsBYhRIE=", "owner": "nix-community", "repo": "nixvim", - "rev": "710f9cbd520b8e78fa95d4c5d255891e2b14a277", + "rev": "199a300488f6bfb5847fe906f0e8e183e0bf02c9", "type": "github" }, "original": { From 7ed7eaa602c67a79d312664e7975dd19c9680a31 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 14:04:17 +0300 Subject: [PATCH 0829/1768] use the nix registries --- modules/nix-settings.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 051f17a..751980b 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -28,13 +28,25 @@ # enable nix flakes nix.settings.experimental-features = ["nix-command" "flakes"]; - nix.nixPath = [ - "nixpkgs=${inputs.nixpkgs}" - "nixos-config=${inputs.self}" - ]; + nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; nix.channel.enable = false; + nix.registry = { + self.flake = inputs.self; + osbm-nvim = { + to = { + owner = "osbm"; + repo = "osbm-nvim"; + type = "github"; + }; + from = { + id = "osbm-nvim"; + type = "indirect"; + }; + }; + }; + nix.settings.trusted-users = ["root" "osbm"]; nix.gc = { From b39608ca80f2f6334a5c2670a72d4d712f40e332 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 14:04:42 +0300 Subject: [PATCH 0830/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8911763..2e0a7da 100644 --- a/flake.lock +++ b/flake.lock @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745228623, - "narHash": "sha256-gW+U99BB+s4erguNC3izqcabE9iRvr4+wNbrsBYhRIE=", + "lastModified": 1745231260, + "narHash": "sha256-D/6TM2TXpwoIkjQsY3J61yhb3EcnnpoEiZaistaQ+JQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "199a300488f6bfb5847fe906f0e8e183e0bf02c9", + "rev": "d3c9dedbddc955dc22ded362aa1e2067f022b31f", "type": "github" }, "original": { From 9db6ed05b0ca4c50f06d8a218f8fa61a76bf5543 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 14:11:41 +0300 Subject: [PATCH 0831/1768] lets not use nixPath --- modules/nix-settings.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 751980b..b5afe85 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -28,23 +28,25 @@ # enable nix flakes nix.settings.experimental-features = ["nix-command" "flakes"]; - nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; + # nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; nix.channel.enable = false; nix.registry = { self.flake = inputs.self; - osbm-nvim = { - to = { - owner = "osbm"; - repo = "osbm-nvim"; - type = "github"; - }; - from = { - id = "osbm-nvim"; - type = "indirect"; - }; - }; + nixpkgs = inputs.nixpkgs; + # osbm-nvim = { + # to = { + # owner = "osbm"; + # repo = "osbm-nvim"; + # type = "github"; + # }; + # from = { + # id = "osbm-nvim"; + # type = "indirect"; + # }; + # }; + osbm-nvim = inputs.osbm-nvim; }; nix.settings.trusted-users = ["root" "osbm"]; From b5e4da55d7f04cbd230d40c46b09d81902b47a38 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 14:54:00 +0300 Subject: [PATCH 0832/1768] hotfix --- modules/nix-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index b5afe85..aae7615 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -34,7 +34,7 @@ nix.registry = { self.flake = inputs.self; - nixpkgs = inputs.nixpkgs; + nixpkgs.flake = inputs.nixpkgs; # osbm-nvim = { # to = { # owner = "osbm"; @@ -46,7 +46,7 @@ # type = "indirect"; # }; # }; - osbm-nvim = inputs.osbm-nvim; + osbm-nvim.flake = inputs.osbm-nvim; }; nix.settings.trusted-users = ["root" "osbm"]; From 2936e07d29e5ce4a7c62d0db3809a0cfb6ca6da5 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 21:55:19 +0300 Subject: [PATCH 0833/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2e0a7da..608f699 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745205007, - "narHash": "sha256-k67bEcLkSo13TIBfs0CGYkJjG12aaikabMtxWbSeqr0=", + "lastModified": 1745256380, + "narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3fbe9a2b76ff5c4dcb2a2a2027dac31cfc993c8c", + "rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745231260, - "narHash": "sha256-D/6TM2TXpwoIkjQsY3J61yhb3EcnnpoEiZaistaQ+JQ=", + "lastModified": 1745244491, + "narHash": "sha256-UlwXkytxGW/aokB9fZ6cSznYKM9ynDLHqhjcPve0KL4=", "owner": "nix-community", "repo": "nixvim", - "rev": "d3c9dedbddc955dc22ded362aa1e2067f022b31f", + "rev": "7a58109958d14bcece8ec3e2085e41ea3351e387", "type": "github" }, "original": { From 3977191203719201470606a7cf4c0e4738df549e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 22:33:42 +0300 Subject: [PATCH 0834/1768] add my nixpkgs fork --- modules/nix-settings.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index aae7615..d3db376 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -47,6 +47,11 @@ # }; # }; osbm-nvim.flake = inputs.osbm-nvim; + my-nixpkgs.to = { + owner = "osbm"; + repo = "nixpkgs"; + type = "github"; + }; }; nix.settings.trusted-users = ["root" "osbm"]; From 3fd2ab8d0a3eeae28e7374fabdec7a0ce0afd8c8 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 22:42:37 +0300 Subject: [PATCH 0835/1768] add osbm.dev registry --- modules/nix-settings.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index d3db376..d188019 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -35,23 +35,17 @@ nix.registry = { self.flake = inputs.self; nixpkgs.flake = inputs.nixpkgs; - # osbm-nvim = { - # to = { - # owner = "osbm"; - # repo = "osbm-nvim"; - # type = "github"; - # }; - # from = { - # id = "osbm-nvim"; - # type = "indirect"; - # }; - # }; osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs.to = { owner = "osbm"; repo = "nixpkgs"; type = "github"; }; + "osbm.dev".to = { + owner = "osbm"; + repo = "osbm.dev"; + type = "github"; + }; }; nix.settings.trusted-users = ["root" "osbm"]; From 66cfbe9a21a105bf07ef9863c8d01a16127bf95b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 22:43:17 +0300 Subject: [PATCH 0836/1768] formatting --- hosts/atreus/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index febbf82..2a805e8 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -82,7 +82,6 @@ experimental-features = nix-command flakes ''; - build.activation.sshd = '' if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then $VERBOSE_ECHO "Generating host keys..." From 81d48892537baa8d1d0011d4dc1bb43c08cdc287 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 21 Apr 2025 22:46:41 +0300 Subject: [PATCH 0837/1768] hotfix --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index d188019..5ebfc7c 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -41,7 +41,7 @@ repo = "nixpkgs"; type = "github"; }; - "osbm.dev".to = { + osbm-dev.to = { owner = "osbm"; repo = "osbm.dev"; type = "github"; From 8064a9af0585aaab63b9982bdcd5f68ec7154ff2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 22 Apr 2025 15:05:47 +0300 Subject: [PATCH 0838/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 608f699..2fc6790 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745256380, - "narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=", + "lastModified": 1745272532, + "narHash": "sha256-+sFbKw1vFkulKYxsAbz84N0V/goSg808IgFh8iWe/As=", "owner": "nix-community", "repo": "home-manager", - "rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac", + "rev": "81541ea36d1fead4be7797e826ee325d4c19308b", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745244491, - "narHash": "sha256-UlwXkytxGW/aokB9fZ6cSznYKM9ynDLHqhjcPve0KL4=", + "lastModified": 1745280514, + "narHash": "sha256-arfQjY0bFVAgoFTK3Ira6SHW8DxH9YpG3pW4AUT4NKY=", "owner": "nix-community", "repo": "nixvim", - "rev": "7a58109958d14bcece8ec3e2085e41ea3351e387", + "rev": "d4a0db2103d52b3b8e3ae502497ef9f19b048508", "type": "github" }, "original": { From 3154dcc1e7f35c97e4fba8b4e04726aa4d4c923b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 22 Apr 2025 20:43:38 +0300 Subject: [PATCH 0839/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2fc6790..985ad6b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745272532, - "narHash": "sha256-+sFbKw1vFkulKYxsAbz84N0V/goSg808IgFh8iWe/As=", + "lastModified": 1745340124, + "narHash": "sha256-zQTOl/JPGjiAQoU1yraCGfPBg7yr4nlHNdbZy8Ebrl4=", "owner": "nix-community", "repo": "home-manager", - "rev": "81541ea36d1fead4be7797e826ee325d4c19308b", + "rev": "c9433ae62fbb4bd09609e242569edc3b551e21a9", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745280514, - "narHash": "sha256-arfQjY0bFVAgoFTK3Ira6SHW8DxH9YpG3pW4AUT4NKY=", + "lastModified": 1745324162, + "narHash": "sha256-Sjb/LvtWpPtSXacjJCTrLAmWtXNJd0SWxO3PzTvD7Tc=", "owner": "nix-community", "repo": "nixvim", - "rev": "d4a0db2103d52b3b8e3ae502497ef9f19b048508", + "rev": "60638182b8d1b0fe13631d02eafaf8903499ee60", "type": "github" }, "original": { From ea887fb76469963796b44ce6067b3a5c034a42b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 24 Apr 2025 21:51:17 +0300 Subject: [PATCH 0840/1768] collect vscode imports --- hosts/harmonica-sd/configuration.nix | 1 - hosts/harmonica/configuration.nix | 1 - hosts/pochita/configuration.nix | 1 - hosts/tartarus/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - modules/common-packages.nix | 6 ++++++ 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/harmonica-sd/configuration.nix index b97b36f..0433e6a 100644 --- a/hosts/harmonica-sd/configuration.nix +++ b/hosts/harmonica-sd/configuration.nix @@ -9,7 +9,6 @@ ./hardware-configuration.nix ../../modules inputs.home-manager.nixosModules.home-manager - inputs.vscode-server.nixosModules.default ]; myModules = { diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 787311f..58a5c81 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -7,7 +7,6 @@ ./hardware-configuration.nix ../../modules inputs.home-manager.nixosModules.home-manager - inputs.vscode-server.nixosModules.default ]; myModules = { diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 1dd7e33..cfcb186 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -10,7 +10,6 @@ ../../modules inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.nixos-hardware.nixosModules.raspberry-pi-5 - inputs.vscode-server.nixosModules.default inputs.home-manager.nixosModules.home-manager ]; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 4565eec..eb8a08e 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.vscode-server.nixosModules.default inputs.home-manager.nixosModules.home-manager ]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 17d92ac..69a9672 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.vscode-server.nixosModules.default inputs.home-manager.nixosModules.home-manager ]; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 23466a7..f0dc42c 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -3,6 +3,12 @@ inputs, ... }: { + + imports = [ + inputs.vscode-server.nixosModules.default + ]; + + environment.systemPackages = with pkgs; [ inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default wget From 88f7cd6ec0effd3d84a4d60cf0ac209b4d009ceb Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 24 Apr 2025 21:59:07 +0300 Subject: [PATCH 0841/1768] centralize home manager --- hosts/harmonica-sd/configuration.nix | 1 - hosts/harmonica/configuration.nix | 1 - hosts/pochita/configuration.nix | 8 -------- hosts/tartarus/configuration.nix | 7 ------- hosts/ymir/configuration.nix | 7 ------- modules/default.nix | 1 + modules/home.nix | 8 ++++++++ 7 files changed, 9 insertions(+), 24 deletions(-) create mode 100644 modules/home.nix diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/harmonica-sd/configuration.nix index 0433e6a..22c3ac1 100644 --- a/hosts/harmonica-sd/configuration.nix +++ b/hosts/harmonica-sd/configuration.nix @@ -8,7 +8,6 @@ "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 58a5c81..45e5228 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -6,7 +6,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index cfcb186..eee4e7a 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -10,7 +10,6 @@ ../../modules inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.nixos-hardware.nixosModules.raspberry-pi-5 - inputs.home-manager.nixosModules.home-manager ]; myModules = { @@ -30,13 +29,6 @@ networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../home/home.nix { - inherit config pkgs; - backupFileExtension = "hmbak"; - }; - environment.systemPackages = [ pkgs.raspberrypi-eeprom ]; diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index eb8a08e..3285dbb 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { @@ -19,12 +18,6 @@ enableSound = true; }; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../home/home.nix { - inherit config pkgs; - backupFileExtension = "hmbak"; - }; virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 69a9672..073ce20 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../modules - inputs.home-manager.nixosModules.home-manager ]; myModules = { @@ -32,12 +31,6 @@ networking.hostName = "ymir"; # Define your hostname. networking.firewall.allowedTCPPorts = [8889 8000]; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.osbm = import ../../home/home.nix { - inherit config pkgs; - backupFileExtension = "hmbak"; - }; # Enable networking networking.networkmanager.enable = true; diff --git a/modules/default.nix b/modules/default.nix index 2f4429a..2122bba 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -9,6 +9,7 @@ ./emulation.nix ./fonts.nix ./graphical-interface.nix + ./home.nix ./i18n.nix ./minegrub.nix ./nix-settings.nix diff --git a/modules/home.nix b/modules/home.nix new file mode 100644 index 0000000..fe004ea --- /dev/null +++ b/modules/home.nix @@ -0,0 +1,8 @@ +{config, pkgs, ...}:{ + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.osbm = import ../home/home.nix { + inherit config pkgs; + backupFileExtension = "hmbak"; + }; +} From 098675c2a3904e080c33d26acc8fa02bb450c2a3 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 24 Apr 2025 22:03:09 +0300 Subject: [PATCH 0842/1768] formatting --- hosts/tartarus/configuration.nix | 1 - modules/common-packages.nix | 2 -- modules/home.nix | 6 +++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 3285dbb..600bce5 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -18,7 +18,6 @@ enableSound = true; }; - virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["osbm"]; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index f0dc42c..08e5090 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -3,12 +3,10 @@ inputs, ... }: { - imports = [ inputs.vscode-server.nixosModules.default ]; - environment.systemPackages = with pkgs; [ inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default wget diff --git a/modules/home.nix b/modules/home.nix index fe004ea..5e6047e 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,4 +1,8 @@ -{config, pkgs, ...}:{ +{ + config, + pkgs, + ... +}: { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ../home/home.nix { From cad918d014a1c6e3e580339e0296f26af44005c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 24 Apr 2025 22:03:15 +0300 Subject: [PATCH 0843/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 985ad6b..7603968 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745340124, - "narHash": "sha256-zQTOl/JPGjiAQoU1yraCGfPBg7yr4nlHNdbZy8Ebrl4=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "c9433ae62fbb4bd09609e242569edc3b551e21a9", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745324162, - "narHash": "sha256-Sjb/LvtWpPtSXacjJCTrLAmWtXNJd0SWxO3PzTvD7Tc=", + "lastModified": 1745496969, + "narHash": "sha256-04ZWtuPFXc/aRklrWs9FY+Gcb9Ct5lmv84Livgafd84=", "owner": "nix-community", "repo": "nixvim", - "rev": "60638182b8d1b0fe13631d02eafaf8903499ee60", + "rev": "62ecd39b40bf8a61fa428d026bb7061e1350f456", "type": "github" }, "original": { From 68fe79641b23c963535ad5a572a431abaada82b3 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 24 Apr 2025 22:06:06 +0300 Subject: [PATCH 0844/1768] dont forget to import home manager --- modules/home.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/home.nix b/modules/home.nix index 5e6047e..a498b23 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,8 +1,12 @@ { config, pkgs, + inputs, ... }: { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.osbm = import ../home/home.nix { From b62aafcfadbdea22db8835cc0fb288556d15ebcc Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 25 Apr 2025 00:03:09 +0300 Subject: [PATCH 0845/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7603968..d081233 100644 --- a/flake.lock +++ b/flake.lock @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745496969, - "narHash": "sha256-04ZWtuPFXc/aRklrWs9FY+Gcb9Ct5lmv84Livgafd84=", + "lastModified": 1745518054, + "narHash": "sha256-jaYDGY/7Uja1/HRvogrvvfIdKKl600kI/fxPdQ3PcUw=", "owner": "nix-community", "repo": "nixvim", - "rev": "62ecd39b40bf8a61fa428d026bb7061e1350f456", + "rev": "e6e536953580a956c143fc4413e8d9b4c876aeb8", "type": "github" }, "original": { From 6feb65635dedd8685de9399233d157dbe2afb8d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 25 Apr 2025 02:27:40 +0300 Subject: [PATCH 0846/1768] use nvim --- modules/common-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 08e5090..cdd2f22 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -48,6 +48,11 @@ bat ]; + environment.variables = { + EDITOR = "nvim"; + VISUAL = "nvim"; + }; + virtualisation.docker.enable = true; # Enable the OpenSSH daemon. From 5d680a90c88b555264dd897b4211238efbf42345 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 25 Apr 2025 03:47:38 +0300 Subject: [PATCH 0847/1768] add gtk config --- home/gtk.nix | 17 +++++++++++++++++ home/home.nix | 1 + 2 files changed, 18 insertions(+) create mode 100644 home/gtk.nix diff --git a/home/gtk.nix b/home/gtk.nix new file mode 100644 index 0000000..4ef6888 --- /dev/null +++ b/home/gtk.nix @@ -0,0 +1,17 @@ +{pkgs, ...}: { + gtk = { + enable = true; + theme = { + name = "Dracula"; + package = pkgs.dracula-theme; + }; + gtk3.extraConfig = { + gtk-application-prefer-dark-theme = 1; + gtk-cursor-theme-size=8; + }; + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = 1; + gtk-cursor-theme-size=8; + }; + }; +} diff --git a/home/home.nix b/home/home.nix index 375925a..a9713c2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -7,6 +7,7 @@ ./alacritty.nix ./tmux ./git.nix + ./gtk.nix ./ssh.nix ./bash.nix ./direnv.nix From 3a6811cff0b85419d08260a2c1ad4d5a9dc92ee2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 25 Apr 2025 03:59:26 +0300 Subject: [PATCH 0848/1768] add pointer cursor thingy --- home/gtk.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/gtk.nix b/home/gtk.nix index 4ef6888..4194a1d 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,4 +1,9 @@ {pkgs, ...}: { + home.pointerCursor = { + name = "Dracula"; + package = pkgs.dracula-theme; + gtk.enable = true; + }; gtk = { enable = true; theme = { From 345d7a5c0a48136b09f9df6628f9b47375a4ddba Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Apr 2025 12:11:23 +0300 Subject: [PATCH 0849/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d081233..a3b74e1 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "lastModified": 1745703610, + "narHash": "sha256-KgaGPlmjJItZ+Xf8mSoRmrsso+sf3K54n9oIP9Q17LY=", "owner": "nix-community", "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", + "rev": "2f5819a962489e037a57835f63ed6ff8dbc2d5fb", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745518054, - "narHash": "sha256-jaYDGY/7Uja1/HRvogrvvfIdKKl600kI/fxPdQ3PcUw=", + "lastModified": 1745697134, + "narHash": "sha256-WvozW6IXhuRfGlDy7S777S5fjZeGSOEIRRbo2eK6K5o=", "owner": "nix-community", "repo": "nixvim", - "rev": "e6e536953580a956c143fc4413e8d9b4c876aeb8", + "rev": "8d8a8568968f0e77b90749929c4683633d1ebdf6", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1745152271, - "narHash": "sha256-TeW3UW/hHWm54iofwn1e+wE44+SvABRDfbo0+I9Lrpw=", + "lastModified": 1745704565, + "narHash": "sha256-rLoC0yihupgTft51GYSdIK618xRv2I0l3JU1DEk3SUE=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "c88d9dbecdbc1846c864cc3140310a587268dd37", + "rev": "1fc8a27649406f669f0a0d38ec950453f49d7c0f", "type": "github" }, "original": { From 14e4b32e23f4a715c11be32409d148011f2582ed Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Apr 2025 19:17:48 +0300 Subject: [PATCH 0850/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a3b74e1..e565051 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745703610, - "narHash": "sha256-KgaGPlmjJItZ+Xf8mSoRmrsso+sf3K54n9oIP9Q17LY=", + "lastModified": 1745853192, + "narHash": "sha256-ardehuT9qtSXtY1XdOY6fEM3Kf3bQa3LZxxKdAScCnU=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f5819a962489e037a57835f63ed6ff8dbc2d5fb", + "rev": "c54a8ab0d2ea7486eadb14f1dc498817ff164f59", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1745120797, - "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", + "lastModified": 1745725746, + "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", + "rev": "187524713d0d9b2d2c6f688b81835114d4c2a7c6", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745697134, - "narHash": "sha256-WvozW6IXhuRfGlDy7S777S5fjZeGSOEIRRbo2eK6K5o=", + "lastModified": 1745856699, + "narHash": "sha256-pl2aAaWLVS8/vYbEnd4HJlm+FWXd5YU63AueLlYN/m4=", "owner": "nix-community", "repo": "nixvim", - "rev": "8d8a8568968f0e77b90749929c4683633d1ebdf6", + "rev": "70c9b3b890adc745227c51c287520dd5f8febd3d", "type": "github" }, "original": { From 17d2b1a1eb95c6e03a0394efff46c6ec3b5153d5 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Apr 2025 19:31:03 +0300 Subject: [PATCH 0851/1768] wil this fix home manager --- modules/home.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/home.nix b/modules/home.nix index a498b23..7ae00eb 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -7,10 +7,13 @@ imports = [ inputs.home-manager.nixosModules.home-manager ]; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.osbm = import ../home/home.nix { - inherit config pkgs; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + verbose = true; backupFileExtension = "hmbak"; + users.osbm = import ../home/home.nix { + inherit config pkgs; + }; }; } From fb41722020535d4d30abbef81f697ecdf66274f6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Apr 2025 19:35:13 +0300 Subject: [PATCH 0852/1768] i wonder --- home/home.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/home.nix b/home/home.nix index a9713c2..b52bb15 100644 --- a/home/home.nix +++ b/home/home.nix @@ -26,4 +26,7 @@ ]; home.stateVersion = config.system.stateVersion; + + programs.home-manager.enable = true; + } From 1cbae3f1fb0dd9044328e1690958b6b43b5f9364 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Apr 2025 02:18:37 +0300 Subject: [PATCH 0853/1768] use options in home managers --- home/firefox.nix | 173 ++++++++++++++++++++++++----------------------- home/gtk.nix | 41 +++++++---- home/home.nix | 4 +- 3 files changed, 116 insertions(+), 102 deletions(-) diff --git a/home/firefox.nix b/home/firefox.nix index bf577a8..b8a2eb7 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,90 +1,93 @@ -{ - programs.firefox = { - enable = true; - languagePacks = [ - "ja" - "tr" - "en-US" - ]; - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - EnableTrackingProtection = { - Value = true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - }; - # DisablePocket = true; - DisableFirefoxAccounts = true; - DisableAccounts = true; - DisableFirefoxScreenshots = true; - StartPage = "previous-session"; - # OverrideFirstRunPage = ""; - # OverridePostUpdatePage = ""; - # DontCheckDefaultBrowser = true; - DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" - # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" - # SearchBar = "unified"; # alternat - ExtensionSettings = with builtins; let - extension = shortId: uuid: { - name = uuid; - value = { - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; - }; +{lib, ...}: { + options.enableFirefox = lib.mkEnableOption "enableFirefox"; + config = { + programs.firefox = { + enable = true; + languagePacks = [ + "ja" + "tr" + "en-US" + ]; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; }; - in - listToAttrs [ - (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") - (extension "ublock-origin" "uBlock0@raymondhill.net") - (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") - (extension "motivation-new-tab" "") - (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") - (extension "violentmonkey" "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}") - # (extension "tabliss" "extension@tabliss.io") - # (extension "umatrix" "uMatrix@raymondhill.net") - # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") - (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") - ]; - # To add additional extensions, find it on addons.mozilla.org, find - # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) - # Then, download the XPI by filling it in to the install_url template, unzip it, - # run `jq .browser_specific_settings.gecko.id manifest.json` or - # `jq .applications.gecko.id manifest.json` to get the UUID - }; - profiles.default = { - id = 0; - name = "osbm"; + # DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + StartPage = "previous-session"; + # OverrideFirstRunPage = ""; + # OverridePostUpdatePage = ""; + # DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" + # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + # SearchBar = "unified"; # alternat + ExtensionSettings = with builtins; let + extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; + }; + }; + in + listToAttrs [ + (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") + (extension "ublock-origin" "uBlock0@raymondhill.net") + (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") + (extension "motivation-new-tab" "") + (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") + (extension "violentmonkey" "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}") + # (extension "tabliss" "extension@tabliss.io") + # (extension "umatrix" "uMatrix@raymondhill.net") + # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") + (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") + ]; + # To add additional extensions, find it on addons.mozilla.org, find + # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) + # Then, download the XPI by filling it in to the install_url template, unzip it, + # run `jq .browser_specific_settings.gecko.id manifest.json` or + # `jq .applications.gecko.id manifest.json` to get the UUID + }; + profiles.default = { + id = 0; + name = "osbm"; - userChrome = '' - #tabbrowser-tabs { - visibility: collapse; - } - ''; - settings = { - # "Open previous windows and tabs" - "browser.startup.page" = 3; - "browser.contentblocking.category" = true; - "extensions.pocket.enabled" = false; - "extensions.screenshots.disabled" = true; - "browser.topsites.contile.enabled" = false; - "browser.formfill.enable" = false; - "browser.search.suggest.enabled" = false; - "browser.search.suggest.enabled.private" = false; - "browser.urlbar.suggest.searches" = false; - "browser.urlbar.showSearchSuggestionsFirst" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.feeds.snippets" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "ui.key.menuAccessKeyFocuses" = false; + userChrome = '' + #tabbrowser-tabs { + visibility: collapse; + } + ''; + settings = { + # "Open previous windows and tabs" + "browser.startup.page" = 3; + "browser.contentblocking.category" = true; + "extensions.pocket.enabled" = false; + "extensions.screenshots.disabled" = true; + "browser.topsites.contile.enabled" = false; + "browser.formfill.enable" = false; + "browser.search.suggest.enabled" = false; + "browser.search.suggest.enabled.private" = false; + "browser.urlbar.suggest.searches" = false; + "browser.urlbar.showSearchSuggestionsFirst" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.snippets" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "ui.key.menuAccessKeyFocuses" = false; + }; }; }; }; diff --git a/home/gtk.nix b/home/gtk.nix index 4194a1d..cb5c0e8 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,22 +1,33 @@ -{pkgs, ...}: { - home.pointerCursor = { - name = "Dracula"; - package = pkgs.dracula-theme; - gtk.enable = true; +{ + pkgs, + lib, + ... +}: { + options = { + # Enable the GTK theme + enableGTK = lib.mkEnableOption "enableGTK"; }; - gtk = { - enable = true; - theme = { + + config = { + home.pointerCursor = { name = "Dracula"; package = pkgs.dracula-theme; + gtk.enable = true; }; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; - gtk-cursor-theme-size=8; - }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; - gtk-cursor-theme-size=8; + gtk = { + enable = true; + theme = { + name = "Dracula"; + package = pkgs.dracula-theme; + }; + gtk3.extraConfig = { + gtk-application-prefer-dark-theme = 1; + gtk-cursor-theme-size = 8; + }; + gtk4.extraConfig = { + gtk-application-prefer-dark-theme = 1; + gtk-cursor-theme-size = 8; + }; }; }; } diff --git a/home/home.nix b/home/home.nix index b52bb15..5c92228 100644 --- a/home/home.nix +++ b/home/home.nix @@ -27,6 +27,6 @@ home.stateVersion = config.system.stateVersion; - programs.home-manager.enable = true; - + enableGTK = config.myModules.enableKDE; + enableFirefox = config.myModules.enableKDE; } From 0eb3894419ff042f6a3833e0a7ccaf6e02ab5a14 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Apr 2025 02:25:55 +0300 Subject: [PATCH 0854/1768] bind the options to the config --- home/firefox.nix | 4 ++-- home/gtk.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/home/firefox.nix b/home/firefox.nix index b8a2eb7..c387a9f 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,8 +1,8 @@ -{lib, ...}: { +{lib, config, ...}: { options.enableFirefox = lib.mkEnableOption "enableFirefox"; config = { programs.firefox = { - enable = true; + enable = config.enableFirefox; languagePacks = [ "ja" "tr" diff --git a/home/gtk.nix b/home/gtk.nix index cb5c0e8..eb3d5c4 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,6 +1,7 @@ { pkgs, lib, + config, ... }: { options = { @@ -12,10 +13,10 @@ home.pointerCursor = { name = "Dracula"; package = pkgs.dracula-theme; - gtk.enable = true; + gtk.enable = config.enableGTK; }; gtk = { - enable = true; + enable = config.enableGTK; theme = { name = "Dracula"; package = pkgs.dracula-theme; From 57905fe0c66da0a3fca8e1e1e88c593162e61af1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Apr 2025 17:50:56 +0300 Subject: [PATCH 0855/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e565051..8542264 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745853192, - "narHash": "sha256-ardehuT9qtSXtY1XdOY6fEM3Kf3bQa3LZxxKdAScCnU=", + "lastModified": 1745894335, + "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "c54a8ab0d2ea7486eadb14f1dc498817ff164f59", + "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745503349, - "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", + "lastModified": 1745907084, + "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", + "rev": "f1e52a018166e1a324f832de913e12c0e55792d0", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1745794561, + "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745856699, - "narHash": "sha256-pl2aAaWLVS8/vYbEnd4HJlm+FWXd5YU63AueLlYN/m4=", + "lastModified": 1745927529, + "narHash": "sha256-9ofvr5N24TOLjJTkUNdoaHE20l/+r04/9PMw4tmj6dE=", "owner": "nix-community", "repo": "nixvim", - "rev": "70c9b3b890adc745227c51c287520dd5f8febd3d", + "rev": "944a3168813367bb71389c53b94992f69b5be79f", "type": "github" }, "original": { From a45d24deb7b352b784cb52aab70ff0d329686656 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Apr 2025 04:59:14 +0300 Subject: [PATCH 0856/1768] seperate vscode-server out --- modules/common-packages.nix | 5 ----- modules/services/default.nix | 1 + modules/services/vscode-server.nix | 9 +++++++++ 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 modules/services/vscode-server.nix diff --git a/modules/common-packages.nix b/modules/common-packages.nix index cdd2f22..67fc098 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -3,10 +3,6 @@ inputs, ... }: { - imports = [ - inputs.vscode-server.nixosModules.default - ]; - environment.systemPackages = with pkgs; [ inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default wget @@ -76,5 +72,4 @@ }; }; - services.vscode-server.enable = true; } diff --git a/modules/services/default.nix b/modules/services/default.nix index 90f60f1..703c2eb 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -8,5 +8,6 @@ ./jellyfin.nix ./tailscale.nix ./vaultwarden.nix + ./vscode-server.nix ]; } diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix new file mode 100644 index 0000000..293ec4e --- /dev/null +++ b/modules/services/vscode-server.nix @@ -0,0 +1,9 @@ +{inputs, ...}: { + + imports = [ + inputs.vscode-server.nixosModules.default + ]; + + services.vscode-server.enable = true; + +} \ No newline at end of file From 099bc07dbdaea2cf6bf268e15e95933f48a773ba Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Apr 2025 05:07:07 +0300 Subject: [PATCH 0857/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 8542264..46ea702 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745894335, - "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", + "lastModified": 1745977079, + "narHash": "sha256-eEOmrgpenIs+JwuCdqgEYly6sdz8vbCQVgvo8dk3DZM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", + "rev": "84d262115e10ad321ef01cd85903d0f5c3ec113f", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745907084, - "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f1e52a018166e1a324f832de913e12c0e55792d0", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745927529, - "narHash": "sha256-9ofvr5N24TOLjJTkUNdoaHE20l/+r04/9PMw4tmj6dE=", + "lastModified": 1745933874, + "narHash": "sha256-K/bEekSd3iibHoTUgytBYJZd0/e4xQ4IyKkS+NI1XyI=", "owner": "nix-community", "repo": "nixvim", - "rev": "944a3168813367bb71389c53b94992f69b5be79f", + "rev": "cd3cbb1e26f463543dc4710548ed35b0ac711370", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1745704565, - "narHash": "sha256-rLoC0yihupgTft51GYSdIK618xRv2I0l3JU1DEk3SUE=", + "lastModified": 1745943611, + "narHash": "sha256-sRnh1MVNbFKQG6tlPH4YhfP/incAOj49Y2Cf/ifEWmk=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "1fc8a27649406f669f0a0d38ec950453f49d7c0f", + "rev": "862cdf8829b524ac5d7a4e1188c37e04dfd8951d", "type": "github" }, "original": { From d1231e41adcf74b8d87f51179e431e723613e20a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 1 May 2025 20:20:35 +0300 Subject: [PATCH 0858/1768] update flake.lock --- flake.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 46ea702..b21193d 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1745977079, - "narHash": "sha256-eEOmrgpenIs+JwuCdqgEYly6sdz8vbCQVgvo8dk3DZM=", + "lastModified": 1746040799, + "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", "owner": "nix-community", "repo": "home-manager", - "rev": "84d262115e10ad321ef01cd85903d0f5c3ec113f", + "rev": "5f217e5a319f6c186283b530f8c975e66c028433", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1745725746, + "lastModified": 1746054057, "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "187524713d0d9b2d2c6f688b81835114d4c2a7c6", + "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1745933874, - "narHash": "sha256-K/bEekSd3iibHoTUgytBYJZd0/e4xQ4IyKkS+NI1XyI=", + "lastModified": 1746101723, + "narHash": "sha256-loxT2bAglD3w8XDx+7huMXQHbg07yHHHCNiCiVWneqI=", "owner": "nix-community", "repo": "nixvim", - "rev": "cd3cbb1e26f463543dc4710548ed35b0ac711370", + "rev": "c91753bbe57781e08226829b9e354facd50caf1b", "type": "github" }, "original": { From 8b38230a5d942bc4b70a2c74798b6ab914929b57 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 1 May 2025 23:40:09 +0300 Subject: [PATCH 0859/1768] welcome wallfacer Luo Ji --- flake.nix | 4 ++ hosts/wallfacer/configuration.nix | 20 ++++++++++ hosts/wallfacer/hardware-configuration.nix | 43 ++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 hosts/wallfacer/configuration.nix create mode 100644 hosts/wallfacer/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 7fb21f8..3b70628 100644 --- a/flake.nix +++ b/flake.nix @@ -93,6 +93,10 @@ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" ]; }; + wallfacer = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs outputs;}; + modules = [./hosts/wallfacer/configuration.nix]; + }; }; nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { extraSpecialArgs = {inherit inputs outputs;}; diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix new file mode 100644 index 0000000..9da8079 --- /dev/null +++ b/hosts/wallfacer/configuration.nix @@ -0,0 +1,20 @@ +{ + lib, + ... +}: { + imports = [ + ./hardware-configuration.nix + ../../modules + ]; + myModules = { + enableKDE = false; + enableFonts = false; + }; + i18n.inputMethod.enable = lib.mkForce false; + networking.hostName = "wallfacer"; + environment.systemPackages = [ + ]; + + services.getty.autologinUser = "osbm"; + system.stateVersion = "25.05"; +} diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix new file mode 100644 index 0000000..0565019 --- /dev/null +++ b/hosts/wallfacer/hardware-configuration.nix @@ -0,0 +1,43 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "ahci" "ehci_pci" "megaraid_sas" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/46b73f8b-3ff6-40dd-8af2-b5147721f0ef"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/7F4A-78DC"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/9c358d49-467a-4dd1-91f2-b590dd5d60e7"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1np0.useDHCP = lib.mkDefault true; + # networking.interfaces.eno2np1.useDHCP = lib.mkDefault true; + # networking.interfaces.eno3.useDHCP = lib.mkDefault true; + # networking.interfaces.eno4.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 8e7f771ee99979d0be03716400e952e400d99156 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 1 May 2025 23:43:12 +0300 Subject: [PATCH 0860/1768] rekey for our beloved new server --- secrets/cloudflare.age | 22 ++++++++++++---------- secrets/network-manager.age | 22 ++++++++++++---------- secrets/secrets.nix | 2 ++ secrets/ssh-key-private.age | Bin 941 -> 1051 bytes secrets/ssh-key-public.age | Bin 623 -> 733 bytes 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index c43d8ec..71449f1 100644 --- a/secrets/cloudflare.age +++ b/secrets/cloudflare.age @@ -1,11 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ FDX3lqi4gIU8QwUnebNptpZk6q5as9K6g6Wwcukl6lg -g6PHmM+Vc2jL1jBKUWAUvm4qUGt1Q6UobhVBqARqx+Q --> ssh-ed25519 a9zBzw AYWrtriYEYbl1vmQ0Q6w7Ayq3joFwYqUXx/JvOnYjyo -x/ddxTLgsN/u0yAKuNunah2/9DvfstIa8OBAhRKKqG8 --> ssh-ed25519 /0F2+A ufYJ59uEJI5O+i9ImQRC7d3ER4xfyobCUWHBqCJIl3c -cFHxCgspwWFbHmBMH9UNoJ6HggGsVS2sHnEsdsAp8Jo --> ssh-ed25519 Ws1uag qiau+LxFT+QDWCwKsgj7euj2i5+bWxVcJbuQMZiQfXY -VfCymx3lHUS89YoRwyUzksNFTNLlbvMyBeTOgNV5qRE ---- ENo/uYdRFpuHn9ZlC2sNN7+hu9v5eJERz8hixxorAog -~>fjV~ Qhx4٠7FYױ:.&޹b* ,FI=(UI')nȠgэ~Yх \ No newline at end of file +-> ssh-ed25519 YVcKMQ 8lnr11Kwh1J/jI8tlTZTJYQfrB7hjBeHy5OhV1MXf2Q +BqO+83r2fLB3ZFEMFObKk4RbcKhUpqt4ikUbJhoXqjs +-> ssh-ed25519 a9zBzw 2TaCU3xA8LiyFEKCTECJeR4ZCVZjaU+O1cINoNtK/XE +KCvDNzGrjxYVIpD6xHi/amAfvGGmXNd9tpwimHuGoiE +-> ssh-ed25519 /0F2+A +UYxpGexr/2fgMRyKXlqyXz1qV40YosdfN6gyWlV0zY +XwDQL2toWbRBWXiw/AgipJxqCE0U2tXxwgrZUeN/69A +-> ssh-ed25519 cs+R0A HMuQrVzNA53fYlXv14TJbAtDx8twbHfr7LyeCQIdJCI +H3Mk559SukAQBA9JZmomDU2sanYM19XT4b2HmqTkBBc +-> ssh-ed25519 Ws1uag vFXa6FwDRkEBfwigdOAmdL7GefbPbAkTiKkn89Vew0g ++QqrYKClcUWMaTzi6A4CvGL2aG3zUK87fDQnIs/t7fA +--- 6R3Wki1NJX6MrhqJKlhRPSzGFrfayKgbuacLyJqIQQ4 +bo_d.(1frkd~4J~,p;VbD*ǧ Y- sO}Ecj8C \ No newline at end of file diff --git a/secrets/network-manager.age b/secrets/network-manager.age index db4fda6..898fb62 100644 --- a/secrets/network-manager.age +++ b/secrets/network-manager.age @@ -1,11 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ nTspCgR7AIIMdeccoeu3HyfbtPxvkIdeC4aBUvA6FmA -gfEoO2RAMVa7vzGo0LrLHEz/8pp7lkrVPktc1wPRlH8 --> ssh-ed25519 a9zBzw WwAj1mQvuj9vUjHOFYVB0RfgTOqjsjMMdW2BsbApxTM -Jmmm+wvtDHusNM8mpJcl7SYkY1BaUiiggC+QX0oYdDY --> ssh-ed25519 /0F2+A Bi3Oh2xaeJ4aNaKuvkG0peZA4lt488iYJghCj4+gkUc -gDgr8EaAE2kVHhhfXzeh+smnIKwT9UiRuRTmelLBlcE --> ssh-ed25519 Ws1uag LctaOiYCkxeMYkD455ztWXBD+IKD4uiCQ3P/zU9dz0E -7GZ/E4ckLCaPhFgt286m6nQZdFzmcFVtHFlMYbK2DvU ---- +LQ/QNr+xIShuL6ca8dTpQgKZqER+BBuH7GPLjhdxMw -$SԤ>ր`>֒wbSyku]ѧ>io37~=֚g'Sβi0m %] \ No newline at end of file +-> ssh-ed25519 YVcKMQ nUSb1IguQc97W/rZi/ZUngGRROJBfn+CdbQqRjvGwk4 +6DjM3ODKvD79EtHa/ajHf+K19z/23VRY3xz6OMo9WfA +-> ssh-ed25519 a9zBzw 8O37ZY0UTwuAumWxi0capttInHWbvtQNjOiUoqjvjXY +XS+/+jLqOeaiaZrZ9cIvrwBw0akfGI0PL/ceqLaFgok +-> ssh-ed25519 /0F2+A vzLFtFnJ7I6z0ORO7ZQkg48DJkNDvbavpvFS3nhVzQ8 +wI2vlX7kr/e+UqLH0Ji2YdzZ5GdSWZfdRZV8nVtZlVs +-> ssh-ed25519 cs+R0A ChKu8XZWCQuNtojpXG2jZzJOtH1ZgOu8es+1+alhPmM +nFaneBeB1M0JlNCi8dYOXl/w6gna3B7tNJ6zQeB52fg +-> ssh-ed25519 Ws1uag 6qewVjZyNRIA8nJzF2+PAtF/qqy9bKNi8vQYQwyQhSs +rVKwUePtVLF+TBmQPAia+Bq4HVlc3oGPYqEec/BHxjs +--- waKgC7pGc3gPDIEMWkQkNQkOJiB5vjnfsR5dZmJoMGU + v\m[a'U.&ҹ\Zjxё %6I Q~cazz#J \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 17e8614..aff5aee 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,6 +2,7 @@ let ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFgjjvukAG0RvQfHj5Iy64XOFh9YbdnNAmgFUvzlnAEt"; tartarus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxbIyQnQFA1RFQKH4eHHWcT7Z0tCumerCsRMjlHgSPd"; pochita = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHpE9pf7ZeNvpW1GxLLF8kB0Q8HQO7XSIea1Oe9qubKt"; + wallfacer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOr8pQvLsNCHQdsBKWpziYTPjBkEcQy272kZ5Gqoaatt"; osbm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"; @@ -9,6 +10,7 @@ let ymir tartarus pochita + wallfacer ]; in { "network-manager.age".publicKeys = machines ++ [osbm]; diff --git a/secrets/ssh-key-private.age b/secrets/ssh-key-private.age index 31d5d9d3496f392f0a8b4a08cbddb281fc27ecc5..4ef6990830dfbc1f3b688d393b0935530f2338dd 100644 GIT binary patch delta 983 zcmZ3>KAU5LPJKjnkY#asQF@kRc!rs$larURafor1ae8o6V3u}PzLR!kWV)M2fOfJ` zC|8-YrMH21e!825Z)s^tp^HJTX|k`ec0iO z#E;_jCayv0MuBB%?j{-Lo*7lnW@eQ>uBran#)U@C*^v?ckr{cJSs}TJ7S8Ehfd)xV zmL@)yfgWBVzG<#`J|Ujo&Lw4qnIRz=1)llNkzQs7`EK4JnclAGK1nXt4l;05a7@Vz zEpu};^z|+d%`XVfGj#KC57o|cD@yh@@Xph>FbXdVE%7X_a7xO{=km!)bIJ_J@p3VA z%*@G6)(*-|*ADk_GD=JF@HH?A%J4NRD=W=%a|<8x)*dRUB53?q{eU zRch*jWL}o+85L3$$Q9%q5M~sfWRhkPRAwG!Y2qAdnjc_b zTH#rk=C5DuWME!t;A>Wtn-%P0!KJIKtKgLqB$u-vOQ#KeD9}Auij7mAss(os$kFSSefqg=3Vau86p~OvE!>!G(VAYpB*7MH(o^P9f^v%W{cI{K9?_?L|K2%+1W*&Lg>GE-LC6ftSx-)7X z``znUuxrs%(@$;n*4dmdC+b{yJF(<|WZI>Q%g)SqG&*c_3d;cKMh)bzgj1 z_Jfuiry{nkS@h@B%3T@#o;&+%licUN4SKbR+dy#YgIUHgWpB3~Xg@eD^Pom{^xN(C zzIaV(chUaRV63M0IIBr*^69uwYr`@OAMLqw{V4N;id`*J-$lQVpQ~7vDEt4Up@DvY zvC_5EJvt5loz_okS$Ax2ePd)jPpHu1ch9G1Y!X|+9i4O{yfxwVt?Tta^KOeP{NDXF zD>%{Jm_)pZ@#TU3qDvsTkNyx<2Ffi=CEBq zu3A3|cdE&6&ZxZb#=1P?oQu)SS{aXT)qUs6k(*PVg{8N#cUV-Czh#b-Nnw_w zWu;qKabA`qS4B~UyLN!FuYP_~Ubw!8leSr&u}e`(YHp-Aq#g8GdGll}<^aQKrS-`B_PxZaLxZxqijkDJI$>&Z!ojxuF5YQF$g@5pHG4 zt|nClCdQ^-A(qZjDK7eE9;vS0{+2!#p&@B*$)zbFX=Y(=PC@yT&oYYFJNt%bdnP*u zJEvp?n-m$lRuu=k7zKq!X;&o~YiF638@hM}1i2WNJB7G%Wdvq=B|E!jn40B;FVk#_*>|gxu!;$q!eZb>AR+enz1v)3 zyt~+UI%`h9Y(kfbs#sv@kK{u#Uz`|kF(;S%8X5H&$9wrKJLUKO@uPyDyuasf=5P9y zW9eba@3#2i$$J*M()T#d2(x9yCOO!+PKZhVe3rp)Ysr2|hHaC6Z{@=2On2M(5-L%>_Ok%CGx%HL(+}kEbwMbG~V_h;6#bl_D@!7 zcjRs~=p5w!T*ly%_>C=li{Xteu1j4+pY3CuW^yH7ICr^-pksJj5L5Er^~P(MmaV>7 zDLTQuQ=;ei`s-UyyX>BkXCqtBvG7}cqD^1T``$lC-b)Het$DbAU%Ix~qGef^_1_*{ zI$6z9`tmtl%ef!=U!PiA&~skvg6@I6YxyN21B~~5ON!oZH8EBv>%Kg}EOy+&s37^U&7yCW6K&79itKWXzx(vop??mam&MDgukz9K3$bramWURc Syjn72)xP>mZ+?kPy9@vt_Fc9B diff --git a/secrets/ssh-key-public.age b/secrets/ssh-key-public.age index 761e40b2a38fa8abc629638e832a20d7c5982792..c3dd9f1b4426f96466ca816a10a70b96a996d987 100644 GIT binary patch delta 662 zcmaFQa+h_2PJKa!SH5GGYjA0Wflsl2hM8Z!OQ}IbS*m_XW~7IHVpwHxgtvZ0N`!Wv z30GiMWR#<0gim%*dSYHwfv0I$fI&ujNLFEiQ($FYwtsR!Ub=xnPH9qdB$uw8LUD11 zZfc5=si~o*LZW4rQ&qWwSx#<9ra^G3i%EHfc7$n$xm##?c7cgsilKIji=|~=xL3Zf znUkkazJ7T&SAmarVQ!vpaip_BmWg3uNtI8Tlb=assIj4YmAjjA`-%jscbh5k(cr0WPU&Rhh+HE*9ar zMW#vap5`Hm+0KdjPWm36xt3WK?%685x=PFA~)Gn>^_40Ns zPchA{Fwf67NplVe3or8WFLO)}H_9*0PS4gaHwzC)pB&F9USC>S5$NUX5?~qVn3kHK zR2Wc}mRDl#ADCn8ljY)WnjYd}YF6f*@0(od%9Up9;_aH0V-ZqiY?xy1>!F?PRhe2| zoE7L4o)o3;>7!q)U*+XmRhUv1$)&5StKbslUy^AS<*Z+n8Rcqjkr?Fa6%i4d7nPZs zWnq+4V(L}kTV+s`9iCiN5Xf~m&__}saoZWc$rlz&3P>khVvc@#&D~4?*DsbH-RzSS z({3bhcYe%0iQQ|L n2P!Oma#QtA@uQ*#s=X6l9q6;zx>CL2^qidxsojB7RR;TUA(QdU!=}UTUgqc!0m3uVrqaQ;>mWu4|>q z#E;_P#sL9_`o$@MMX8=?eiey6S>EZz`Oax2`oWII0pVUH0jas^1t#V>ewnUZ5f=Fc zL2i`>?zv9M8D_rWh2F-MCdK&~#uko7NzM^&*`8(21!0-)u0Gk5&oYYF7iCtZn5HI0 zm{|rGl?Aw1g!!bDRAg5M7yFh3dzd8_hUWVghU8{=_!*dRMPwTJdlzOz8M~#YJNoEb zx_Ucn2N?xK8AKE%MN}DPIBHvFR%E0n<@%X$>FVk#_>~xV1&132JGuL0xmUS_nWU7s zLizdG!k)iRH#0+ET8X6)a$-=1)}$3^?) zymYIeV_m0(mD0l4Bz~9vo!B=|bJq{gjCWJ@Jd1YNMCaaLowY_mVS~)#`M=H_e;9Tz scMgkpm36UX(530oIV`5{TUB!^at*$)c7J;LFRX8!zEN9dsnIhL02L<38UO$Q From 97527021760087428a11bc7309ae59df012d6bfe Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 1 May 2025 23:46:35 +0300 Subject: [PATCH 0861/1768] dont forget to add boot options --- hosts/wallfacer/configuration.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 9da8079..639c5fc 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -10,11 +10,10 @@ enableKDE = false; enableFonts = false; }; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; i18n.inputMethod.enable = lib.mkForce false; networking.hostName = "wallfacer"; - environment.systemPackages = [ - ]; - services.getty.autologinUser = "osbm"; system.stateVersion = "25.05"; } From 1cbf3ddf74a56b062cf6e26d831b916d57a7c9b9 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 2 May 2025 00:03:32 +0300 Subject: [PATCH 0862/1768] add pfetch --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 67fc098..25e396e 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -26,6 +26,7 @@ lm_sensors cloc neofetch + pfetch inxi jq dig From 84dabdc550ac1146c2b8ead3dca1b28f8c88d029 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 2 May 2025 00:09:39 +0300 Subject: [PATCH 0863/1768] add exa --- home/fish.nix | 1 + modules/common-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home/fish.nix b/home/fish.nix index bc10284..7c39636 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -7,6 +7,7 @@ shellAliases = { c = "code ."; l = "ls -lah"; + ll = "exa -la -F --icons --git --group-directories-first --git"; free = "free -h"; df = "df -h"; du = "du -h"; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 25e396e..0048d72 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -33,6 +33,7 @@ onefetch just nixd + exa gh starship tree From d81d346a13c06a6ec8e97ca9abd200de67ab8dc7 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 2 May 2025 00:10:42 +0300 Subject: [PATCH 0864/1768] typo --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 0048d72..60d8679 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -33,7 +33,7 @@ onefetch just nixd - exa + eza gh starship tree From f27b26ec1ce842a775cca3634e133d8a26cf97c7 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 2 May 2025 00:14:31 +0300 Subject: [PATCH 0865/1768] add wallfacer to ssh --- home/ssh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/ssh.nix b/home/ssh.nix index a9613b3..422ffef 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -34,6 +34,8 @@ in { pochita-ts = sshBlock "pochita.curl-boga.ts.net"; harmonica = sshBlock "192.168.0.11"; harmonica-ts = sshBlock "harmonica.curl-boga.ts.net"; + wallfacer = sshBlock "192.168.0.5"; + wallfacer-ts = sshBlock "wallfacer.curl-boga.ts.net"; }; }; } From 76400f87a0caa7a90d9d57faa83d69d98ec79d06 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 3 May 2025 18:42:40 +0300 Subject: [PATCH 0866/1768] dont login automatically --- hosts/harmonica/configuration.nix | 2 +- hosts/pochita/configuration.nix | 2 +- hosts/wallfacer/configuration.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index 45e5228..d525bb8 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -28,5 +28,5 @@ enable = true; wheelNeedsPassword = false; }; - services.getty.autologinUser = "osbm"; + # services.getty.autologinUser = "osbm"; } diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index eee4e7a..588aa40 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -43,7 +43,7 @@ acceptTerms = true; }; - services.getty.autologinUser = "osbm"; + # services.getty.autologinUser = "osbm"; # The board and wanted kernel version raspberry-pi-nix = { diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 639c5fc..c994186 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -14,6 +14,6 @@ boot.loader.efi.canTouchEfiVariables = true; i18n.inputMethod.enable = lib.mkForce false; networking.hostName = "wallfacer"; - services.getty.autologinUser = "osbm"; + # services.getty.autologinUser = "osbm"; system.stateVersion = "25.05"; } From cf4258003c687a0fab7975da92c0e9d9623ea3e5 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 4 May 2025 14:11:31 +0300 Subject: [PATCH 0867/1768] SYBAU --- hosts/wallfacer/hardware-configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix index 0565019..f788b41 100644 --- a/hosts/wallfacer/hardware-configuration.nix +++ b/hosts/wallfacer/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { From f79a7f2fc1f34e2f68ce65cf431e6609d82fdd9e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 5 May 2025 12:46:04 +0300 Subject: [PATCH 0868/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index b21193d..96921e0 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1746040799, - "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f217e5a319f6c186283b530f8c975e66c028433", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1746054057, - "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=", + "lastModified": 1746330942, + "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8", + "rev": "137fd2bd726fff343874f85601b51769b48685cc", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746427242, + "narHash": "sha256-KvZ6G5sdBdcrglsqcOx8BT6NpHVMVHc8wssMRhv/+1g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "a4bb30a9000cf0444ecc8fdca8096d072f77f9e8", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746101723, - "narHash": "sha256-loxT2bAglD3w8XDx+7huMXQHbg07yHHHCNiCiVWneqI=", + "lastModified": 1746387720, + "narHash": "sha256-x8k0DKiQYRNaf9Hg+di+WCKxb76zJVWSjKOlPiuc22o=", "owner": "nix-community", "repo": "nixvim", - "rev": "c91753bbe57781e08226829b9e354facd50caf1b", + "rev": "7d18194a22325f212e17eb876d9c00afcc434113", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1745943611, - "narHash": "sha256-sRnh1MVNbFKQG6tlPH4YhfP/incAOj49Y2Cf/ifEWmk=", + "lastModified": 1746438351, + "narHash": "sha256-Y1cHw1oouYBcPe8GclrN1zGwtW3kJsigyXoJWx+E3dM=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "862cdf8829b524ac5d7a4e1188c37e04dfd8951d", + "rev": "c871d7a1db48594fe82429f3cc71f63fa5709fdb", "type": "github" }, "original": { From 0bc9d744de57160402aa1540bc244086d460c85f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 01:30:24 +0300 Subject: [PATCH 0869/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 96921e0..61b2d51 100644 --- a/flake.lock +++ b/flake.lock @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746427242, - "narHash": "sha256-KvZ6G5sdBdcrglsqcOx8BT6NpHVMVHc8wssMRhv/+1g=", + "lastModified": 1746468201, + "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a4bb30a9000cf0444ecc8fdca8096d072f77f9e8", + "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746387720, - "narHash": "sha256-x8k0DKiQYRNaf9Hg+di+WCKxb76zJVWSjKOlPiuc22o=", + "lastModified": 1746479605, + "narHash": "sha256-YZT1uhEuHx+BLCpy25g4fPxyyyRNx07iA+fVKLczr18=", "owner": "nix-community", "repo": "nixvim", - "rev": "7d18194a22325f212e17eb876d9c00afcc434113", + "rev": "64cd675ece86352c8540da765aef72eeba045cf5", "type": "github" }, "original": { From cd15d508c525c2da6cb610d655373e014c2b176e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:10:17 +0300 Subject: [PATCH 0870/1768] add wanikani custom systemd service --- modules/services/default.nix | 1 + modules/services/wanikani-bypass-lessons.nix | 47 ++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 modules/services/wanikani-bypass-lessons.nix diff --git a/modules/services/default.nix b/modules/services/default.nix index 703c2eb..28ebc33 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -9,5 +9,6 @@ ./tailscale.nix ./vaultwarden.nix ./vscode-server.nix + ./wanikani-bypass-lessons.nix ]; } diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix new file mode 100644 index 0000000..0f4c61d --- /dev/null +++ b/modules/services/wanikani-bypass-lessons.nix @@ -0,0 +1,47 @@ +{lib, config, pkgs, ...}: let + + waniKani-bypass-lessons = pkgs.writeShellScript "wanikani-bypass-lessons" '' + #!/usr/bin/env bash + + # this token that starts with "2da24" is read only so i am keeping it public, i have nothing secret on my wanikani account + # but i need a write token for the second part of this script + + # i am going to read it from /persist/wanikani + + [ ! -e /persist/wanikani ] && echo "/persist/wanikani doesnt exist here :(" + + WANIKANI_TOKEN=$(< /persist/wanikani) + + ASSIGNMENT_IDS = $(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id ) + + echo number of assignments: $(echo $ASSIGNMENT_IDS | wc -l) + + # echo Starting assignments: + for assignment_id in $ASSIGNMENT_IDS; do + put_url="https://api.wanikani.com/v2/assignments/$assignment_id/start" + # echo "PUT $put_url" + echo curl -X PUT -s -H "Authorization: Bearer $WANIKANI_TOKEN" $put_url + sleep 1 + done + ''; +in + + { + options.services.wanikani-bypass-lessons.enable = lib.mkEnableOption { + description = "Enable WaniKani Bypass Lessons"; + default = false; + }; + + config = lib.mkIf config.services.wanikani-bypass-lessons.enable { + systemd.services.wanikani-bypass-lessons = { + description = "WaniKani Bypass Lessons"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${waniKani-bypass-lessons}"; + Restart = "always"; + RestartSec = 60; + }; + }; + }; + } From 651768dce153f48df8d5e223217ce07808e33537 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:11:40 +0300 Subject: [PATCH 0871/1768] enable this in ymir --- hosts/ymir/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 073ce20..705129c 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -24,6 +24,8 @@ enableMinegrubTheme = true; }; + services.wanikani-bypass-lessons.enable = true; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From 540dbd25d575aada6d676fcaf7cd91994a17fb0a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:13:33 +0300 Subject: [PATCH 0872/1768] hotfix --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 0f4c61d..2c32ed6 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -12,7 +12,7 @@ WANIKANI_TOKEN=$(< /persist/wanikani) - ASSIGNMENT_IDS = $(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id ) + ASSIGNMENT_IDS = $(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) echo number of assignments: $(echo $ASSIGNMENT_IDS | wc -l) From d9cc8dd22751505feef3dde452e125ef593cda75 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:23:51 +0300 Subject: [PATCH 0873/1768] use writeshellapplication --- modules/services/wanikani-bypass-lessons.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 2c32ed6..ebccb56 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -1,6 +1,10 @@ {lib, config, pkgs, ...}: let - waniKani-bypass-lessons = pkgs.writeShellScript "wanikani-bypass-lessons" '' + waniKani-bypass-lessons = pkgs.writeShellApplication{ + + name = "wanikani-bypass-lessons"; + runtimeInputs = with pkgs; [ curl jq ]; + text = '' #!/usr/bin/env bash # this token that starts with "2da24" is read only so i am keeping it public, i have nothing secret on my wanikani account @@ -24,6 +28,7 @@ sleep 1 done ''; + }; in { From 22e3ee3dd7b984afcf5228825c98baca377077d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:24:32 +0300 Subject: [PATCH 0874/1768] nice catch man --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index ebccb56..558a064 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -24,7 +24,7 @@ for assignment_id in $ASSIGNMENT_IDS; do put_url="https://api.wanikani.com/v2/assignments/$assignment_id/start" # echo "PUT $put_url" - echo curl -X PUT -s -H "Authorization: Bearer $WANIKANI_TOKEN" $put_url + echo curl -X PUT -s -H "Authorization: Bearer $WANIKANI_TOKEN" "$put_url" sleep 1 done ''; From a16512f599e332d7f8cfa8e88cf54a58d8196012 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:26:31 +0300 Subject: [PATCH 0875/1768] shell shocked me to my core --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 558a064..066fb51 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -18,7 +18,7 @@ ASSIGNMENT_IDS = $(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) - echo number of assignments: $(echo $ASSIGNMENT_IDS | wc -l) + echo number of assignments: '$(echo "$ASSIGNMENT_IDS" | wc -l)' # echo Starting assignments: for assignment_id in $ASSIGNMENT_IDS; do From c3a415ad310288768aabb685b92c7b1092340673 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:29:38 +0300 Subject: [PATCH 0876/1768] lets see --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 066fb51..dedd497 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -18,7 +18,7 @@ ASSIGNMENT_IDS = $(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) - echo number of assignments: '$(echo "$ASSIGNMENT_IDS" | wc -l)' + echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" # echo Starting assignments: for assignment_id in $ASSIGNMENT_IDS; do From f04a32bc160ad28ad938987d7628f169f8539c52 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:32:12 +0300 Subject: [PATCH 0877/1768] lets seeeeeeeeee --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index dedd497..720fe9c 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -16,7 +16,7 @@ WANIKANI_TOKEN=$(< /persist/wanikani) - ASSIGNMENT_IDS = $(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) + ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" From 459e06864ffcc0f396bd85e757838ac3085d461b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:34:47 +0300 Subject: [PATCH 0878/1768] use the executable --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 720fe9c..9108350 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -43,7 +43,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "${waniKani-bypass-lessons}"; + ExecStart = "${lib.getExe waniKani-bypass-lessons}"; Restart = "always"; RestartSec = 60; }; From c68e9523ea11640bd5089eddc2dcf6bca0aef765 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:43:19 +0300 Subject: [PATCH 0879/1768] update the new command --- modules/services/wanikani-bypass-lessons.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 9108350..71695c5 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -20,12 +20,27 @@ echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" + # "2017-09-05T23:41:28.980679Z" i need to create this from current time + + TIME_STRING=$(date -u +"%Y-%m-%dT%H:%M:%S.%6NZ") + echo "Current time:" + echo "$TIME_STRING" + # echo Starting assignments: for assignment_id in $ASSIGNMENT_IDS; do put_url="https://api.wanikani.com/v2/assignments/$assignment_id/start" # echo "PUT $put_url" - echo curl -X PUT -s -H "Authorization: Bearer $WANIKANI_TOKEN" "$put_url" - sleep 1 + curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ + -X "PUT" \ + -H "Wanikani-Revision: 20170710" \ + -H "Content-Type: application/json; charset=utf-8" \ + -H "Authorization: Bearer $WANIKANI_TOKEN" \ + -d $'{ + "assignment": { + "started_at": $TIME_STRING + } + }' + sleep 1 done ''; }; From 2d748f972fdf57ee5fe35bce0ca7f6ebe25b4bb9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:44:35 +0300 Subject: [PATCH 0880/1768] remove unused var --- modules/services/wanikani-bypass-lessons.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 71695c5..32d3231 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -28,8 +28,7 @@ # echo Starting assignments: for assignment_id in $ASSIGNMENT_IDS; do - put_url="https://api.wanikani.com/v2/assignments/$assignment_id/start" - # echo "PUT $put_url" + echo "Starting assignment $assignment_id" curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ -X "PUT" \ -H "Wanikani-Revision: 20170710" \ From e17bccf74895054d260f8361dbf9db6fb6f29b70 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:46:31 +0300 Subject: [PATCH 0881/1768] i suspect this --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 32d3231..1b9e2f4 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -36,7 +36,7 @@ -H "Authorization: Bearer $WANIKANI_TOKEN" \ -d $'{ "assignment": { - "started_at": $TIME_STRING + "started_at": "$TIME_STRING" } }' sleep 1 From 3455830c0eacf0cfe6bc655abb8e2c0d6f128768 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 02:57:41 +0300 Subject: [PATCH 0882/1768] lets see this in action --- modules/services/wanikani-bypass-lessons.nix | 21 +++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 1b9e2f4..e8d6531 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -28,18 +28,15 @@ # echo Starting assignments: for assignment_id in $ASSIGNMENT_IDS; do - echo "Starting assignment $assignment_id" - curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ - -X "PUT" \ - -H "Wanikani-Revision: 20170710" \ - -H "Content-Type: application/json; charset=utf-8" \ - -H "Authorization: Bearer $WANIKANI_TOKEN" \ - -d $'{ - "assignment": { - "started_at": "$TIME_STRING" - } - }' - sleep 1 + echo "Starting assignment $assignment_id" + curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ + -X "PUT" \ + -H "Wanikani-Revision: 20170710" \ + -H "Content-Type: application/json; charset=utf-8" \ + -H "Authorization: Bearer $WANIKANI_TOKEN" \ + -d "{\"assignment\": {\"started_at\": \"$TIME_STRING\" }}" + echo + sleep 1 done ''; }; From 5717b3a38f2ce963dc24ed7a3ddc3e0081742e3f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 03:09:41 +0300 Subject: [PATCH 0883/1768] update the time --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index e8d6531..a231881 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -56,7 +56,7 @@ in Type = "simple"; ExecStart = "${lib.getExe waniKani-bypass-lessons}"; Restart = "always"; - RestartSec = 60; + RestartSec = 60 * 60; }; }; }; From 8c795262536f851ee3d6a19eaa5b8a5140d1159c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 10:00:56 +0300 Subject: [PATCH 0884/1768] just give reviews --- home/tmux/wanikani-current-reviews.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/home/tmux/wanikani-current-reviews.sh b/home/tmux/wanikani-current-reviews.sh index f2d2a90..fa70614 100755 --- a/home/tmux/wanikani-current-reviews.sh +++ b/home/tmux/wanikani-current-reviews.sh @@ -1,18 +1,14 @@ #!/usr/bin/env bash #!nix-shell -i bash -p jq curl - get_wanikani() { wanikani_reviews=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count') - wanikani_lessons=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq '.total_count') - - echo "$wanikani_lessons lessons $wanikani_reviews reviews" + echo "$wanikani_reviews reviews" } main() { get_wanikani - # sleep for 10 minutes sleep 600 } From 85265f4137615a7951a1bb296de518486052c6ee Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 21:13:47 +0300 Subject: [PATCH 0885/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 61b2d51..c8f4ca9 100644 --- a/flake.lock +++ b/flake.lock @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746479605, - "narHash": "sha256-YZT1uhEuHx+BLCpy25g4fPxyyyRNx07iA+fVKLczr18=", + "lastModified": 1746536883, + "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=", "owner": "nix-community", "repo": "nixvim", - "rev": "64cd675ece86352c8540da765aef72eeba045cf5", + "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0", "type": "github" }, "original": { From f455ddf3b24455b02235e59939e508b649ad0c3e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 21:13:57 +0300 Subject: [PATCH 0886/1768] dont block youtube for a while --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 705129c..8dfe716 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -10,7 +10,7 @@ ]; myModules = { - blockYoutube = true; + # blockYoutube = true; blockTwitter = true; blockBluesky = false; enableKDE = true; From 094e8827930ea089061975c1de0d1abbdbc4e7b2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 21:20:08 +0300 Subject: [PATCH 0887/1768] add just recipe for the stupid thing --- justfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index d8393ea..6af9033 100644 --- a/justfile +++ b/justfile @@ -11,7 +11,7 @@ build *args: check-git nvd diff /run/current-system ./result [linux] -switch *args: check-git +switch *args: check-git remove-hm-backup-files #!/usr/bin/env sh if [[ "$(hostname)" == "localhost" ]]; then nix-on-droid switch --flake . @@ -19,6 +19,8 @@ switch *args: check-git nh os switch . fi +remove-hm-backup-files: + rm ~/.gtkrc-2.0.hmbak test: nh os test . From 2badf04a0fc30fbbfe58c35635891f21debd6a59 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 21:21:11 +0300 Subject: [PATCH 0888/1768] formatting --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 8dfe716..2093d4f 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -1,7 +1,6 @@ { config, pkgs, - inputs, ... }: { imports = [ From 644286a9b1a632fad1a491fee58755b207769cc6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 21:21:26 +0300 Subject: [PATCH 0889/1768] formatting --- home/firefox.nix | 6 +- hosts/wallfacer/configuration.nix | 5 +- hosts/wallfacer/hardware-configuration.nix | 46 +++++++------ modules/common-packages.nix | 1 - modules/services/vscode-server.nix | 4 +- modules/services/wanikani-bypass-lessons.nix | 71 ++++++++++---------- 6 files changed, 68 insertions(+), 65 deletions(-) diff --git a/home/firefox.nix b/home/firefox.nix index c387a9f..0727340 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -1,4 +1,8 @@ -{lib, config, ...}: { +{ + lib, + config, + ... +}: { options.enableFirefox = lib.mkEnableOption "enableFirefox"; config = { programs.firefox = { diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index c994186..08b55b5 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -1,7 +1,4 @@ -{ - lib, - ... -}: { +{lib, ...}: { imports = [ ./hardware-configuration.nix ../../modules diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix index f788b41..14fbff5 100644 --- a/hosts/wallfacer/hardware-configuration.nix +++ b/hosts/wallfacer/hardware-configuration.nix @@ -1,29 +1,33 @@ -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "ehci_pci" "megaraid_sas" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ahci" "ehci_pci" "megaraid_sas" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/46b73f8b-3ff6-40dd-8af2-b5147721f0ef"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/46b73f8b-3ff6-40dd-8af2-b5147721f0ef"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/7F4A-78DC"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7F4A-78DC"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/9c358d49-467a-4dd1-91f2-b590dd5d60e7"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/9c358d49-467a-4dd1-91f2-b590dd5d60e7";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 60d8679..4912aab 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -73,5 +73,4 @@ ClientAliveInterval = 60; }; }; - } diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 293ec4e..46a9580 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -1,9 +1,7 @@ {inputs, ...}: { - imports = [ inputs.vscode-server.nixosModules.default ]; services.vscode-server.enable = true; - -} \ No newline at end of file +} diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index a231881..88dbcf6 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -1,48 +1,49 @@ -{lib, config, pkgs, ...}: let - - waniKani-bypass-lessons = pkgs.writeShellApplication{ - +{ + lib, + config, + pkgs, + ... +}: let + waniKani-bypass-lessons = pkgs.writeShellApplication { name = "wanikani-bypass-lessons"; - runtimeInputs = with pkgs; [ curl jq ]; + runtimeInputs = with pkgs; [curl jq]; text = '' - #!/usr/bin/env bash + #!/usr/bin/env bash - # this token that starts with "2da24" is read only so i am keeping it public, i have nothing secret on my wanikani account - # but i need a write token for the second part of this script + # this token that starts with "2da24" is read only so i am keeping it public, i have nothing secret on my wanikani account + # but i need a write token for the second part of this script - # i am going to read it from /persist/wanikani + # i am going to read it from /persist/wanikani - [ ! -e /persist/wanikani ] && echo "/persist/wanikani doesnt exist here :(" + [ ! -e /persist/wanikani ] && echo "/persist/wanikani doesnt exist here :(" - WANIKANI_TOKEN=$(< /persist/wanikani) + WANIKANI_TOKEN=$(< /persist/wanikani) - ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) + ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) - echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" + echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" - # "2017-09-05T23:41:28.980679Z" i need to create this from current time + # "2017-09-05T23:41:28.980679Z" i need to create this from current time - TIME_STRING=$(date -u +"%Y-%m-%dT%H:%M:%S.%6NZ") - echo "Current time:" - echo "$TIME_STRING" + TIME_STRING=$(date -u +"%Y-%m-%dT%H:%M:%S.%6NZ") + echo "Current time:" + echo "$TIME_STRING" - # echo Starting assignments: - for assignment_id in $ASSIGNMENT_IDS; do - echo "Starting assignment $assignment_id" - curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ - -X "PUT" \ - -H "Wanikani-Revision: 20170710" \ - -H "Content-Type: application/json; charset=utf-8" \ - -H "Authorization: Bearer $WANIKANI_TOKEN" \ - -d "{\"assignment\": {\"started_at\": \"$TIME_STRING\" }}" - echo - sleep 1 - done - ''; + # echo Starting assignments: + for assignment_id in $ASSIGNMENT_IDS; do + echo "Starting assignment $assignment_id" + curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ + -X "PUT" \ + -H "Wanikani-Revision: 20170710" \ + -H "Content-Type: application/json; charset=utf-8" \ + -H "Authorization: Bearer $WANIKANI_TOKEN" \ + -d "{\"assignment\": {\"started_at\": \"$TIME_STRING\" }}" + echo + sleep 1 + done + ''; }; -in - - { +in { options.services.wanikani-bypass-lessons.enable = lib.mkEnableOption { description = "Enable WaniKani Bypass Lessons"; default = false; @@ -51,7 +52,7 @@ in config = lib.mkIf config.services.wanikani-bypass-lessons.enable { systemd.services.wanikani-bypass-lessons = { description = "WaniKani Bypass Lessons"; - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; serviceConfig = { Type = "simple"; ExecStart = "${lib.getExe waniKani-bypass-lessons}"; @@ -60,4 +61,4 @@ in }; }; }; - } +} From 050ce0c6b70d31bf6145f78f782c87200830ebd1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 21:23:33 +0300 Subject: [PATCH 0890/1768] default was false --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 2093d4f..35fec59 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -9,7 +9,7 @@ ]; myModules = { - # blockYoutube = true; + blockYoutube = false; blockTwitter = true; blockBluesky = false; enableKDE = true; From a8741f7e72a47ec4d2eb9becd971b24c6578652d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 6 May 2025 21:24:53 +0300 Subject: [PATCH 0891/1768] add an if clause --- justfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index 6af9033..e9297b0 100644 --- a/justfile +++ b/justfile @@ -20,7 +20,11 @@ switch *args: check-git remove-hm-backup-files fi remove-hm-backup-files: - rm ~/.gtkrc-2.0.hmbak + #!/usr/bin/env sh + + if [ -f ~/.gtkrc-2.0.hmbak ]; then + rm ~/.gtkrc-2.0.hmbak + fi test: nh os test . From 37887343c68dce163a6ac970fb9b51f37fb77e4e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 8 May 2025 12:22:13 +0300 Subject: [PATCH 0892/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c8f4ca9..5581e7b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1746661235, + "narHash": "sha256-TAm/SnOT8AD3YKYOdjtg5Nmf/hCKEwc0USHBIoXV8qo=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "ec71b5162848e6369bdf2be8d2f1dd41cded88e8", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746468201, - "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", + "lastModified": 1746621361, + "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", + "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746536883, - "narHash": "sha256-EJax0aiJIVJlqF7QyAefZ9fi1HgGcm7U1rBkcm2Z3Ps=", + "lastModified": 1746694286, + "narHash": "sha256-qGtw+vMZ3fOpdEhHRgLFM+hyGHhKwO3aIymGgLOxxu0=", "owner": "nix-community", "repo": "nixvim", - "rev": "c26f5c2e31c1da895bf9289783ff8e2fe3637ca0", + "rev": "5fed6b9363b69913313c3b7ae0a84fa551177d03", "type": "github" }, "original": { From 7ff630ac812f426ac42ca5d5ac0d9024f7c08122 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 9 May 2025 01:14:49 +0300 Subject: [PATCH 0893/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5581e7b..be14f7a 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1746661235, - "narHash": "sha256-TAm/SnOT8AD3YKYOdjtg5Nmf/hCKEwc0USHBIoXV8qo=", + "lastModified": 1746727295, + "narHash": "sha256-0364XVBdfEA8rWfqEPvsgBqGFfq5r9LAo9CS9tvT7tg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec71b5162848e6369bdf2be8d2f1dd41cded88e8", + "rev": "a51598236f23c89e59ee77eb8e0614358b0e896c", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746694286, - "narHash": "sha256-qGtw+vMZ3fOpdEhHRgLFM+hyGHhKwO3aIymGgLOxxu0=", + "lastModified": 1746731480, + "narHash": "sha256-XRSnQSykuJc42qCaKuquy5m4X24Z0sBqkOqzGIfrWPw=", "owner": "nix-community", "repo": "nixvim", - "rev": "5fed6b9363b69913313c3b7ae0a84fa551177d03", + "rev": "36d63a7c3e0b28d0a2a798826a3b990867079b21", "type": "github" }, "original": { From 6c04528e7f7283cd9b40b25d431e9eef8a9d1b98 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 9 May 2025 01:16:50 +0300 Subject: [PATCH 0894/1768] use bluetooth in all graphic environments --- hosts/tartarus/configuration.nix | 2 -- modules/graphical-interface.nix | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 600bce5..cfb9b81 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -30,8 +30,6 @@ # Enable networking networking.networkmanager.enable = true; - hardware.bluetooth.enable = true; # enables support for Bluetooth - hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot system.stateVersion = "24.05"; # lalalalala } diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 02b82b4..20048dd 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -34,7 +34,10 @@ # Enable CUPS to print documents. services.printing.enable = true; + hardware.bluetooth.enable = true; # enables support for Bluetooth + hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot environment.systemPackages = with pkgs; [ + sddm-sugar-dark screenkey vscode From 5406163655856bb415ef6441b86f62b50ed4c7ea Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 9 May 2025 01:25:40 +0300 Subject: [PATCH 0895/1768] SYBAU direnv --- home/direnv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/direnv.nix b/home/direnv.nix index fa8bdde..dd2f637 100644 --- a/home/direnv.nix +++ b/home/direnv.nix @@ -3,5 +3,6 @@ enable = true; # enableFishIntegration = true; # why add a read-only option? nix-direnv.enable = true; + silent = true; }; } From 87255c5793bdb7739954b3c653bb83b08650f2c6 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 9 May 2025 05:14:30 +0300 Subject: [PATCH 0896/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index be14f7a..b1619c3 100644 --- a/flake.lock +++ b/flake.lock @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746731480, - "narHash": "sha256-XRSnQSykuJc42qCaKuquy5m4X24Z0sBqkOqzGIfrWPw=", + "lastModified": 1746749676, + "narHash": "sha256-782lJpCRuehoNvvyj5OJLuM3g01T1zXWEBEdZcvuiZc=", "owner": "nix-community", "repo": "nixvim", - "rev": "36d63a7c3e0b28d0a2a798826a3b990867079b21", + "rev": "a6eda59091bfb984dde882ae7faad0f48ee8e216", "type": "github" }, "original": { From 013935119947661f77b6926276498b2b38a8c42c Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 9 May 2025 20:00:22 +0300 Subject: [PATCH 0897/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b1619c3..eba5051 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1746727295, - "narHash": "sha256-0364XVBdfEA8rWfqEPvsgBqGFfq5r9LAo9CS9tvT7tg=", + "lastModified": 1746798521, + "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", "owner": "nix-community", "repo": "home-manager", - "rev": "a51598236f23c89e59ee77eb8e0614358b0e896c", + "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746749676, - "narHash": "sha256-782lJpCRuehoNvvyj5OJLuM3g01T1zXWEBEdZcvuiZc=", + "lastModified": 1746792936, + "narHash": "sha256-FjtT412SqESoKbCFQyl0sQwtS9Aqjtgcd6SpLUzwCbI=", "owner": "nix-community", "repo": "nixvim", - "rev": "a6eda59091bfb984dde882ae7faad0f48ee8e216", + "rev": "52db53cea2ea3e845526087061f0ca20b9e6e63a", "type": "github" }, "original": { From 8c4a79e763627c2117e62e6569cad3f1436d43e2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 10 May 2025 19:53:07 +0300 Subject: [PATCH 0898/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index eba5051..6bc1da1 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1746798521, - "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", + "lastModified": 1746892839, + "narHash": "sha256-0b9us0bIOgA1j/s/6zlxVyP3m97yAh0U+YwKayJ6mmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", + "rev": "12e67385964d9c9304daa81d0ad5ba3b01fdd35e", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746621361, - "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", + "lastModified": 1746814339, + "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", + "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1746792936, - "narHash": "sha256-FjtT412SqESoKbCFQyl0sQwtS9Aqjtgcd6SpLUzwCbI=", + "lastModified": 1746879234, + "narHash": "sha256-L5pwOBj/qAMhCC5QXmWSw8QrcL26bNztwpLhONaFfd8=", "owner": "nix-community", "repo": "nixvim", - "rev": "52db53cea2ea3e845526087061f0ca20b9e6e63a", + "rev": "e527939f79caa0636c7d5331e4e6c70857a1fbe0", "type": "github" }, "original": { From fe14fa1c2276603c45e567d56d794112b65c87b1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 10 May 2025 19:58:16 +0300 Subject: [PATCH 0899/1768] move this service to the pochita --- hosts/pochita/configuration.nix | 2 ++ hosts/ymir/configuration.nix | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 588aa40..70dbbca 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -24,6 +24,8 @@ enableVaultwarden = true; }; + services.wanikani-bypass-lessons.enable = true; + i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method networking.hostName = "pochita"; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 35fec59..1f90a22 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -23,7 +23,6 @@ enableMinegrubTheme = true; }; - services.wanikani-bypass-lessons.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; From d2ce325eca877bae4bbfa024eb4bae0d185f9e1c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 10 May 2025 19:59:48 +0300 Subject: [PATCH 0900/1768] dont restart this service for another 3600 seconds --- modules/services/wanikani-bypass-lessons.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 88dbcf6..19aaeac 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -41,6 +41,7 @@ echo sleep 1 done + sleep 3600 ''; }; in { From 6e43b1a0a0f61e14979b668cbf6610eadb0b5e17 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 03:47:24 +0300 Subject: [PATCH 0901/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6bc1da1..f46e002 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1746892839, - "narHash": "sha256-0b9us0bIOgA1j/s/6zlxVyP3m97yAh0U+YwKayJ6mmU=", + "lastModified": 1746912617, + "narHash": "sha256-SSw/98B3Htw7iJWCyq08fAEL5w+a/Vj+YbQq0msVFTA=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e67385964d9c9304daa81d0ad5ba3b01fdd35e", + "rev": "9ef92f1c6b77944198fd368ec805ced842352a1d", "type": "github" }, "original": { From e73b94eb2c3d450d4e05324e4e949a12f3fba4ff Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:36:32 +0300 Subject: [PATCH 0902/1768] add nextcloud --- modules/services/nextcloud.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 modules/services/nextcloud.nix diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix new file mode 100644 index 0000000..6db955c --- /dev/null +++ b/modules/services/nextcloud.nix @@ -0,0 +1,21 @@ +{ + lib, + config, + ... +}: { + options = { + myModules.enableNextcloud = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Nextcloud server"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableNextcloud { + services.nextcloud = { + enable = true; + }; + }) + ]; +} From 2b397fa413a12b7f91ed7f719ec9ad9cd226b3b8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:37:36 +0300 Subject: [PATCH 0903/1768] add nextcloud --- modules/services/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/default.nix b/modules/services/default.nix index 28ebc33..a8ad4bd 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -3,6 +3,7 @@ ./caddy.nix ./cloudflare-dyndns.nix ./cloudflared.nix + ./nextcloud.nix ./ollama.nix ./forgejo.nix ./jellyfin.nix From 665740d64492ec77927c875d054ea3d36b4775d9 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:38:37 +0300 Subject: [PATCH 0904/1768] add nextcloud to wallfacer --- hosts/wallfacer/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 08b55b5..bffe71f 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -6,6 +6,7 @@ myModules = { enableKDE = false; enableFonts = false; + enableNextcloud = true; }; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From 5568fc7853c0f47556b21f2d6746fde2dd12114e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:41:53 +0300 Subject: [PATCH 0905/1768] add nextcloud for now --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 1f90a22..2cadd5b 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -21,6 +21,7 @@ enableADB = true; enableOllama = true; enableMinegrubTheme = true; + enableNextcloud = true; }; From b1fed5be324418060a311eb543d0767d76ad9cdd Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:43:32 +0300 Subject: [PATCH 0906/1768] add new option --- modules/services/nextcloud.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 6db955c..2110cb0 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -1,6 +1,7 @@ { lib, config, + pkgs, ... }: { options = { @@ -13,8 +14,13 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableNextcloud { + environment.etc."nextcloud-admin-pass".text = "PWD"; services.nextcloud = { enable = true; + package = pkgs.nextcloud31; + hostName = "localhost"; + config.adminpassFile = "/etc/nextcloud-admin-pass"; + config.dbtype = "sqlite"; }; }) ]; From 82718ae87fd51f961b78f939c7fb18f0bdabf5ea Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:52:03 +0300 Subject: [PATCH 0907/1768] disable password --- modules/services/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 2110cb0..cf5bc72 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -14,7 +14,7 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableNextcloud { - environment.etc."nextcloud-admin-pass".text = "PWD"; + # environment.etc."nextcloud-admin-pass".text = "PWD"; services.nextcloud = { enable = true; package = pkgs.nextcloud31; From 6a75514c7b6f4071d509cff795451a0051a12e28 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:56:43 +0300 Subject: [PATCH 0908/1768] dont use ts in ymir --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 2cadd5b..1f90a22 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -21,7 +21,6 @@ enableADB = true; enableOllama = true; enableMinegrubTheme = true; - enableNextcloud = true; }; From 0798df5c69018bd2e6f48906fb8a67002b2dc1fb Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 22:57:02 +0300 Subject: [PATCH 0909/1768] =?UTF-8?q?set=20longer=20passwd=20=F0=9F=98=AD?= =?UTF-8?q?=F0=9F=99=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/services/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index cf5bc72..9f3f891 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -14,7 +14,7 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableNextcloud { - # environment.etc."nextcloud-admin-pass".text = "PWD"; + environment.etc."nextcloud-admin-pass".text = "m7eJ4KJ1NK33JE%51"; services.nextcloud = { enable = true; package = pkgs.nextcloud31; From c8dc18ad3af55c3c0e3377a02c1f4cbc2f5566e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 23:25:49 +0300 Subject: [PATCH 0910/1768] add tailscale domain --- modules/services/nextcloud.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 9f3f891..3de1e93 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -21,6 +21,9 @@ hostName = "localhost"; config.adminpassFile = "/etc/nextcloud-admin-pass"; config.dbtype = "sqlite"; + settings.trusted_domains = [ + "http://wallfacer.curl-boga.ts.net/" + ]; }; }) ]; From 64f0c23b2599ce1239833eecece50b3ffaffd59a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 11 May 2025 23:44:46 +0300 Subject: [PATCH 0911/1768] try this --- modules/services/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 3de1e93..3b224d9 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -22,7 +22,7 @@ config.adminpassFile = "/etc/nextcloud-admin-pass"; config.dbtype = "sqlite"; settings.trusted_domains = [ - "http://wallfacer.curl-boga.ts.net/" + "wallfacer.curl-boga.ts.net" ]; }; }) From 1b5e09291c02789b4ce88d3fb0a6dca15c60f5ef Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 12 May 2025 21:51:17 +0300 Subject: [PATCH 0912/1768] idk but yes --- modules/services/nextcloud.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 3b224d9..f5bac7b 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -21,6 +21,7 @@ hostName = "localhost"; config.adminpassFile = "/etc/nextcloud-admin-pass"; config.dbtype = "sqlite"; + database.createLocally = true; settings.trusted_domains = [ "wallfacer.curl-boga.ts.net" ]; From fa373cffca3e050c07387038fbc2da34874d74bc Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 12 May 2025 21:51:49 +0300 Subject: [PATCH 0913/1768] update flake.lock --- flake.lock | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index f46e002..9ee3bbb 100644 --- a/flake.lock +++ b/flake.lock @@ -126,7 +126,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1746912617, - "narHash": "sha256-SSw/98B3Htw7iJWCyq08fAEL5w+a/Vj+YbQq0msVFTA=", + "lastModified": 1747073329, + "narHash": "sha256-scQ27LiotByFatLKsqQ5VQSG7ynyXigRgA9ob3CYqkg=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ef92f1c6b77944198fd368ec805ced842352a1d", + "rev": "0b24658ec09908e5a6515cacc54f29d589c8423b", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1746330942, - "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", + "lastModified": 1746934494, + "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "137fd2bd726fff343874f85601b51769b48685cc", + "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -446,14 +446,15 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_4" }, "locked": { - "lastModified": 1746879234, - "narHash": "sha256-L5pwOBj/qAMhCC5QXmWSw8QrcL26bNztwpLhONaFfd8=", + "lastModified": 1747060741, + "narHash": "sha256-MMzdz+LvteHPJc4CH6t/g/ZlzyNxPH1XNddpTt3v+6U=", "owner": "nix-community", "repo": "nixvim", - "rev": "e527939f79caa0636c7d5331e4e6c70857a1fbe0", + "rev": "49a7bb573aa44b8464e28b1f06720f26e87c03b5", "type": "github" }, "original": { @@ -817,6 +818,21 @@ "type": "github" } }, + "systems_5": { + "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_2" From 232f064a92074d4fae109a1b8f491b2277e3cf8e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 13 May 2025 22:45:17 +0300 Subject: [PATCH 0914/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9ee3bbb..e663faa 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747073329, - "narHash": "sha256-scQ27LiotByFatLKsqQ5VQSG7ynyXigRgA9ob3CYqkg=", + "lastModified": 1747155932, + "narHash": "sha256-NnPzzXEqfYjfrimLzK0JOBItfdEJdP/i6SNTuunCGgw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b24658ec09908e5a6515cacc54f29d589c8423b", + "rev": "8d832ddfda9facf538f3dda9b6985fb0234f151c", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746814339, - "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747060741, - "narHash": "sha256-MMzdz+LvteHPJc4CH6t/g/ZlzyNxPH1XNddpTt3v+6U=", + "lastModified": 1747083534, + "narHash": "sha256-r88FEbKX1HLTovPFt1QHxzZDV7D4TGHhYlJcHmK7hYk=", "owner": "nix-community", "repo": "nixvim", - "rev": "49a7bb573aa44b8464e28b1f06720f26e87c03b5", + "rev": "ff0ccdf572ad6700a2a29a82cc5d17db29708988", "type": "github" }, "original": { From 28f012375c7798da615c77e26b2556e73fbf285e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 13 May 2025 22:45:55 +0300 Subject: [PATCH 0915/1768] update flake.lock --- flake.lock | 11 +++++------ flake.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index e663faa..bff611e 100644 --- a/flake.lock +++ b/flake.lock @@ -346,16 +346,15 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1740680619, - "narHash": "sha256-06UHfULamFsF/kyPnuJEm2EPG0E5A58lwzixU4HkTSc=", - "owner": "osbm", + "lastModified": 1747158007, + "narHash": "sha256-uwRCd2RAAdMOvReceeaWHGp8RoGjFyIouQN053MsMSk=", + "owner": "nix-community", "repo": "nix-on-droid", - "rev": "b030861919a0f6d629c09e88160b92d5341ce475", + "rev": "7f68d674b30997434868c9e93784724fdbf37367", "type": "github" }, "original": { - "owner": "osbm", - "ref": "master", + "owner": "nix-community", "repo": "nix-on-droid", "type": "github" } diff --git a/flake.nix b/flake.nix index 3b70628..69d93d0 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-on-droid = { - url = "github:osbm/nix-on-droid/master"; + url = "github:nix-community/nix-on-droid"; inputs.nixpkgs.follows = "nixpkgs"; }; osbm-nvim = { From e0720d60cae1e8705e184b57a521df1d040d4aac Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 13 May 2025 23:05:18 +0300 Subject: [PATCH 0916/1768] add waydroid to ymir --- hosts/ymir/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 1f90a22..639c717 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -45,6 +45,8 @@ enable = true; }; + virtualisation.waydroid.enable = true; + # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = ["nvidia"]; From 9c2ca21c84c4b92b166a554ffd8933155e09c051 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 14 May 2025 13:40:37 +0300 Subject: [PATCH 0917/1768] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bff611e..3ac6c0d 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747155932, - "narHash": "sha256-NnPzzXEqfYjfrimLzK0JOBItfdEJdP/i6SNTuunCGgw=", + "lastModified": 1747184352, + "narHash": "sha256-GBZulv50wztp5cgc405t1uOkxQYhSkMqeKLI+iSrlpk=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d832ddfda9facf538f3dda9b6985fb0234f151c", + "rev": "7c1cefb98369cc85440642fdccc1c1394ca6dd2c", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747083534, - "narHash": "sha256-r88FEbKX1HLTovPFt1QHxzZDV7D4TGHhYlJcHmK7hYk=", + "lastModified": 1747173002, + "narHash": "sha256-06aYCSKtw1nlDn7PEAXwAYncSn8Fky4rtYrALep7f6I=", "owner": "nix-community", "repo": "nixvim", - "rev": "ff0ccdf572ad6700a2a29a82cc5d17db29708988", + "rev": "1c53ad9b2f5fd4a3c1f644d03895cda7756c92a3", "type": "github" }, "original": { From 5946aa1696a73914fb19d85ddcb94f64f38b4008 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 14 May 2025 23:12:00 +0300 Subject: [PATCH 0918/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 3ac6c0d..5618532 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747184352, - "narHash": "sha256-GBZulv50wztp5cgc405t1uOkxQYhSkMqeKLI+iSrlpk=", + "lastModified": 1747225851, + "narHash": "sha256-4IbmZrNOdXP143kZEUzxBS5SqyxUlaSHLgdpeJfP2ZU=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c1cefb98369cc85440642fdccc1c1394ca6dd2c", + "rev": "6bf057fc8326e83bda05a669fc08d106547679fb", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747173002, - "narHash": "sha256-06aYCSKtw1nlDn7PEAXwAYncSn8Fky4rtYrALep7f6I=", + "lastModified": 1747224967, + "narHash": "sha256-we27kbNAAEeT0+PxJ2aUNVFXlJ7uvh4pxTc3R8RUqxA=", "owner": "nix-community", "repo": "nixvim", - "rev": "1c53ad9b2f5fd4a3c1f644d03895cda7756c92a3", + "rev": "95ca65c8d1adee5594bd14f527c68d564fb68879", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1746438351, - "narHash": "sha256-Y1cHw1oouYBcPe8GclrN1zGwtW3kJsigyXoJWx+E3dM=", + "lastModified": 1747217827, + "narHash": "sha256-KLCF9N1odG1uRSaGeLI+IXLrGp3MTjVW6DnuEE4PzAY=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "c871d7a1db48594fe82429f3cc71f63fa5709fdb", + "rev": "21f521695929a042c94312e6c956b9bb5f7b30a3", "type": "github" }, "original": { From e09f8b32366fc0da202a90fff89628e472ac8311 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 15 May 2025 14:10:24 +0300 Subject: [PATCH 0919/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5618532..93692e6 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747225851, - "narHash": "sha256-4IbmZrNOdXP143kZEUzxBS5SqyxUlaSHLgdpeJfP2ZU=", + "lastModified": 1747279714, + "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bf057fc8326e83bda05a669fc08d106547679fb", + "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { From 715beb859d10671a0b17b87e37dc9c3f9cf8510a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 15 May 2025 17:01:30 +0300 Subject: [PATCH 0920/1768] formatting --- hosts/tartarus/configuration.nix | 1 - hosts/ymir/configuration.nix | 1 - modules/graphical-interface.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index cfb9b81..0b1ade8 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -30,6 +30,5 @@ # Enable networking networking.networkmanager.enable = true; - system.stateVersion = "24.05"; # lalalalala } diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 639c717..9cbe2aa 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -23,7 +23,6 @@ enableMinegrubTheme = true; }; - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 20048dd..51f1f85 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -37,7 +37,6 @@ hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot environment.systemPackages = with pkgs; [ - sddm-sugar-dark screenkey vscode From c9c057bd68620e44d575b5e1d22b128280701949 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 05:34:02 +0300 Subject: [PATCH 0921/1768] disable more of this shit --- home/starship.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/starship.nix b/home/starship.nix index 517f6d8..e23b98f 100644 --- a/home/starship.nix +++ b/home/starship.nix @@ -8,6 +8,9 @@ python.disabled = true; nodejs.disabled = true; c.disabled = true; + gradle.disabled = true; + java.disabled = true; + ruby.disabled = true; }; }; } From 8a8b43d6a450f56f1505ab7e5ac380b5e9467d9b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 05:34:13 +0300 Subject: [PATCH 0922/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 93692e6..d8b4bac 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747279714, - "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", + "lastModified": 1747340209, + "narHash": "sha256-tUiXrwlJoG3dzJ+fSwv1S3VPU5ODSPZJHoBmlu4t344=", "owner": "nix-community", "repo": "home-manager", - "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", + "rev": "098e365dd83311cc8236f83ea6be42abb49a6c76", "type": "github" }, "original": { From 9c96c13842c2aef6ec2be9f082c6d443e6b05113 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 18:07:53 +0300 Subject: [PATCH 0923/1768] add service --- modules/services/default.nix | 1 + .../services/wanikani-fetch-data/default.nix | 32 ++++++++ .../wanikani-fetch-data/wanikani-fetcher.sh | 75 +++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 modules/services/wanikani-fetch-data/default.nix create mode 100755 modules/services/wanikani-fetch-data/wanikani-fetcher.sh diff --git a/modules/services/default.nix b/modules/services/default.nix index a8ad4bd..abb23c8 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -11,5 +11,6 @@ ./vaultwarden.nix ./vscode-server.nix ./wanikani-bypass-lessons.nix + ./wanikani-fetch-data ]; } diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/services/wanikani-fetch-data/default.nix new file mode 100644 index 0000000..03549ea --- /dev/null +++ b/modules/services/wanikani-fetch-data/default.nix @@ -0,0 +1,32 @@ +{pkgs, config, lib, ...}: +let + wanikani-fetcher = pkgs.writeShellApplication { + name = "wanikani-fetcher"; + runtimeInputs = with pkgs; [curl jq]; + # read script from the wanikani-fetcher.sh file + text = builtins.readFile ./wanikani-fetcher.sh; + }; +in { + options.services.wanikani-fetch-data.enable = lib.mkEnableOption { + description = "Enable WaniKani Fetch Data"; + default = false; + }; + + config = lib.mkIf config.services.wanikani-fetch-data.enable { + systemd.services.wanikani-fetch-data = { + description = "WaniKani Fetch Data"; + # just run once everyday at 2am + wantedBy = ["timers.target"]; + timerConfig = { + OnCalendar = "daily"; + Persistent = true; + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${lib.getExe wanikani-fetcher}"; + Restart = "on-failure"; + RestartSec = 60; + }; + }; + }; +} diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh new file mode 100755 index 0000000..a5f43de --- /dev/null +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash +shopt -s nullglob +API_TOKEN="2da24e4a-ba89-4c4a-9047-d08f21e9dd01" + +BASE_URL_ASSIGNMENTS= +BASE_URL_REVIEWS="https://api.wanikani.com/v2/reviews" +tmp_dir=$(mktemp -d) +echo "Temporary directory created at $tmp_dir" + +mkdir $tmp_dir/data + +fetch_and_merge() { + local topic="$1" + local counter=0 + local url="https://api.wanikani.com/v2/$topic" + local output_file="$tmp_dir/data/$topic.json" + local next_url="$url" + + echo "Fetching from $url..." + + while [[ -n "$next_url" ]]; do + local resp_file="$tmp_dir/$topic-page-$counter.json" + curl -s "$next_url" \ + -H "Wanikani-Revision: 20170710" \ + -H "Authorization: Bearer $API_TOKEN" \ + -o "$resp_file" + + echo -e "\n--- Page $((counter + 1)) (First 20 lines) ---" + cat "$resp_file" | jq | head -n 20 + + next_url=$(jq -r '.pages.next_url // empty' "$resp_file") + ((counter++)) + done + + echo "Merging data..." + + local meta + meta=$(jq '{object, total_count, data_updated_at}' "$resp_file") + local files=("$tmp_dir/$topic-page-"*.json) + jq -cn \ + --argjson meta "$meta" \ + --slurpfile data <(jq -s '[.[] | .data[]]' "${files[@]}") \ + '$meta + {data: $data[0]}' > "$output_file" + + + echo "Saved to $output_file" +} + +fetch_and_merge assignments +fetch_and_merge level_progressions +fetch_and_merge resets +fetch_and_merge reviews +fetch_and_merge review_statistics +fetch_and_merge spaced_repetition_systems +fetch_and_merge study_materials +fetch_and_merge subjects + +curl -s "https://api.wanikani.com/v2/summary" \ + -H "Wanikani-Revision: 20170710" \ + -H "Authorization: Bearer $API_TOKEN" \ + -o "$tmp_dir/data/summary.json" + +curl -s "https://api.wanikani.com/v2/user" \ + -H "Wanikani-Revision: 20170710" \ + -H "Authorization: Bearer $API_TOKEN" \ + -o "$tmp_dir/data/user.json" + + +# get the date as a variable and use it to zip the data folder +date=$(date +%Y-%m-%d) +zip -r "$tmp_dir/wanikani_data_$date.zip" "$tmp_dir/data" +echo "Data zipped to $tmp_dir/wanikani_data_$date.zip" + +echo $tmp_dir +# rm -r "$tmp_dir" \ No newline at end of file From 54f6e83fb2854bcb60e22c05c632524452c86600 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 18:07:58 +0300 Subject: [PATCH 0924/1768] enable service --- hosts/pochita/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 70dbbca..5e7937c 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -25,6 +25,7 @@ }; services.wanikani-bypass-lessons.enable = true; + services.wanikani-fetch-data.enable = true; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From 0cd6a3400c3990de438651109aa749e697ca886f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 18:56:06 +0300 Subject: [PATCH 0925/1768] try this --- modules/services/wanikani-fetch-data/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/services/wanikani-fetch-data/default.nix index 03549ea..9b15108 100644 --- a/modules/services/wanikani-fetch-data/default.nix +++ b/modules/services/wanikani-fetch-data/default.nix @@ -13,14 +13,17 @@ in { }; config = lib.mkIf config.services.wanikani-fetch-data.enable { - systemd.services.wanikani-fetch-data = { + + systemd.user.timers.wanikani-fetch-data = { description = "WaniKani Fetch Data"; - # just run once everyday at 2am wantedBy = ["timers.target"]; timerConfig = { OnCalendar = "daily"; Persistent = true; }; + }; + systemd.user.services.wanikani-fetch-data = { + description = "WaniKani Fetch Data"; serviceConfig = { Type = "oneshot"; ExecStart = "${lib.getExe wanikani-fetcher}"; From 834330aebcb2da51615bd5b7c54ca206a4ddc349 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 18:56:31 +0300 Subject: [PATCH 0926/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d8b4bac..cfd2aaf 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747340209, - "narHash": "sha256-tUiXrwlJoG3dzJ+fSwv1S3VPU5ODSPZJHoBmlu4t344=", + "lastModified": 1747374689, + "narHash": "sha256-JT/aBZqmK1LbExzwT9cPkvxKc0IC4i6tZKOPjsSWFbI=", "owner": "nix-community", "repo": "home-manager", - "rev": "098e365dd83311cc8236f83ea6be42abb49a6c76", + "rev": "d2263ce5f4c251c0f7608330e8fdb7d1f01f0667", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1747158007, - "narHash": "sha256-uwRCd2RAAdMOvReceeaWHGp8RoGjFyIouQN053MsMSk=", + "lastModified": 1747382160, + "narHash": "sha256-nlHPjA5GH4wdwnAoOzCt7BVLUKtIAAW2ClNGz2OxTrs=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "7f68d674b30997434868c9e93784724fdbf37367", + "rev": "40b8c7465f78887279a0a3c743094fa6ea671ab1", "type": "github" }, "original": { From ddd57bfbd9e11c85e01b2aa271c9304cb3928cc0 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 19:04:48 +0300 Subject: [PATCH 0927/1768] enable this in ymir for debugging --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 9cbe2aa..c3fd204 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -22,6 +22,7 @@ enableOllama = true; enableMinegrubTheme = true; }; + services.wanikani-fetch-data.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; From cf6295b0908d5f5165fce22dd25bdebb83d89693 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 19:06:24 +0300 Subject: [PATCH 0928/1768] formatting --- modules/services/wanikani-fetch-data/wanikani-fetcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index a5f43de..1fc77f7 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -71,5 +71,5 @@ date=$(date +%Y-%m-%d) zip -r "$tmp_dir/wanikani_data_$date.zip" "$tmp_dir/data" echo "Data zipped to $tmp_dir/wanikani_data_$date.zip" -echo $tmp_dir +echo "$tmp_dir" # rm -r "$tmp_dir" \ No newline at end of file From c14ae6cad94779adca80643569bc9507be02c178 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 19:07:37 +0300 Subject: [PATCH 0929/1768] formatting 2 --- modules/services/wanikani-fetch-data/wanikani-fetcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index 1fc77f7..f314537 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -7,7 +7,7 @@ BASE_URL_REVIEWS="https://api.wanikani.com/v2/reviews" tmp_dir=$(mktemp -d) echo "Temporary directory created at $tmp_dir" -mkdir $tmp_dir/data +mkdir "$tmp_dir/data" fetch_and_merge() { local topic="$1" From 05c8db2703489ef3e8db05d8338c323766654c46 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 19:08:23 +0300 Subject: [PATCH 0930/1768] formatting remove unused --- modules/services/wanikani-fetch-data/wanikani-fetcher.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index f314537..fba1bd5 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -2,8 +2,6 @@ shopt -s nullglob API_TOKEN="2da24e4a-ba89-4c4a-9047-d08f21e9dd01" -BASE_URL_ASSIGNMENTS= -BASE_URL_REVIEWS="https://api.wanikani.com/v2/reviews" tmp_dir=$(mktemp -d) echo "Temporary directory created at $tmp_dir" From e7fb48d0a565c4eacb426017ed78d89eb1d37132 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 19:12:47 +0300 Subject: [PATCH 0931/1768] UUOC my ass --- modules/services/wanikani-fetch-data/wanikani-fetcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index fba1bd5..a67f5b4 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -24,7 +24,7 @@ fetch_and_merge() { -o "$resp_file" echo -e "\n--- Page $((counter + 1)) (First 20 lines) ---" - cat "$resp_file" | jq | head -n 20 + jq "." "$resp_file" | head -n 20 next_url=$(jq -r '.pages.next_url // empty' "$resp_file") ((counter++)) From d938242a7d8fc924ec0a5ee1f4862828a8b9102f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 19:50:57 +0300 Subject: [PATCH 0932/1768] super weird bug --- modules/services/wanikani-fetch-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/services/wanikani-fetch-data/default.nix index 9b15108..c4a11b2 100644 --- a/modules/services/wanikani-fetch-data/default.nix +++ b/modules/services/wanikani-fetch-data/default.nix @@ -14,7 +14,7 @@ in { config = lib.mkIf config.services.wanikani-fetch-data.enable { - systemd.user.timers.wanikani-fetch-data = { + systemd.timers.wanikani-fetch-data = { description = "WaniKani Fetch Data"; wantedBy = ["timers.target"]; timerConfig = { @@ -22,7 +22,7 @@ in { Persistent = true; }; }; - systemd.user.services.wanikani-fetch-data = { + systemd.services.wanikani-fetch-data = { description = "WaniKani Fetch Data"; serviceConfig = { Type = "oneshot"; From ea89dd98f9339b0262be6ed833f2d92a34a831d3 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 20:33:40 +0300 Subject: [PATCH 0933/1768] jq leave me alone --- modules/services/wanikani-fetch-data/wanikani-fetcher.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index a67f5b4..5f5acb5 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -24,7 +24,7 @@ fetch_and_merge() { -o "$resp_file" echo -e "\n--- Page $((counter + 1)) (First 20 lines) ---" - jq "." "$resp_file" | head -n 20 + head -n 20 <(jq . "$resp_file") next_url=$(jq -r '.pages.next_url // empty' "$resp_file") ((counter++)) @@ -70,4 +70,5 @@ zip -r "$tmp_dir/wanikani_data_$date.zip" "$tmp_dir/data" echo "Data zipped to $tmp_dir/wanikani_data_$date.zip" echo "$tmp_dir" -# rm -r "$tmp_dir" \ No newline at end of file +# rm -r "$tmp_dir" + From 138bc8ef6c7d309e1a62acd6b29e83061b18d046 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 21:12:42 +0300 Subject: [PATCH 0934/1768] update jq command 5th time --- modules/services/wanikani-fetch-data/wanikani-fetcher.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index 5f5acb5..5e7241f 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -24,7 +24,8 @@ fetch_and_merge() { -o "$resp_file" echo -e "\n--- Page $((counter + 1)) (First 20 lines) ---" - head -n 20 <(jq . "$resp_file") + # head -n 20 <(jq . "$resp_file") + jq . "$resp_file" 2>/dev/null | head -n 20 next_url=$(jq -r '.pages.next_url // empty' "$resp_file") ((counter++)) From 570b41e50b541b5bbe8dc7ff7cc931fe939cbf6a Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 21:16:29 +0300 Subject: [PATCH 0935/1768] try this shit --- modules/services/wanikani-fetch-data/wanikani-fetcher.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index 5e7241f..d0a1cf8 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -24,11 +24,11 @@ fetch_and_merge() { -o "$resp_file" echo -e "\n--- Page $((counter + 1)) (First 20 lines) ---" - # head -n 20 <(jq . "$resp_file") - jq . "$resp_file" 2>/dev/null | head -n 20 + head -n 20 <(jq . "$resp_file") + # jq . "$resp_file" 2>/dev/null | head -n 20 next_url=$(jq -r '.pages.next_url // empty' "$resp_file") - ((counter++)) + counter=$((counter + 1)) done echo "Merging data..." From 071c987625ad96538baa761acdca6608839b8561 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 21:23:43 +0300 Subject: [PATCH 0936/1768] add missing dep --- modules/services/wanikani-fetch-data/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/services/wanikani-fetch-data/default.nix index c4a11b2..2bb37ac 100644 --- a/modules/services/wanikani-fetch-data/default.nix +++ b/modules/services/wanikani-fetch-data/default.nix @@ -2,7 +2,7 @@ let wanikani-fetcher = pkgs.writeShellApplication { name = "wanikani-fetcher"; - runtimeInputs = with pkgs; [curl jq]; + runtimeInputs = with pkgs; [curl jq zip]; # read script from the wanikani-fetcher.sh file text = builtins.readFile ./wanikani-fetcher.sh; }; From bcdd2df1a900a095a243d683d75e5e34d7c0092d Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 16 May 2025 23:47:12 +0300 Subject: [PATCH 0937/1768] try this for size --- modules/services/wanikani-fetch-data/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/services/wanikani-fetch-data/default.nix index 2bb37ac..a73f637 100644 --- a/modules/services/wanikani-fetch-data/default.nix +++ b/modules/services/wanikani-fetch-data/default.nix @@ -18,8 +18,7 @@ in { description = "WaniKani Fetch Data"; wantedBy = ["timers.target"]; timerConfig = { - OnCalendar = "daily"; - Persistent = true; + OnCalendar = "02:00"; }; }; systemd.services.wanikani-fetch-data = { From 25e59428436d1a21d72a03f072c159cfd0a1257e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 17 May 2025 00:16:58 +0300 Subject: [PATCH 0938/1768] ultimate bash scripting --- .../wanikani-fetch-data/wanikani-fetcher.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh index d0a1cf8..219d4a6 100755 --- a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh +++ b/modules/services/wanikani-fetch-data/wanikani-fetcher.sh @@ -1,11 +1,19 @@ #!/usr/bin/env bash shopt -s nullglob API_TOKEN="2da24e4a-ba89-4c4a-9047-d08f21e9dd01" +date=$(date +%Y-%m-%d) + +# check if todays date is already in the logs folder +if [ -f "/var/lib/wanikani-logs/wanikani_data_$date.zip" ]; then + echo "Data for today already exists. Exiting..." + exit 0 +fi tmp_dir=$(mktemp -d) echo "Temporary directory created at $tmp_dir" mkdir "$tmp_dir/data" +mkdir -p "/var/lib/wanikani-logs" fetch_and_merge() { local topic="$1" @@ -66,10 +74,9 @@ curl -s "https://api.wanikani.com/v2/user" \ # get the date as a variable and use it to zip the data folder -date=$(date +%Y-%m-%d) -zip -r "$tmp_dir/wanikani_data_$date.zip" "$tmp_dir/data" -echo "Data zipped to $tmp_dir/wanikani_data_$date.zip" +zip -j -r "/var/lib/wanikani-logs/wanikani_data_$date.zip" "$tmp_dir/data" +echo "Data zipped to /var/lib/wanikani-logs/wanikani_data_$date.zip" -echo "$tmp_dir" -# rm -r "$tmp_dir" +echo "Cleaning up temporary files..." +rm -r "$tmp_dir" From 05e0332aa42811e1edcb36779f44fec99bfb7e90 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 17 May 2025 00:17:03 +0300 Subject: [PATCH 0939/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cfd2aaf..f1d7a23 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747374689, - "narHash": "sha256-JT/aBZqmK1LbExzwT9cPkvxKc0IC4i6tZKOPjsSWFbI=", + "lastModified": 1747427366, + "narHash": "sha256-c3UfEsnT94bt6ta1VELYQhAWkQWFGlB+7DmBmthlGGg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2263ce5f4c251c0f7608330e8fdb7d1f01f0667", + "rev": "74d31e1165341bf510ee2017841a599f5cfc1608", "type": "github" }, "original": { From 1b3ccd811d15881fbaa6037993f9e189b95bd4e7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 17 May 2025 00:17:33 +0300 Subject: [PATCH 0940/1768] disable ymir --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index c3fd204..9cbe2aa 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -22,7 +22,6 @@ enableOllama = true; enableMinegrubTheme = true; }; - services.wanikani-fetch-data.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; From 98d2b5732ec63853d5fb7718166f9d52b319988d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 17 May 2025 00:38:33 +0300 Subject: [PATCH 0941/1768] formatting --- hosts/pochita/configuration.nix | 1 - modules/services/wanikani-fetch-data/default.nix | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 5e7937c..a5ce70a 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -1,5 +1,4 @@ { - config, pkgs, lib, inputs, diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/services/wanikani-fetch-data/default.nix index a73f637..4193052 100644 --- a/modules/services/wanikani-fetch-data/default.nix +++ b/modules/services/wanikani-fetch-data/default.nix @@ -1,19 +1,21 @@ -{pkgs, config, lib, ...}: -let +{ + pkgs, + config, + lib, + ... +}: let wanikani-fetcher = pkgs.writeShellApplication { name = "wanikani-fetcher"; runtimeInputs = with pkgs; [curl jq zip]; - # read script from the wanikani-fetcher.sh file text = builtins.readFile ./wanikani-fetcher.sh; }; -in { +in { options.services.wanikani-fetch-data.enable = lib.mkEnableOption { description = "Enable WaniKani Fetch Data"; default = false; }; config = lib.mkIf config.services.wanikani-fetch-data.enable { - systemd.timers.wanikani-fetch-data = { description = "WaniKani Fetch Data"; wantedBy = ["timers.target"]; From b91f9db4d26ac7a69343e94632c8a8f8cd4a767b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 18 May 2025 15:10:26 +0300 Subject: [PATCH 0942/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f1d7a23..12cf547 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747514353, + "narHash": "sha256-E1WjB+zvDw4x058mg3MIdK5j2huvnNpTEEt2brhg2H8=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "6697e8babbd8f323dfd5e28f160a0128582c128b", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747427366, - "narHash": "sha256-c3UfEsnT94bt6ta1VELYQhAWkQWFGlB+7DmBmthlGGg=", + "lastModified": 1747565775, + "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", "owner": "nix-community", "repo": "home-manager", - "rev": "74d31e1165341bf510ee2017841a599f5cfc1608", + "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1746934494, - "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747224967, - "narHash": "sha256-we27kbNAAEeT0+PxJ2aUNVFXlJ7uvh4pxTc3R8RUqxA=", + "lastModified": 1747524500, + "narHash": "sha256-XC5jm9hZ3SUw+AD5ARcDVhizuRF2zYsCa34NO5lSuO8=", "owner": "nix-community", "repo": "nixvim", - "rev": "95ca65c8d1adee5594bd14f527c68d564fb68879", + "rev": "5474f9a33f1d6a3d98eaea73c980e0c05af6849e", "type": "github" }, "original": { From e33a90b3ff1f1d383fa92c933ad77c6612e7dd19 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 19 May 2025 16:52:05 +0300 Subject: [PATCH 0943/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 12cf547..ca51993 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747514353, - "narHash": "sha256-E1WjB+zvDw4x058mg3MIdK5j2huvnNpTEEt2brhg2H8=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "6697e8babbd8f323dfd5e28f160a0128582c128b", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747524500, - "narHash": "sha256-XC5jm9hZ3SUw+AD5ARcDVhizuRF2zYsCa34NO5lSuO8=", + "lastModified": 1747607161, + "narHash": "sha256-73mz+f6XlVsRxLbjQeCrgW7mZnUihoPoHDa+GIg2j/o=", "owner": "nix-community", "repo": "nixvim", - "rev": "5474f9a33f1d6a3d98eaea73c980e0c05af6849e", + "rev": "563fdaeef95599e584fcff2e8f8d6f72011ffb99", "type": "github" }, "original": { From 790738512895d6fc4d4f280287d71fe6bc88729d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 19 May 2025 17:25:43 +0300 Subject: [PATCH 0944/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ca51993..5d70cdd 100644 --- a/flake.lock +++ b/flake.lock @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747607161, - "narHash": "sha256-73mz+f6XlVsRxLbjQeCrgW7mZnUihoPoHDa+GIg2j/o=", + "lastModified": 1747610601, + "narHash": "sha256-vfK+K+bQZF5fHdsyjDECx6t5yv6Gg51B6i4AVvneAxU=", "owner": "nix-community", "repo": "nixvim", - "rev": "563fdaeef95599e584fcff2e8f8d6f72011ffb99", + "rev": "f4a7447d27d3c43c59555c053c203f1abb45e899", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1747217827, - "narHash": "sha256-KLCF9N1odG1uRSaGeLI+IXLrGp3MTjVW6DnuEE4PzAY=", + "lastModified": 1747664732, + "narHash": "sha256-zQFAX6lWH0UKgbGSZ5cga8QT+YfGAZLKoWvFWGI5Hqg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "21f521695929a042c94312e6c956b9bb5f7b30a3", + "rev": "7568f6ed0daa22d33766b47c6ab7adc4b065a875", "type": "github" }, "original": { From 5950b6979aa4b1903b8e015564f858971d1559b5 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 21 May 2025 00:00:43 +0300 Subject: [PATCH 0945/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 5d70cdd..2a7d8d5 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747565775, - "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", + "lastModified": 1747763032, + "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", + "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1747723695, + "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747610601, - "narHash": "sha256-vfK+K+bQZF5fHdsyjDECx6t5yv6Gg51B6i4AVvneAxU=", + "lastModified": 1747743401, + "narHash": "sha256-AXk6mf9ySe44faNUGhD1mZud/kB7X+Nipzo2YxHet4s=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4a7447d27d3c43c59555c053c203f1abb45e899", + "rev": "47dba84e0d068a2b8c07faa0ec737ea98a226537", "type": "github" }, "original": { From 87ae5b1bef0d961b88c07a7c7dd37868ebfcbe07 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 21 May 2025 16:09:08 +0300 Subject: [PATCH 0946/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2a7d8d5..240dea0 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1747793476, + "narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "2468b2d35512d093aeb04972a1d8c20a0735793f", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { From fc838446d9bca635e2fee1faae46137162926571 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 21 May 2025 16:11:05 +0300 Subject: [PATCH 0947/1768] add open-webui to the allowed list --- modules/nix-settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 5ebfc7c..1f27722 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -15,6 +15,7 @@ "obsidian" "steam" "steam-unwrapped" + "open-webui" # nvidia related (i have to) "nvidia-x11" "cuda_cudart" From 90cf0e7256cfc4feb8937d9c706e9a09ffa93a1b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 23 May 2025 04:25:58 +0300 Subject: [PATCH 0948/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 240dea0..8efde6b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747793476, - "narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=", + "lastModified": 1747955385, + "narHash": "sha256-AKoBFaEGN02tGvBlkwVIDOGXouHvrTTfOUcvBDGxkxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2468b2d35512d093aeb04972a1d8c20a0735793f", + "rev": "a868570581f0dbdef7e33c8c9bb34b735dfcbacf", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747743401, - "narHash": "sha256-AXk6mf9ySe44faNUGhD1mZud/kB7X+Nipzo2YxHet4s=", + "lastModified": 1747945641, + "narHash": "sha256-Ts16c+kptbC3YDwPcB/NqXFVMHPNYKeFD7LkiawbWCU=", "owner": "nix-community", "repo": "nixvim", - "rev": "47dba84e0d068a2b8c07faa0ec737ea98a226537", + "rev": "46fd0b184cbc5f1bdc5a8325cb973fc54e49ab68", "type": "github" }, "original": { From f9b4b013f6bcb7cb1764014425829975aa679449 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 25 May 2025 02:29:35 +0300 Subject: [PATCH 0949/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8efde6b..cc741c5 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1747955385, - "narHash": "sha256-AKoBFaEGN02tGvBlkwVIDOGXouHvrTTfOUcvBDGxkxQ=", + "lastModified": 1748119343, + "narHash": "sha256-/3J/o+qZrn3IJdbi+jde+W0jHA/OAeqa3hH6VA53DWA=", "owner": "nix-community", "repo": "home-manager", - "rev": "a868570581f0dbdef7e33c8c9bb34b735dfcbacf", + "rev": "8fc1e46ab6d5daac4563c2a3684d68cc0106f458", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1747945641, - "narHash": "sha256-Ts16c+kptbC3YDwPcB/NqXFVMHPNYKeFD7LkiawbWCU=", + "lastModified": 1748088865, + "narHash": "sha256-xfAT2ykSAWcYgxkyZN5n6xRHab93u56zbBjuhoDFKFg=", "owner": "nix-community", "repo": "nixvim", - "rev": "46fd0b184cbc5f1bdc5a8325cb973fc54e49ab68", + "rev": "2c0a9ff1e2bcc6aab15caa504a7c9670f6e0a929", "type": "github" }, "original": { From a7c152448ad1d15fe3731e886115fb3eae8fca9c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 25 May 2025 13:26:26 +0300 Subject: [PATCH 0950/1768] fix: correct alias for listing files from 'exa' to 'eza' --- home/fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/fish.nix b/home/fish.nix index 7c39636..830f42d 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -7,7 +7,7 @@ shellAliases = { c = "code ."; l = "ls -lah"; - ll = "exa -la -F --icons --git --group-directories-first --git"; + ll = "eza -la -F --icons --git --group-directories-first --git"; free = "free -h"; df = "df -h"; du = "du -h"; From 13148a680e3eca1244e7dcccf92acfb24ca27bb2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 25 May 2025 13:26:35 +0300 Subject: [PATCH 0951/1768] feat: add fd and du-dust to system packages --- modules/common-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 4912aab..e6314f4 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -44,7 +44,9 @@ comma nix-inspect bat - ]; + fd + du-dust + ]; environment.variables = { EDITOR = "nvim"; From 30d8f6d10716fdc924e73443a850683e4dad1e30 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 25 May 2025 23:49:37 +0300 Subject: [PATCH 0952/1768] add ghostty to flake --- home/ghostty.nix | 11 +++++++++++ home/home.nix | 1 + 2 files changed, 12 insertions(+) create mode 100644 home/ghostty.nix diff --git a/home/ghostty.nix b/home/ghostty.nix new file mode 100644 index 0000000..995cad0 --- /dev/null +++ b/home/ghostty.nix @@ -0,0 +1,11 @@ +{ + pkgs, + lib, + ... +}: { + programs.ghosty = { + enable = true; + settings = { + }; + }; +} diff --git a/home/home.nix b/home/home.nix index 5c92228..744a3b6 100644 --- a/home/home.nix +++ b/home/home.nix @@ -6,6 +6,7 @@ imports = [ ./alacritty.nix ./tmux + ./ghostty.nix ./git.nix ./gtk.nix ./ssh.nix From b3d8b0841c6284f4b46bdd48d14e86f08538163d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 25 May 2025 23:50:20 +0300 Subject: [PATCH 0953/1768] hotfix --- home/ghostty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/ghostty.nix b/home/ghostty.nix index 995cad0..ea857af 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -3,7 +3,7 @@ lib, ... }: { - programs.ghosty = { + programs.ghostty = { enable = true; settings = { }; From ebd85f69f16dbe21cd0f8717685757a87cff8773 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 27 May 2025 12:41:47 +0300 Subject: [PATCH 0954/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cc741c5..0de85c0 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748119343, - "narHash": "sha256-/3J/o+qZrn3IJdbi+jde+W0jHA/OAeqa3hH6VA53DWA=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8fc1e46ab6d5daac4563c2a3684d68cc0106f458", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1747540584, - "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", + "lastModified": 1748145500, + "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", + "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748088865, - "narHash": "sha256-xfAT2ykSAWcYgxkyZN5n6xRHab93u56zbBjuhoDFKFg=", + "lastModified": 1748261770, + "narHash": "sha256-X+QUzjjZ64lZzzd1dkxIGoLHkJvmDqoEHhx81Mmx0rw=", "owner": "nix-community", "repo": "nixvim", - "rev": "2c0a9ff1e2bcc6aab15caa504a7c9670f6e0a929", + "rev": "91ee94cde3d5fdde68550ac861fd0644ff47109f", "type": "github" }, "original": { From 2590959e21d78566cbd89cc0a001c212830e66ed Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 28 May 2025 01:23:49 +0300 Subject: [PATCH 0955/1768] Revert "update flake.lock" This reverts commit ebd85f69f16dbe21cd0f8717685757a87cff8773. --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0de85c0..cc741c5 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748227609, - "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", + "lastModified": 1748119343, + "narHash": "sha256-/3J/o+qZrn3IJdbi+jde+W0jHA/OAeqa3hH6VA53DWA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", + "rev": "8fc1e46ab6d5daac4563c2a3684d68cc0106f458", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1748145500, - "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", + "lastModified": 1747540584, + "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", + "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748261770, - "narHash": "sha256-X+QUzjjZ64lZzzd1dkxIGoLHkJvmDqoEHhx81Mmx0rw=", + "lastModified": 1748088865, + "narHash": "sha256-xfAT2ykSAWcYgxkyZN5n6xRHab93u56zbBjuhoDFKFg=", "owner": "nix-community", "repo": "nixvim", - "rev": "91ee94cde3d5fdde68550ac861fd0644ff47109f", + "rev": "2c0a9ff1e2bcc6aab15caa504a7c9670f6e0a929", "type": "github" }, "original": { From d7cf13e8c046a6b35a55381be6d42955ec81bf09 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 28 May 2025 01:25:10 +0300 Subject: [PATCH 0956/1768] disable youtube --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 9cbe2aa..4ea4e22 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -9,7 +9,7 @@ ]; myModules = { - blockYoutube = false; + blockYoutube = true; blockTwitter = true; blockBluesky = false; enableKDE = true; From 68b6fec533e7ca8ec814a5270afbbd7739ac2395 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 29 May 2025 09:53:35 +0300 Subject: [PATCH 0957/1768] update flake.lock --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index cc741c5..586018e 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748119343, - "narHash": "sha256-/3J/o+qZrn3IJdbi+jde+W0jHA/OAeqa3hH6VA53DWA=", + "lastModified": 1748489961, + "narHash": "sha256-uGnudxMoQi2c8rpPoHXuQSm80NBqlOiNF4xdT3hhzLM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8fc1e46ab6d5daac4563c2a3684d68cc0106f458", + "rev": "95c988cf08e9a5a8fe7cc275d5e3f24e9e87bd51", "type": "github" }, "original": { @@ -197,16 +197,16 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1747540584, - "narHash": "sha256-cxCQ413JTUuRv9Ygd8DABJ1D6kuB/nTfQqC0Lu9C0ls=", + "lastModified": 1748145500, + "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec179dd13fb7b4c6844f55be91436f7857226dce", + "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748088865, - "narHash": "sha256-xfAT2ykSAWcYgxkyZN5n6xRHab93u56zbBjuhoDFKFg=", + "lastModified": 1748477044, + "narHash": "sha256-X6tA9XTFhgZqZGUCqP8F8/Fl0/ZQoo4husc3JoHa0fk=", "owner": "nix-community", "repo": "nixvim", - "rev": "2c0a9ff1e2bcc6aab15caa504a7c9670f6e0a929", + "rev": "28a2abf874c3ecbbf91edf1b2b9fe595f0f54099", "type": "github" }, "original": { @@ -542,11 +542,11 @@ ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1748298102, + "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", "type": "github" }, "original": { From 8cf567fdc42658dae27e0aeab7a0be1e0b9e4d5e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 29 May 2025 10:54:05 +0300 Subject: [PATCH 0958/1768] this is a stupid way to do this shit --- home/alacritty.nix | 36 ++++++++++++++++++++---------------- home/ghostty.nix | 11 ++++++++--- home/home.nix | 2 ++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/home/alacritty.nix b/home/alacritty.nix index 3237b7b..a32a5d6 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -1,25 +1,29 @@ { pkgs, lib, + config, ... }: { - programs.alacritty = { - enable = true; - settings = { - font = { - size = 17.0; - normal.family = "Cascadia Code"; + options.enableAlacritty = lib.mkEnableOption "Alacritty terminal emulator"; + config = { + programs.alacritty = { + enable = config.enableAlacritty; + settings = { + font = { + size = 17.0; + normal.family = "Cascadia Code"; + }; + terminal.shell = { + args = ["new-session" "-A" "-s" "general"]; + program = lib.getExe pkgs.tmux; + }; + window = { + decorations = "None"; + opacity = 1; + startup_mode = "Maximized"; + }; + env.TERM = "xterm-256color"; }; - terminal.shell = { - args = ["new-session" "-A" "-s" "general"]; - program = lib.getExe pkgs.tmux; - }; - window = { - decorations = "None"; - opacity = 1; - startup_mode = "Maximized"; - }; - env.TERM = "xterm-256color"; }; }; } diff --git a/home/ghostty.nix b/home/ghostty.nix index ea857af..1d5a1b2 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -1,11 +1,16 @@ { pkgs, lib, + config, ... }: { - programs.ghostty = { - enable = true; - settings = { + options.enableGhostty = lib.mkEnableOption "Ghostty terminal emulator"; + config = { + programs.ghostty = { + enable = config.enableGhostty; + settings = { + }; }; }; + } diff --git a/home/home.nix b/home/home.nix index 744a3b6..c5bf464 100644 --- a/home/home.nix +++ b/home/home.nix @@ -30,4 +30,6 @@ enableGTK = config.myModules.enableKDE; enableFirefox = config.myModules.enableKDE; + enableAlacritty = config.myModules.enableKDE; + enableGhostty = config.myModules.enableKDE; } From 1ddc62322bbb60b4f31648efe74d371292a68d0c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 29 May 2025 12:35:39 +0300 Subject: [PATCH 0959/1768] formatting --- home/ghostty.nix | 1 - modules/common-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/home/ghostty.nix b/home/ghostty.nix index 1d5a1b2..8f6703f 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -12,5 +12,4 @@ }; }; }; - } diff --git a/modules/common-packages.nix b/modules/common-packages.nix index e6314f4..77ef929 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -46,7 +46,7 @@ bat fd du-dust - ]; + ]; environment.variables = { EDITOR = "nvim"; From e4855393b731583c151f3889b2cca2ac6de38da0 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 30 May 2025 18:03:33 +0300 Subject: [PATCH 0960/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 586018e..2a0b0e5 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748489961, - "narHash": "sha256-uGnudxMoQi2c8rpPoHXuQSm80NBqlOiNF4xdT3hhzLM=", + "lastModified": 1748610552, + "narHash": "sha256-bCBPjZ3ukUbAaCIDzGmvA+ZcMNk4+YIWLM8cks0jiic=", "owner": "nix-community", "repo": "home-manager", - "rev": "95c988cf08e9a5a8fe7cc275d5e3f24e9e87bd51", + "rev": "482c306ef70785f53d9d90839b6b5643521ac031", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748613622, + "narHash": "sha256-SLB2MV138ujdjw0ETEakNt/o2O+d/QtvNLlwaBZSWKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "b9d69212b5e65620e7d5b08df818db656f7fefb3", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748477044, - "narHash": "sha256-X6tA9XTFhgZqZGUCqP8F8/Fl0/ZQoo4husc3JoHa0fk=", + "lastModified": 1748521000, + "narHash": "sha256-EnXH5PIrZBoe8U09hPQr2kOuPTZSqAJy78DqUVLmWXg=", "owner": "nix-community", "repo": "nixvim", - "rev": "28a2abf874c3ecbbf91edf1b2b9fe595f0f54099", + "rev": "a9e45072d82374dd3f0d971795e7d7f99e5bc6c2", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1747664732, - "narHash": "sha256-zQFAX6lWH0UKgbGSZ5cga8QT+YfGAZLKoWvFWGI5Hqg=", + "lastModified": 1748514129, + "narHash": "sha256-9QYZcoEl9HsiEYFyA68Zb7TZXodkDttFZFGKD234ZEw=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "7568f6ed0daa22d33766b47c6ab7adc4b065a875", + "rev": "cedab38bfd8e2ceabe020dd523e66350a3f5d535", "type": "github" }, "original": { From e7b1cef950ab9bf2955063c83a6223254719a4ab Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Jun 2025 12:26:50 +0300 Subject: [PATCH 0961/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2a0b0e5..6a1f4c3 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748610552, - "narHash": "sha256-bCBPjZ3ukUbAaCIDzGmvA+ZcMNk4+YIWLM8cks0jiic=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "482c306ef70785f53d9d90839b6b5643521ac031", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -321,11 +321,11 @@ ] }, "locked": { - "lastModified": 1748145500, - "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", + "lastModified": 1748751003, + "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", + "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748613622, - "narHash": "sha256-SLB2MV138ujdjw0ETEakNt/o2O+d/QtvNLlwaBZSWKg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b9d69212b5e65620e7d5b08df818db656f7fefb3", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748521000, - "narHash": "sha256-EnXH5PIrZBoe8U09hPQr2kOuPTZSqAJy78DqUVLmWXg=", + "lastModified": 1748564405, + "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", "owner": "nix-community", "repo": "nixvim", - "rev": "a9e45072d82374dd3f0d971795e7d7f99e5bc6c2", + "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", "type": "github" }, "original": { From e657ee33bb95b704b76d843decff8da292975362 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Jun 2025 12:33:09 +0300 Subject: [PATCH 0962/1768] add mpv --- home/mpv.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 home/mpv.nix diff --git a/home/mpv.nix b/home/mpv.nix new file mode 100644 index 0000000..c4f907b --- /dev/null +++ b/home/mpv.nix @@ -0,0 +1,6 @@ +{ + programs.mpv = { + enable = true; + + }; +} From 07902bba6eb498d547709e2ad8d990dd9c2ae8e2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 1 Jun 2025 20:51:29 +0300 Subject: [PATCH 0963/1768] formatting --- home/mpv.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/mpv.nix b/home/mpv.nix index c4f907b..8c80492 100644 --- a/home/mpv.nix +++ b/home/mpv.nix @@ -1,6 +1,5 @@ { programs.mpv = { enable = true; - }; } From bb4781f23d49a9202364696e5d7fdb4b994c0406 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Jun 2025 11:32:42 +0300 Subject: [PATCH 0964/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6a1f4c3..be34a9d 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748737919, - "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "5675a9686851d9626560052a032c4e14e533c1fa", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1748514129, - "narHash": "sha256-9QYZcoEl9HsiEYFyA68Zb7TZXodkDttFZFGKD234ZEw=", + "lastModified": 1748815765, + "narHash": "sha256-+XZY2Iw3XE4LGnpXqr8LnAFQxJWbRc4pCuEnHEwVPYE=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "cedab38bfd8e2ceabe020dd523e66350a3f5d535", + "rev": "c601f9989ade6b13525483fb0e3a68ba44164e29", "type": "github" }, "original": { From e0793b3fc427f96679384669301b80522a879360 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 2 Jun 2025 23:53:01 +0300 Subject: [PATCH 0965/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index be34a9d..e47eb26 100644 --- a/flake.lock +++ b/flake.lock @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748564405, - "narHash": "sha256-uCmQLJmdg0gKWBs+vhNmS9RIPJW8/ddo6TvQ/a4gupc=", + "lastModified": 1748877332, + "narHash": "sha256-pcAqUaMtxR1l//kugWqclFXKNQKCJQz9zO61JySGP7A=", "owner": "nix-community", "repo": "nixvim", - "rev": "8b3a69cfea5ba2fa008c6c57ab79c99c513a349b", + "rev": "65d35db5cac209cf5acd3dfd40aee98840cfc127", "type": "github" }, "original": { From 9fefaeacc1b7949be48b4b13c4cbd283a41d50c3 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 4 Jun 2025 14:30:14 +0300 Subject: [PATCH 0966/1768] add some graphical tools --- modules/graphical-interface.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 51f1f85..41bb076 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -37,6 +37,8 @@ hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot environment.systemPackages = with pkgs; [ + blender + inkscape sddm-sugar-dark screenkey vscode From 9a1e134a7f63fde0bd1cbefde63d76faee4c4479 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 4 Jun 2025 14:31:37 +0300 Subject: [PATCH 0967/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e47eb26..62586a8 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748830238, - "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", + "lastModified": 1748979197, + "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=", "owner": "nix-community", "repo": "home-manager", - "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", + "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1748877332, - "narHash": "sha256-pcAqUaMtxR1l//kugWqclFXKNQKCJQz9zO61JySGP7A=", + "lastModified": 1749028068, + "narHash": "sha256-ebxyRA7rK6Jb3eXvz+0QcyKLHzUnUQWRFDbKleLdLZ8=", "owner": "nix-community", "repo": "nixvim", - "rev": "65d35db5cac209cf5acd3dfd40aee98840cfc127", + "rev": "1d8724144cef98dad6638e0b6333cc84d0b2f5c3", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1748815765, - "narHash": "sha256-+XZY2Iw3XE4LGnpXqr8LnAFQxJWbRc4pCuEnHEwVPYE=", + "lastModified": 1748897770, + "narHash": "sha256-ltXMn1AM8U03VCmvuwFB0TYgV/lUjkyl/pvJ9iFwIl0=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "c601f9989ade6b13525483fb0e3a68ba44164e29", + "rev": "e81909fefe7910f4553b64d296daef34c832c526", "type": "github" }, "original": { From 214bdeda84e0560237488bad5012592a1435d657 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 5 Jun 2025 18:24:35 +0300 Subject: [PATCH 0968/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 62586a8..5ea99d2 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1727447169, - "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", + "lastModified": 1749105467, + "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", + "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1748979197, - "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=", + "lastModified": 1749131129, + "narHash": "sha256-tJ+93i7N4QttM75bE8T09LlSU3Mv6Dfi9WaVBvlWilo=", "owner": "nix-community", "repo": "home-manager", - "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3", + "rev": "13a45ede6c17b5e923dfc18a40a3f646436f4809", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748942041, - "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", + "lastModified": 1749056381, + "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", + "rev": "029bd66faa180e11262dd1bc2732254c33415f52", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749028068, - "narHash": "sha256-ebxyRA7rK6Jb3eXvz+0QcyKLHzUnUQWRFDbKleLdLZ8=", + "lastModified": 1749107808, + "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", "owner": "nix-community", "repo": "nixvim", - "rev": "1d8724144cef98dad6638e0b6333cc84d0b2f5c3", + "rev": "635a9e770f77a7c586c60f84b1debf054318034a", "type": "github" }, "original": { @@ -837,11 +837,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { From 10dc94d5200e245fe9296a27cdefea273893868d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 16:19:00 +0300 Subject: [PATCH 0969/1768] formatting --- home/ghostty.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/ghostty.nix b/home/ghostty.nix index 8f6703f..913ecb7 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... From 85f603b6000bd478bcfdb838469286dccf807733 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 18:35:39 +0300 Subject: [PATCH 0970/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 5ea99d2..9a5f72e 100644 --- a/flake.lock +++ b/flake.lock @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1749131129, - "narHash": "sha256-tJ+93i7N4QttM75bE8T09LlSU3Mv6Dfi9WaVBvlWilo=", + "lastModified": 1749243446, + "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "owner": "nix-community", "repo": "home-manager", - "rev": "13a45ede6c17b5e923dfc18a40a3f646436f4809", + "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749056381, - "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "029bd66faa180e11262dd1bc2732254c33415f52", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -449,11 +449,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749107808, - "narHash": "sha256-ohLHvWmAuH4aHOCAGP1UlwRRxX21/eW+N2e7eB0kQeo=", + "lastModified": 1749200997, + "narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=", "owner": "nix-community", "repo": "nixvim", - "rev": "635a9e770f77a7c586c60f84b1debf054318034a", + "rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1748897770, - "narHash": "sha256-ltXMn1AM8U03VCmvuwFB0TYgV/lUjkyl/pvJ9iFwIl0=", + "lastModified": 1749137113, + "narHash": "sha256-lugcYABIqZPzcvnwYJlpqrkbrA9g/fDhhgektjfLBrc=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "e81909fefe7910f4553b64d296daef34c832c526", + "rev": "8af06711b8ae616345d3a2774113a4ab8a0d345f", "type": "github" }, "original": { From d9f97813ced2c60b788f3a43a1396714b2e552dd Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 19:51:52 +0300 Subject: [PATCH 0971/1768] use other vscode server --- flake.lock | 57 +----------------------------- flake.nix | 4 --- modules/services/vscode-server.nix | 15 ++++---- 3 files changed, 10 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 9a5f72e..2a7bf54 100644 --- a/flake.lock +++ b/flake.lock @@ -124,24 +124,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -618,8 +600,7 @@ "nixpkgs": "nixpkgs", "nixvim": "nixvim", "osbm-nvim": "osbm-nvim", - "raspberry-pi-nix": "raspberry-pi-nix", - "vscode-server": "vscode-server" + "raspberry-pi-nix": "raspberry-pi-nix" } }, "rpi-bluez-firmware-src": { @@ -817,21 +798,6 @@ "type": "github" } }, - "systems_5": { - "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_2" @@ -849,27 +815,6 @@ "repo": "flake-utils", "type": "github" } - }, - "vscode-server": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729422940, - "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=", - "owner": "nix-community", - "repo": "nixos-vscode-server", - "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-vscode-server", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 69d93d0..0ffb4a2 100644 --- a/flake.nix +++ b/flake.nix @@ -41,10 +41,6 @@ raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; - vscode-server = { - url = "github:nix-community/nixos-vscode-server"; - inputs.nixpkgs.follows = "nixpkgs"; - }; deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 46a9580..ef807e7 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -1,7 +1,10 @@ -{inputs, ...}: { - imports = [ - inputs.vscode-server.nixosModules.default - ]; - - services.vscode-server.enable = true; +{ + services.code-server = { + enable = true; + port = 4444; + disableTelemetry = true; + disableUpdateCheck = true; + host = "localhost"; + hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; + }; } From e221828bba748822f636a9ed344ac602863f17db Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 20:29:31 +0300 Subject: [PATCH 0972/1768] enable the vscode port --- modules/services/vscode-server.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index ef807e7..d758a87 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -1,4 +1,4 @@ -{ +{config, ...}:{ services.code-server = { enable = true; port = 4444; @@ -7,4 +7,5 @@ host = "localhost"; hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; }; + networking.firewall.allowedTCPPorts = [config.services.code-server.port]; } From 242800a5ae8ceb87050e681f31329e4f60b65cb6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 20:31:23 +0300 Subject: [PATCH 0973/1768] update the user to see if i can use my own files with this --- modules/services/vscode-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index d758a87..463adef 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -4,6 +4,7 @@ port = 4444; disableTelemetry = true; disableUpdateCheck = true; + user = "osbm"; host = "localhost"; hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; }; From 96af36018a003398e3eb83b67275937ef6273137 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 21:02:52 +0300 Subject: [PATCH 0974/1768] test if allowing udp allows the connection --- modules/services/vscode-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 463adef..63564f5 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -9,4 +9,5 @@ hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; }; networking.firewall.allowedTCPPorts = [config.services.code-server.port]; + networking.firewall.allowedUDPPorts = [config.services.code-server.port]; } From 9393d210411c9828009a18106263628cd85ac0c6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 21:08:05 +0300 Subject: [PATCH 0975/1768] Revert "test if allowing udp allows the connection" This reverts commit 96af36018a003398e3eb83b67275937ef6273137. --- modules/services/vscode-server.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 63564f5..463adef 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -9,5 +9,4 @@ hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; }; networking.firewall.allowedTCPPorts = [config.services.code-server.port]; - networking.firewall.allowedUDPPorts = [config.services.code-server.port]; } From 390e36c8342419b1d2e7d353eb4424f43db26f23 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 7 Jun 2025 21:08:28 +0300 Subject: [PATCH 0976/1768] this looks a bit smart ngl --- modules/services/vscode-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 463adef..3a074f3 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -5,7 +5,7 @@ disableTelemetry = true; disableUpdateCheck = true; user = "osbm"; - host = "localhost"; + host = "${config.networking.hostName}.curl-boga.ts.net"; hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; }; networking.firewall.allowedTCPPorts = [config.services.code-server.port]; From c6fffae20e61c527364fd6666e0f7013214a10e1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 8 Jun 2025 00:56:28 +0300 Subject: [PATCH 0977/1768] add mailmap to make the git tools happier --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..2952370 --- /dev/null +++ b/.mailmap @@ -0,0 +1,3 @@ +osbm +osbm +osbm <74963545+osbm@users.noreply.github.com> From dbe4e2a0a2f10433a8affb887da25b9288935650 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 8 Jun 2025 01:01:39 +0300 Subject: [PATCH 0978/1768] add onefetch alias --- home/fish.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/fish.nix b/home/fish.nix index 830f42d..031e3d9 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -12,6 +12,7 @@ df = "df -h"; du = "du -h"; lg = "lazygit"; + onefetch = "onefetch -T prose -T programming -T data"; }; functions = { gitu = '' From ab5e25e869e692cf20b1d77e75120a706ccbdb1e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 11:21:01 +0300 Subject: [PATCH 0979/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2a7bf54..1042c4a 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1749243446, - "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", + "lastModified": 1749526396, + "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", + "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1748751003, - "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=", + "lastModified": 1749355504, + "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43", + "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749200997, - "narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=", + "lastModified": 1749496904, + "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", "owner": "nix-community", "repo": "nixvim", - "rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8", + "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", "type": "github" }, "original": { From e6124151a67e48fa6410cb74678c7fc9c38d649d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 13:27:27 +0300 Subject: [PATCH 0980/1768] formatting --- modules/services/vscode-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 3a074f3..03da064 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -1,4 +1,4 @@ -{config, ...}:{ +{config, ...}: { services.code-server = { enable = true; port = 4444; From 029b86dbd37907a262370f5b5ab58e9e2ca53426 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 21:56:01 +0300 Subject: [PATCH 0981/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1042c4a..7daea94 100644 --- a/flake.lock +++ b/flake.lock @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749137113, - "narHash": "sha256-lugcYABIqZPzcvnwYJlpqrkbrA9g/fDhhgektjfLBrc=", + "lastModified": 1749570021, + "narHash": "sha256-SuUGHOy1GJjQox+aMzrC+S5of92R9GfUUBDIdXFypU4=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8af06711b8ae616345d3a2774113a4ab8a0d345f", + "rev": "49e286b41c11dcb3848fb53b06ddcac8eb89a89b", "type": "github" }, "original": { From 371921fabbf73c6ab61c9c8aa6d4718ef427fb1d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 21:58:04 +0300 Subject: [PATCH 0982/1768] smaller font --- home/alacritty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/alacritty.nix b/home/alacritty.nix index a32a5d6..2c61acc 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -10,7 +10,7 @@ enable = config.enableAlacritty; settings = { font = { - size = 17.0; + size = 14.0; normal.family = "Cascadia Code"; }; terminal.shell = { From d882cbeb8f00e5d2b03beec9949a44b1bc291c74 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 22:13:01 +0300 Subject: [PATCH 0983/1768] add vimium --- home/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/firefox.nix b/home/firefox.nix index 0727340..2bbb374 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -48,6 +48,7 @@ (extension "motivation-new-tab" "") (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") (extension "violentmonkey" "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}") + (extension "vimium-ff" "{d7742d87-e61d-4b78-b8a1-b469842139fa}") # (extension "tabliss" "extension@tabliss.io") # (extension "umatrix" "uMatrix@raymondhill.net") # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") From 400f95bf7769074ace868f1e0282538fd28fd7bf Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 22:13:19 +0300 Subject: [PATCH 0984/1768] add cookie blocker --- home/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/firefox.nix b/home/firefox.nix index 2bbb374..cfafc25 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -49,6 +49,7 @@ (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") (extension "violentmonkey" "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}") (extension "vimium-ff" "{d7742d87-e61d-4b78-b8a1-b469842139fa}") + (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack") # (extension "tabliss" "extension@tabliss.io") # (extension "umatrix" "uMatrix@raymondhill.net") # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") From 508ea51a8f4d5f79873e16c9ae05b3d90fe8357f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 23:01:19 +0300 Subject: [PATCH 0985/1768] add group --- modules/services/vscode-server.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 03da064..71b1304 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -5,6 +5,8 @@ disableTelemetry = true; disableUpdateCheck = true; user = "osbm"; + group = "users"; + # auth = "none"; host = "${config.networking.hostName}.curl-boga.ts.net"; hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; }; From 913c53574dfad2b437973471ba936f25bc2865e9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 23:02:25 +0300 Subject: [PATCH 0986/1768] vscode with proper extensions --- modules/services/vscode-server.nix | 37 +++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 71b1304..0674708 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{config, pkgs, ...}: { services.code-server = { enable = true; port = 4444; @@ -9,6 +9,41 @@ # auth = "none"; host = "${config.networking.hostName}.curl-boga.ts.net"; hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; + package = pkgs.vscode-with-extensions.override { + vscode = pkgs.code-server; + vscodeExtensions = with pkgs.vscode-extensions; + [ + bbenoist.nix + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + charliermarsh.ruff + davidanson.vscode-markdownlint + esbenp.prettier-vscode + foxundermoon.shell-format + github.copilot + github.vscode-github-actions + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + ms-azuretools.vscode-docker + ms-python.python + ms-python.vscode-pylance + ms-vscode-remote.remote-ssh + redhat.vscode-xml + redhat.vscode-yaml + timonwong.shellcheck + tyriar.sort-lines + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + # Available in nixpkgs, but outdated (0.4.0) at the time of adding + name = "vscode-tailscale"; + publisher = "tailscale"; + sha256 = "sha256-MKiCZ4Vu+0HS2Kl5+60cWnOtb3udyEriwc+qb/7qgUg="; + version = "1.0.0"; + } + ]; + }; }; networking.firewall.allowedTCPPorts = [config.services.code-server.port]; } From 4b119fb54772720888044d4602e8c7899af3f5fe Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 23:08:26 +0300 Subject: [PATCH 0987/1768] allow copilot --- modules/nix-settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 1f27722..786ceb8 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -16,6 +16,7 @@ "steam" "steam-unwrapped" "open-webui" + "vscode-extension-github-copilot" # nvidia related (i have to) "nvidia-x11" "cuda_cudart" From 06ef1a63718cc45008c6518f41acc17d2ed33341 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 23:08:46 +0300 Subject: [PATCH 0988/1768] allow spotify --- modules/nix-settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 786ceb8..c7f5689 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -17,6 +17,7 @@ "steam-unwrapped" "open-webui" "vscode-extension-github-copilot" + "spotify" # nvidia related (i have to) "nvidia-x11" "cuda_cudart" From 71230f576e604ce1b1a1ca678930a487805edb37 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 23:10:02 +0300 Subject: [PATCH 0989/1768] fuck pylance --- modules/services/vscode-server.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 0674708..0312312 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -27,7 +27,6 @@ kamadorueda.alejandra ms-azuretools.vscode-docker ms-python.python - ms-python.vscode-pylance ms-vscode-remote.remote-ssh redhat.vscode-xml redhat.vscode-yaml From 001975af3d678e854d8e19e7220d23ac15ff1bae Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 10 Jun 2025 23:11:43 +0300 Subject: [PATCH 0990/1768] disable remote-ssh --- modules/services/vscode-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 0312312..71619d3 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -27,7 +27,7 @@ kamadorueda.alejandra ms-azuretools.vscode-docker ms-python.python - ms-vscode-remote.remote-ssh + # ms-vscode-remote.remote-ssh redhat.vscode-xml redhat.vscode-yaml timonwong.shellcheck From 947c666c8bb7919f205fb83cf340f07ea4dbdeed Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 11 Jun 2025 11:12:33 +0300 Subject: [PATCH 0991/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 7daea94..732a89a 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1749526396, - "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=", + "lastModified": 1749628652, + "narHash": "sha256-f8jDF4G9m7pPySeQc6KskqMgtcJq6X1o2CytMx66qAE=", "owner": "nix-community", "repo": "home-manager", - "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044", + "rev": "450f06ec3cd0d86f67db58a7245db8848773e895", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749496904, - "narHash": "sha256-eNDMzrcDBOprdJs7DpMOJfCEcxribxDJP2OjozSC3Wo=", + "lastModified": 1749623409, + "narHash": "sha256-g+QBJRJc23pqEYv6i/pi9wlp7rYLSmDYwm1ZxbRJgdQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0b3d8bc3a0ab5a7cc0792c7705e92f9c5c598f3", + "rev": "7eb08d84a839bbda9aa30c3dd6f15865728755aa", "type": "github" }, "original": { From 65467a4b113a930b4463b7201158313e16b6638e Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 18:01:35 +0300 Subject: [PATCH 0992/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 732a89a..3af0cd9 100644 --- a/flake.lock +++ b/flake.lock @@ -93,11 +93,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1749628652, - "narHash": "sha256-f8jDF4G9m7pPySeQc6KskqMgtcJq6X1o2CytMx66qAE=", + "lastModified": 1749821119, + "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "450f06ec3cd0d86f67db58a7245db8848773e895", + "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1749808356, + "narHash": "sha256-VQ2HFRVz0VxjYYFtdRTlAq/PuOT+j876YTWubk0WLJM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "b328aa7871068d9f98b656d8f6829b39a541a114", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749623409, - "narHash": "sha256-g+QBJRJc23pqEYv6i/pi9wlp7rYLSmDYwm1ZxbRJgdQ=", + "lastModified": 1749761870, + "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", "owner": "nix-community", "repo": "nixvim", - "rev": "7eb08d84a839bbda9aa30c3dd6f15865728755aa", + "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1749531675, + "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "4029d450d0266909ee52775849b7da54e79b328e", "type": "github" }, "original": { From e34bb27341ec003b27e43b6caad889ff48f6dacc Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 18:16:30 +0300 Subject: [PATCH 0993/1768] update hardware config of wallfacer --- hosts/wallfacer/hardware-configuration.nix | 49 +++++++++++----------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix index 14fbff5..d8621d9 100644 --- a/hosts/wallfacer/hardware-configuration.nix +++ b/hosts/wallfacer/hardware-configuration.nix @@ -1,33 +1,32 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["ahci" "ehci_pci" "megaraid_sas" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "ahci" "ehci_pci" "megaraid_sas" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/46b73f8b-3ff6-40dd-8af2-b5147721f0ef"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/8270dba5-6d89-438a-90bd-d9f29b20cb5b"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/7F4A-78DC"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/A1EB-43F8"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; - swapDevices = [ - {device = "/dev/disk/by-uuid/9c358d49-467a-4dd1-91f2-b590dd5d60e7";} - ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/534ea30c-2664-498b-915f-41b037eba01b"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's From c7eaa0e77826f38aff01bcee39c04d3c9a3da47f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 19:12:49 +0300 Subject: [PATCH 0994/1768] enable ext --- home/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/firefox.nix b/home/firefox.nix index cfafc25..16d5bf0 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -52,7 +52,7 @@ (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack") # (extension "tabliss" "extension@tabliss.io") # (extension "umatrix" "uMatrix@raymondhill.net") - # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") + (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") ]; # To add additional extensions, find it on addons.mozilla.org, find From 5e4c7b27af59941619921f388e954075fbdec949 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 21:51:57 +0300 Subject: [PATCH 0995/1768] add new disks --- hosts/wallfacer/hardware-configuration.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix index d8621d9..66d5025 100644 --- a/hosts/wallfacer/hardware-configuration.nix +++ b/hosts/wallfacer/hardware-configuration.nix @@ -28,6 +28,16 @@ [ { device = "/dev/disk/by-uuid/534ea30c-2664-498b-915f-41b037eba01b"; } ]; + # 2 tb mini hdd + fileSystems."/data/atreus/" = + { device = "/dev/disk/by-uuid/1840c2af-fdb2-48b6-8555-2cecd1afb106"; + fsType = "ext4"; + }; + # 500 gb nvme pcie + fileSystems."/data/kasio/" = + { device = "/dev/disk/by-uuid/af74aa48-8513-4e31-a4b7-9fdd138e0002"; + fsType = "ext4"; + }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction From 40574b2334357cec2309fa21dbdf23a02faaac29 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 21:54:31 +0300 Subject: [PATCH 0996/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3af0cd9..b89e30c 100644 --- a/flake.lock +++ b/flake.lock @@ -343,11 +343,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749808356, - "narHash": "sha256-VQ2HFRVz0VxjYYFtdRTlAq/PuOT+j876YTWubk0WLJM=", + "lastModified": 1749832440, + "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b328aa7871068d9f98b656d8f6829b39a541a114", + "rev": "db030f62a449568345372bd62ed8c5be4824fa49", "type": "github" }, "original": { From 505ca7ee454b52adef649333454a61fb11ac9420 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 13 Jun 2025 21:55:01 +0300 Subject: [PATCH 0997/1768] hotfix? --- hosts/wallfacer/hardware-configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix index 66d5025..73bb21e 100644 --- a/hosts/wallfacer/hardware-configuration.nix +++ b/hosts/wallfacer/hardware-configuration.nix @@ -29,12 +29,12 @@ ]; # 2 tb mini hdd - fileSystems."/data/atreus/" = + fileSystems."/data/atreus" = { device = "/dev/disk/by-uuid/1840c2af-fdb2-48b6-8555-2cecd1afb106"; fsType = "ext4"; }; # 500 gb nvme pcie - fileSystems."/data/kasio/" = + fileSystems."/data/kasio" = { device = "/dev/disk/by-uuid/af74aa48-8513-4e31-a4b7-9fdd138e0002"; fsType = "ext4"; }; From 601139d522d9cbe33ae852196f28ece586b6863f Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 02:11:05 +0300 Subject: [PATCH 0998/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b89e30c..84ab30d 100644 --- a/flake.lock +++ b/flake.lock @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749570021, - "narHash": "sha256-SuUGHOy1GJjQox+aMzrC+S5of92R9GfUUBDIdXFypU4=", + "lastModified": 1749856170, + "narHash": "sha256-gIg4qenUDumHqmgQFfa2v4FMwH4mBgVopOBqA6Rl4n8=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "49e286b41c11dcb3848fb53b06ddcac8eb89a89b", + "rev": "b4f3b20e42cf132579a6babd493a8974d0f0abfc", "type": "github" }, "original": { From 4a5ed43fa7ace396c1f73e80b8d32d1251fbca7e Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 14 Jun 2025 12:27:41 +0300 Subject: [PATCH 0999/1768] add minecraft port --- modules/graphical-interface.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 41bb076..7d5f6ce 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -88,6 +88,7 @@ # Open ports in the firewall for Steam Local Network Game Transfers localNetworkGameTransfers.openFirewall = true; }; + networking.firewall.allowedTCPPorts = [51513]; }) ]; } From 47afe1db231d07a9545191bdace1c81373d014de Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 15 Jun 2025 13:28:04 +0300 Subject: [PATCH 1000/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 84ab30d..d29ee84 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1749821119, - "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", + "lastModified": 1749944797, + "narHash": "sha256-1l6ZW+2+LDQhYgE4fo2KsM2Ms3lY3ZXv0n6uKka2yMk=", "owner": "nix-community", "repo": "home-manager", - "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", + "rev": "c5f345153397f62170c18ded1ae1f0875201d49a", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1749355504, - "narHash": "sha256-L17CdJMD+/FCBOHjREQLXbe2VUnc3rjffenBbu2Kwpc=", + "lastModified": 1749960154, + "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "40a6e15e44b11fbf8f2b1df9d64dbfc117625e94", + "rev": "424a40050cdc5f494ec45e46462d288f08c64475", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749761870, - "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", + "lastModified": 1749924512, + "narHash": "sha256-IYv0yEFh86c+UnkcjrUAV0UeIE+9vMEeXDIF+YRlooc=", "owner": "nix-community", "repo": "nixvim", - "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", + "rev": "e114d442b14f3a299307ca9b0f0eab20e821f419", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1749531675, - "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "4029d450d0266909ee52775849b7da54e79b328e", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { From 8af6f7872746069bfc5146d1b6683502fe97b421 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 15 Jun 2025 18:56:35 +0300 Subject: [PATCH 1001/1768] awesome tool tbh --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 77ef929..52b7eb2 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -46,6 +46,7 @@ bat fd du-dust + dysk ]; environment.variables = { From 02e615142150da3986b0b7cef0ea3d0dfabe7833 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 15 Jun 2025 19:12:37 +0300 Subject: [PATCH 1002/1768] dont like it for now but great idea --- home/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/firefox.nix b/home/firefox.nix index 16d5bf0..cfafc25 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -52,7 +52,7 @@ (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack") # (extension "tabliss" "extension@tabliss.io") # (extension "umatrix" "uMatrix@raymondhill.net") - (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") + # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") ]; # To add additional extensions, find it on addons.mozilla.org, find From 83f405f876c03afabbc59e28d7e30839670e1d39 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 15 Jun 2025 19:13:15 +0300 Subject: [PATCH 1003/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d29ee84..48eb563 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1749944797, - "narHash": "sha256-1l6ZW+2+LDQhYgE4fo2KsM2Ms3lY3ZXv0n6uKka2yMk=", + "lastModified": 1749999552, + "narHash": "sha256-iCUuEq9qXUh8L1c2bRyCayAqfuUEs9nGAUlXv2RcoF8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5f345153397f62170c18ded1ae1f0875201d49a", + "rev": "04672588c61aebd18c0d0ada66dd7bb4d8edab0d", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749924512, - "narHash": "sha256-IYv0yEFh86c+UnkcjrUAV0UeIE+9vMEeXDIF+YRlooc=", + "lastModified": 1749991807, + "narHash": "sha256-TeAcF/pe+8CfnajSKBm7nflGrYc2RSf88AYURZ5Ygb4=", "owner": "nix-community", "repo": "nixvim", - "rev": "e114d442b14f3a299307ca9b0f0eab20e821f419", + "rev": "d4e736941f7e4ae85e9c70ac60919577135d004d", "type": "github" }, "original": { From 83c316540912a1cf151ee91f6c5c5da83016da99 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 15 Jun 2025 23:53:52 +0300 Subject: [PATCH 1004/1768] formatting --- hosts/wallfacer/hardware-configuration.nix | 62 ++++++++++++---------- modules/services/vscode-server.nix | 6 ++- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix index 73bb21e..79297e2 100644 --- a/hosts/wallfacer/hardware-configuration.nix +++ b/hosts/wallfacer/hardware-configuration.nix @@ -1,43 +1,47 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "ahci" "ehci_pci" "megaraid_sas" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["ahci" "ehci_pci" "megaraid_sas" "nvme" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/8270dba5-6d89-438a-90bd-d9f29b20cb5b"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/8270dba5-6d89-438a-90bd-d9f29b20cb5b"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A1EB-43F8"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/A1EB-43F8"; + fsType = "vfat"; + options = ["fmask=0077" "dmask=0077"]; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/534ea30c-2664-498b-915f-41b037eba01b"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/534ea30c-2664-498b-915f-41b037eba01b";} + ]; # 2 tb mini hdd - fileSystems."/data/atreus" = - { device = "/dev/disk/by-uuid/1840c2af-fdb2-48b6-8555-2cecd1afb106"; - fsType = "ext4"; - }; + fileSystems."/data/atreus" = { + device = "/dev/disk/by-uuid/1840c2af-fdb2-48b6-8555-2cecd1afb106"; + fsType = "ext4"; + }; # 500 gb nvme pcie - fileSystems."/data/kasio" = - { device = "/dev/disk/by-uuid/af74aa48-8513-4e31-a4b7-9fdd138e0002"; - fsType = "ext4"; - }; + fileSystems."/data/kasio" = { + device = "/dev/disk/by-uuid/af74aa48-8513-4e31-a4b7-9fdd138e0002"; + fsType = "ext4"; + }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 71619d3..fbdd931 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -1,4 +1,8 @@ -{config, pkgs, ...}: { +{ + config, + pkgs, + ... +}: { services.code-server = { enable = true; port = 4444; From 056428487b64d6f8994b8061e86d6a532a7d04fd Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Jun 2025 18:32:47 +0300 Subject: [PATCH 1005/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 48eb563..ec697f0 100644 --- a/flake.lock +++ b/flake.lock @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1749999552, - "narHash": "sha256-iCUuEq9qXUh8L1c2bRyCayAqfuUEs9nGAUlXv2RcoF8=", + "lastModified": 1750033262, + "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", "owner": "nix-community", "repo": "home-manager", - "rev": "04672588c61aebd18c0d0ada66dd7bb4d8edab0d", + "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749832440, - "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "db030f62a449568345372bd62ed8c5be4824fa49", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749991807, - "narHash": "sha256-TeAcF/pe+8CfnajSKBm7nflGrYc2RSf88AYURZ5Ygb4=", + "lastModified": 1750085186, + "narHash": "sha256-xkczij+V9/2UNrvHV/h9Wc5SWgSY5deFhN7OjgK6GrA=", "owner": "nix-community", "repo": "nixvim", - "rev": "d4e736941f7e4ae85e9c70ac60919577135d004d", + "rev": "ee715541ab343046a0ebc6ed88b7166bf6888d9c", "type": "github" }, "original": { From d849375f7e8ccb08a80614f21e15dd8e8931ce65 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Jun 2025 18:34:20 +0300 Subject: [PATCH 1006/1768] lets do this --- modules/graphical-interface.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 7d5f6ce..18d40cc 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -55,6 +55,7 @@ qbittorrent ani-cli prismlauncher + element-desktop-wayland qbittorrent discord (pkgs.writeShellApplication { From ddcbce28e92aab47fb81920ad5da55e8240896d3 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Jun 2025 18:38:52 +0300 Subject: [PATCH 1007/1768] i remember this --- modules/graphical-interface.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 18d40cc..98f6af8 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -55,7 +55,7 @@ qbittorrent ani-cli prismlauncher - element-desktop-wayland + element-desktop qbittorrent discord (pkgs.writeShellApplication { @@ -80,6 +80,8 @@ }) ]; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + programs.steam = { enable = true; # Open ports in the firewall for Steam Remote Play From 9fd05e81bbbe337a4af739537a6693088ab18488 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 16 Jun 2025 19:42:32 +0300 Subject: [PATCH 1008/1768] fuck redhat (not working in aarch64) --- modules/services/vscode-server.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index fbdd931..451f457 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -32,8 +32,6 @@ ms-azuretools.vscode-docker ms-python.python # ms-vscode-remote.remote-ssh - redhat.vscode-xml - redhat.vscode-yaml timonwong.shellcheck tyriar.sort-lines ] From b2923b06c51f69415b6ca240113f8c7ca92e60cf Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 12:39:34 +0300 Subject: [PATCH 1009/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index ec697f0..f5556d0 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1750033262, - "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1750085186, - "narHash": "sha256-xkczij+V9/2UNrvHV/h9Wc5SWgSY5deFhN7OjgK6GrA=", + "lastModified": 1750289168, + "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", "owner": "nix-community", "repo": "nixvim", - "rev": "ee715541ab343046a0ebc6ed88b7166bf6888d9c", + "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749856170, - "narHash": "sha256-gIg4qenUDumHqmgQFfa2v4FMwH4mBgVopOBqA6Rl4n8=", + "lastModified": 1750325846, + "narHash": "sha256-jPba6rOapowlA8ZFAo5PGo50OFz1X0xSoO7JyZ2wyrY=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "b4f3b20e42cf132579a6babd493a8974d0f0abfc", + "rev": "657fba924676c42beefaea224abbdbb405f7e9f8", "type": "github" }, "original": { From c41d93c3748e00971afe91ffdd4b5cec033208da Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 19 Jun 2025 14:22:06 +0300 Subject: [PATCH 1010/1768] try this to show terminal images --- home/tmux/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 32f60b6..e545a2d 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -55,6 +55,7 @@ in { extraConfig = '' # Automatically renumber windows set -g renumber-windows on + set -g allow-passthrough on ''; }; } From 2851a8e92074c2e75f247e62dc47292b71b72d7b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Jun 2025 13:57:00 +0300 Subject: [PATCH 1011/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f5556d0..9f4432d 100644 --- a/flake.lock +++ b/flake.lock @@ -343,11 +343,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1750289168, - "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", + "lastModified": 1750345447, + "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", "owner": "nix-community", "repo": "nixvim", - "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", + "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1750325846, - "narHash": "sha256-jPba6rOapowlA8ZFAo5PGo50OFz1X0xSoO7JyZ2wyrY=", + "lastModified": 1750336965, + "narHash": "sha256-O08iRE5nsSYppBz3rBkehvl6OvroB2US7bk+WLOfZ0U=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "657fba924676c42beefaea224abbdbb405f7e9f8", + "rev": "ef8b21d873bdf14d3adababe3308551971fca635", "type": "github" }, "original": { From 0af11823aeb29ca64894921c2a38df494c7a0b40 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Jun 2025 16:21:54 +0300 Subject: [PATCH 1012/1768] Revert "update flake.lock" This reverts commit 2851a8e92074c2e75f247e62dc47292b71b72d7b. --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 9f4432d..f5556d0 100644 --- a/flake.lock +++ b/flake.lock @@ -343,11 +343,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1750345447, - "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", + "lastModified": 1750289168, + "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", "owner": "nix-community", "repo": "nixvim", - "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", + "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1750336965, - "narHash": "sha256-O08iRE5nsSYppBz3rBkehvl6OvroB2US7bk+WLOfZ0U=", + "lastModified": 1750325846, + "narHash": "sha256-jPba6rOapowlA8ZFAo5PGo50OFz1X0xSoO7JyZ2wyrY=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "ef8b21d873bdf14d3adababe3308551971fca635", + "rev": "657fba924676c42beefaea224abbdbb405f7e9f8", "type": "github" }, "original": { From 4adcff16f878e522177bbe4854f17a809619bf91 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Jun 2025 17:00:43 +0300 Subject: [PATCH 1013/1768] add wezterm --- home/home.nix | 2 ++ home/wezterm.nix | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 home/wezterm.nix diff --git a/home/home.nix b/home/home.nix index c5bf464..0427a82 100644 --- a/home/home.nix +++ b/home/home.nix @@ -16,6 +16,7 @@ ./fish.nix ./tlrc.nix ./starship.nix + ./wezterm.nix ./zoxide.nix ]; @@ -32,4 +33,5 @@ enableFirefox = config.myModules.enableKDE; enableAlacritty = config.myModules.enableKDE; enableGhostty = config.myModules.enableKDE; + enableWezter = config.myModules.enableKDE; } diff --git a/home/wezterm.nix b/home/wezterm.nix new file mode 100644 index 0000000..37bd798 --- /dev/null +++ b/home/wezterm.nix @@ -0,0 +1,14 @@ +{ + lib, + config, + ... +}: { + options.enableWezterm = lib.mkEnableOption "Wezterm terminal emulator"; + config = { + programs.wezterm = { + enable = config.enableWezterm; + settings = { + }; + }; + }; +} From 0e753a5d5cf0c7e5982aa90f989924cbec2d6037 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Jun 2025 17:01:33 +0300 Subject: [PATCH 1014/1768] hotfix --- home/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 0427a82..dafc3ec 100644 --- a/home/home.nix +++ b/home/home.nix @@ -33,5 +33,5 @@ enableFirefox = config.myModules.enableKDE; enableAlacritty = config.myModules.enableKDE; enableGhostty = config.myModules.enableKDE; - enableWezter = config.myModules.enableKDE; + enableWezterm = config.myModules.enableKDE; } From 8ba4e982a6d688078846f4a32bc3344984a122af Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Jun 2025 17:05:34 +0300 Subject: [PATCH 1015/1768] add extra config --- home/wezterm.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/wezterm.nix b/home/wezterm.nix index 37bd798..f0c79ed 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -7,8 +7,9 @@ config = { programs.wezterm = { enable = config.enableWezterm; - settings = { - }; + extraConfig = '' + + ''; }; }; } From db1f97f6efb50cc5bf0d5437b80721b3d5a36568 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 21 Jun 2025 21:26:19 +0300 Subject: [PATCH 1016/1768] add this --- home/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/firefox.nix b/home/firefox.nix index cfafc25..1c1b5c7 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -54,6 +54,7 @@ # (extension "umatrix" "uMatrix@raymondhill.net") # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") + (extension "youtube-shorts-block" "") ]; # To add additional extensions, find it on addons.mozilla.org, find # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) From 8f9a4b0020eae95aed4609d8dba43eb509c61c58 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Jun 2025 11:37:20 +0300 Subject: [PATCH 1017/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f5556d0..bf43b16 100644 --- a/flake.lock +++ b/flake.lock @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1750325846, - "narHash": "sha256-jPba6rOapowlA8ZFAo5PGo50OFz1X0xSoO7JyZ2wyrY=", + "lastModified": 1750336965, + "narHash": "sha256-O08iRE5nsSYppBz3rBkehvl6OvroB2US7bk+WLOfZ0U=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "657fba924676c42beefaea224abbdbb405f7e9f8", + "rev": "ef8b21d873bdf14d3adababe3308551971fca635", "type": "github" }, "original": { From 5cf729d7c235bc67e4113878fd8ff8268dca3003 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Jun 2025 11:40:22 +0300 Subject: [PATCH 1018/1768] dont deal with the nixvim dependencies from here --- flake.lock | 57 ++++++++++++++++++++++++++++++++++++++++-------------- flake.nix | 10 +--------- 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index bf43b16..9c0991a 100644 --- a/flake.lock +++ b/flake.lock @@ -88,6 +88,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "osbm-nvim", "nixvim", "nixpkgs" ] @@ -168,11 +169,13 @@ "ixx": { "inputs": { "flake-utils": [ + "osbm-nvim", "nixvim", "nuschtosSearch", "flake-utils" ], "nixpkgs": [ + "osbm-nvim", "nixvim", "nuschtosSearch", "nixpkgs" @@ -406,6 +409,38 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1750215678, + "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1736061677, "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", @@ -424,18 +459,16 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch", "systems": "systems_4" }, "locked": { - "lastModified": 1750289168, - "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", + "lastModified": 1750345447, + "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", "owner": "nix-community", "repo": "nixvim", - "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", + "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", "type": "github" }, "original": { @@ -519,6 +552,7 @@ "flake-utils": "flake-utils", "ixx": "ixx", "nixpkgs": [ + "osbm-nvim", "nixvim", "nixpkgs" ] @@ -540,12 +574,8 @@ "osbm-nvim": { "inputs": { "nix-formatter-pack": "nix-formatter-pack_2", - "nixpkgs": [ - "nixpkgs" - ], - "nixvim": [ - "nixvim" - ] + "nixpkgs": "nixpkgs_2", + "nixvim": "nixvim" }, "locked": { "lastModified": 1750336965, @@ -565,7 +595,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -598,7 +628,6 @@ "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixvim": "nixvim", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix" } diff --git a/flake.nix b/flake.nix index 0ffb4a2..75a6f39 100644 --- a/flake.nix +++ b/flake.nix @@ -25,19 +25,11 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-on-droid = { url = "github:nix-community/nix-on-droid"; inputs.nixpkgs.follows = "nixpkgs"; }; - osbm-nvim = { - url = "github:osbm/osbm-nvim"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixvim.follows = "nixvim"; - }; + osbm-nvim.url = "github:osbm/osbm-nvim"; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; From 3c8fc5ff764a9d3661538c7dacd6dc401e076157 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Jun 2025 11:55:20 +0300 Subject: [PATCH 1019/1768] formatting --- home/wezterm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/wezterm.nix b/home/wezterm.nix index f0c79ed..9f48d92 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -8,7 +8,7 @@ programs.wezterm = { enable = config.enableWezterm; extraConfig = '' - + ''; }; }; From 654644140013fa58cdc7fc9ae3a904d1ef1e2a46 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Jun 2025 11:58:12 +0300 Subject: [PATCH 1020/1768] try new config --- home/wezterm.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home/wezterm.nix b/home/wezterm.nix index 9f48d92..4bc29ea 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -8,7 +8,12 @@ programs.wezterm = { enable = config.enableWezterm; extraConfig = '' + _G.shells = { + fish = ${lig.getExe pkgs.fish} + }; + local cfg = require('config'); + return cfg ''; }; }; From fbca0b44a678c8f42fa50fd8b6ee7f20a90c1389 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Jun 2025 12:01:13 +0300 Subject: [PATCH 1021/1768] add wezterm --- home/wezterm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/wezterm.nix b/home/wezterm.nix index 4bc29ea..2e2a550 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -9,7 +9,7 @@ enable = config.enableWezterm; extraConfig = '' _G.shells = { - fish = ${lig.getExe pkgs.fish} + fish = ${lib.getExe pkgs.fish} }; local cfg = require('config'); From 5742dc12daa5260659852f9c99f17599147575d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Jun 2025 12:08:19 +0300 Subject: [PATCH 1022/1768] what the hell is going on with me this morning I cant believe i make these stupid blunders all the time. I am embarressed that the git history is public and the ai overlords will think that i am a subpar programmer and will disintigrate me to save space for the new generation of highly advanced half human half robot workers. --- home/wezterm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/wezterm.nix b/home/wezterm.nix index 2e2a550..d3c9d4d 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -1,6 +1,7 @@ { lib, config, + pkgs, ... }: { options.enableWezterm = lib.mkEnableOption "Wezterm terminal emulator"; From 6c14140afa0109732c30200275be8a7507fd2ddf Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 22 Jun 2025 12:13:11 +0300 Subject: [PATCH 1023/1768] dont even --- home/wezterm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/wezterm.nix b/home/wezterm.nix index d3c9d4d..266a04d 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -10,7 +10,7 @@ enable = config.enableWezterm; extraConfig = '' _G.shells = { - fish = ${lib.getExe pkgs.fish} + fish = '${lib.getExe pkgs.fish}' }; local cfg = require('config'); From aa62fb72ca1a45f188b67eb6b0013c8112e9610a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Jun 2025 00:20:08 +0300 Subject: [PATCH 1024/1768] dont use other configuration --- home/wezterm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/wezterm.nix b/home/wezterm.nix index 266a04d..92ba79c 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -12,9 +12,9 @@ _G.shells = { fish = '${lib.getExe pkgs.fish}' }; - - local cfg = require('config'); - return cfg + return { + default_prog = { _G.shells.fish }, + } ''; }; }; From 19fe1e7c61b5b31720f2a81bd968f64a9e9436e9 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Jun 2025 00:26:02 +0300 Subject: [PATCH 1025/1768] remove window decorations --- home/wezterm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/wezterm.nix b/home/wezterm.nix index 92ba79c..7d3f690 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -14,6 +14,7 @@ }; return { default_prog = { _G.shells.fish }, + window_decorations = "NONE", } ''; }; From a083a92fe52f0fa4daaec4d5cc5978d8fe3966a1 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Jun 2025 00:30:45 +0300 Subject: [PATCH 1026/1768] try fullscreen --- home/wezterm.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home/wezterm.nix b/home/wezterm.nix index 7d3f690..69b626c 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -12,6 +12,13 @@ _G.shells = { fish = '${lib.getExe pkgs.fish}' }; + + wezterm.on('gui-startup', function(cmd) + local tab, pane, window = wezterm.mux.spawn_window(cmd or {}) + window:gui_window():maximize() + end) + + return { default_prog = { _G.shells.fish }, window_decorations = "NONE", From 0d5cca98381ac469aec57fc95f18541217d4059c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Jun 2025 15:56:45 +0300 Subject: [PATCH 1027/1768] hide tabs --- home/wezterm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/wezterm.nix b/home/wezterm.nix index 69b626c..de0f194 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -22,6 +22,7 @@ return { default_prog = { _G.shells.fish }, window_decorations = "NONE", + hide_tab_bar_if_only_one_tab = true, } ''; }; From 6be2123a4f588cb0dc76f602ef5616dc8fc23788 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 23 Jun 2025 16:06:14 +0300 Subject: [PATCH 1028/1768] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 9c0991a..83647ea 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1750654717, + "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1749960154, - "narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=", + "lastModified": 1750565152, + "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "424a40050cdc5f494ec45e46462d288f08c64475", + "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750215678, - "narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=", + "lastModified": 1750183894, + "narHash": "sha256-ZtOgEt70keBVB4YJc+z7m0h7J1BOlv/GjHE1YC6KxeA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192", + "rev": "f45e75fc63fc8a7ffc3da382b2f6b681c5b71875", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1750345447, - "narHash": "sha256-yOuSSfI4xovXQpSkZUK02CBcY1f0Nvm0RhnUN8xn2rY=", + "lastModified": 1750289168, + "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", "owner": "nix-community", "repo": "nixvim", - "rev": "6a1a348ab1f00bd32d2392b5c2fc72489c699af3", + "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", "type": "github" }, "original": { From 706e9d2665e188d14818e584c6aff7f2bf2d81a1 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 25 Jun 2025 09:36:14 +0300 Subject: [PATCH 1029/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 83647ea..dd7cbf0 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1750654717, - "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", + "lastModified": 1750798083, + "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", + "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750183894, - "narHash": "sha256-ZtOgEt70keBVB4YJc+z7m0h7J1BOlv/GjHE1YC6KxeA=", + "lastModified": 1750605355, + "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f45e75fc63fc8a7ffc3da382b2f6b681c5b71875", + "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1750289168, - "narHash": "sha256-MepgWJlHm88sFbu0GLlNqMl8NHlEVDOtrwqHWAZIQVU=", + "lastModified": 1750691276, + "narHash": "sha256-F507hXG4ORVpvuFeuoyDo/bmO/rR2PJRB7XhtDuBnBE=", "owner": "nix-community", "repo": "nixvim", - "rev": "c6051305e5ab01474f4c4cc9f90721e08fd2be83", + "rev": "1f3e5741a927b5b0a983f08ab9d3bcf313bc141e", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1750336965, - "narHash": "sha256-O08iRE5nsSYppBz3rBkehvl6OvroB2US7bk+WLOfZ0U=", + "lastModified": 1750831782, + "narHash": "sha256-Qqgdc7PJ4C70oKhKoCYRLSLz1GGctx8W6gjjaw8Qq8Q=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "ef8b21d873bdf14d3adababe3308551971fca635", + "rev": "76cf1717b98559e8b2f02e878a9e77365a23b7ab", "type": "github" }, "original": { From 57412647d6128dd1bf87d11d03a56bb8f31ca474 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 25 Jun 2025 15:05:00 +0300 Subject: [PATCH 1030/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index dd7cbf0..41b7b65 100644 --- a/flake.lock +++ b/flake.lock @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750741721, + "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "4b1164c3215f018c4442463a27689d973cffd750", "type": "github" }, "original": { From 4dd8224991e081338690f729c00092825bb9874c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 26 Jun 2025 22:17:58 +0300 Subject: [PATCH 1031/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 41b7b65..c9cdd9d 100644 --- a/flake.lock +++ b/flake.lock @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750741721, - "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4b1164c3215f018c4442463a27689d973cffd750", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { From ab3c2c76909aaa139d3615a0b64525be6db7e2c1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 26 Jun 2025 22:21:30 +0300 Subject: [PATCH 1032/1768] update aliases --- home/fish.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/fish.nix b/home/fish.nix index 031e3d9..ec567e8 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -6,8 +6,8 @@ ''; shellAliases = { c = "code ."; - l = "ls -lah"; - ll = "eza -la -F --icons --git --group-directories-first --git"; + l = "eza --all --long --git --icons --sort size --header --group-directories-first"; + ll = "eza --all --long --git --icons --sort name --header --group-directories-first"; free = "free -h"; df = "df -h"; du = "du -h"; From 881c0009b47fe3aec72f9fa9b42bf08626bc3a9f Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 30 Jun 2025 00:17:56 +0300 Subject: [PATCH 1033/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c9cdd9d..a63f818 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1750798083, - "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "lastModified": 1751146119, + "narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1750565152, - "narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", + "lastModified": 1751170039, + "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", + "rev": "9c932ae632d6b5150515e5749b198c175d8565db", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750776420, - "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", + "lastModified": 1751011381, + "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", + "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "type": "github" }, "original": { From ca91a98db47a7f5eb323eb0ea52fa88b1d32286d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 30 Jun 2025 18:46:51 +0300 Subject: [PATCH 1034/1768] add getty configuration --- modules/default.nix | 1 + modules/getty.nix | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 modules/getty.nix diff --git a/modules/default.nix b/modules/default.nix index 2122bba..06c0d5f 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -18,5 +18,6 @@ ./sound.nix ./users.nix ./wake-on-lan.nix + ./getty.nix ]; } diff --git a/modules/getty.nix b/modules/getty.nix new file mode 100644 index 0000000..a51460b --- /dev/null +++ b/modules/getty.nix @@ -0,0 +1,3 @@ +{ + services.getty.greetingLine = "hello"; +} From a65e58e162b6fdaa89350c8535bfb585430b09f8 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 1 Jul 2025 22:24:54 +0300 Subject: [PATCH 1035/1768] lets see if this solves firefox emoji issue --- modules/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/fonts.nix b/modules/fonts.nix index 3a04e65..68c8585 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -33,6 +33,7 @@ font-awesome font-awesome_5 roboto + twitter-color-emoji ]; fonts.fontconfig = { defaultFonts.emoji = ["Noto Color Emoji"]; From ee15c989a639206182b19a0c1f0c2922bd1c42cb Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 01:37:38 +0300 Subject: [PATCH 1036/1768] update flake.lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index a63f818..6a5454d 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1751146119, - "narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=", + "lastModified": 1751407193, + "narHash": "sha256-bnnSX5+79OR2NHi/TzMZg+vktFMIGI2JfhQBbx/s+uQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656", + "rev": "5d2f3e3e7fbb2cd8cab8b5f9e51526b1269645b9", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1742563259, - "narHash": "sha256-OLFbGacrRFqSoqUc+pf66eb1xd0aU/crKfpiWSpJ0fw=", + "lastModified": 1751405291, + "narHash": "sha256-CMckFcDMpxW+k44QOExZDJHDAb0RrbSfMUCXaZY9/o8=", "owner": "Lxtharia", "repo": "minegrub-theme", - "rev": "b1caebbd5ab96f6afbfcd735b58fab9b9d8cf54b", + "rev": "ab298e5c9f9d31fba447d1ac66ab7420cb61c4a6", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750837715, - "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", + "lastModified": 1751393906, + "narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", + "rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750605355, - "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", + "lastModified": 1750811787, + "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6", + "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1750691276, - "narHash": "sha256-F507hXG4ORVpvuFeuoyDo/bmO/rR2PJRB7XhtDuBnBE=", + "lastModified": 1751144320, + "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "1f3e5741a927b5b0a983f08ab9d3bcf313bc141e", + "rev": "ceb52aece5d571b37096945c2815604195a04eb4", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1750831782, - "narHash": "sha256-Qqgdc7PJ4C70oKhKoCYRLSLz1GGctx8W6gjjaw8Qq8Q=", + "lastModified": 1751409421, + "narHash": "sha256-9RWvWE7EW0MBdpW3faiQ4PLyedH/HkmWnQIk8WmGbzo=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "76cf1717b98559e8b2f02e878a9e77365a23b7ab", + "rev": "a74ee44f5b9ff01714de0a8f66271a9235df858e", "type": "github" }, "original": { From dd967a4f046f51f081ecadbcaa7ff5cb340d5ed9 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 02:42:07 +0300 Subject: [PATCH 1037/1768] i hate fonts --- modules/fonts.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 68c8585..53f680a 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -33,7 +33,10 @@ font-awesome font-awesome_5 roboto - twitter-color-emoji + roboto-mono + roboto-serif + # dejavu_fonts + # twitter-color-emoji ]; fonts.fontconfig = { defaultFonts.emoji = ["Noto Color Emoji"]; From b83fee22ae2a0f698eff556566921f7ce27bec97 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 02:47:36 +0300 Subject: [PATCH 1038/1768] i dont even know at this point --- modules/fonts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 53f680a..04e1607 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -38,9 +38,9 @@ # dejavu_fonts # twitter-color-emoji ]; - fonts.fontconfig = { - defaultFonts.emoji = ["Noto Color Emoji"]; - }; + # fonts.fontconfig = { + # defaultFonts.emoji = ["Noto Color Emoji"]; + # }; }) ]; } From adce20d648460f925d946c26af1273003ec39c37 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:01:35 +0300 Subject: [PATCH 1039/1768] fonts are killing me --- modules/fonts.nix | 69 +++++++++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 04e1607..cae640e 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -14,33 +14,50 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableFonts { - fonts.packages = with pkgs; [ - cascadia-code - noto-fonts - noto-fonts-cjk-sans - noto-fonts-emoji - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - nerd-fonts.fira-code - nerd-fonts.ubuntu - proggyfonts - source-sans - source-sans-pro - source-serif-pro - font-awesome - font-awesome_5 - roboto - roboto-mono - roboto-serif - # dejavu_fonts - # twitter-color-emoji + fonts = { + packages = + builtins.attrValues { + inherit + (pkgs) + material-icons + material-design-icons + roboto + work-sans + comic-neue + source-sans + twemoji-color-font + comfortaa + inter + lato + lexend + jost + dejavu_fonts + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + ; + } + ++ [ + pkgs.nerd-fonts.jetbrains-mono + # (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}) ]; - # fonts.fontconfig = { - # defaultFonts.emoji = ["Noto Color Emoji"]; - # }; + + enableDefaultPackages = false; + + # this fixes emoji stuff + fontconfig = { + defaultFonts = { + monospace = [ + "JetBrainsMono" + "JetBrainsMono Nerd Font" + "Noto Color Emoji" + ]; + sansSerif = ["Lexend" "Noto Color Emoji"]; + serif = ["Noto Serif" "Noto Color Emoji"]; + emoji = ["Noto Color Emoji"]; + }; + }; + }; }) ]; } From c1b79151524971dd62c0467ea6b1c417642de962 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:07:23 +0300 Subject: [PATCH 1040/1768] Revert "fonts are killing me" This reverts commit adce20d648460f925d946c26af1273003ec39c37. --- modules/fonts.nix | 69 ++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index cae640e..04e1607 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -14,50 +14,33 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableFonts { - fonts = { - packages = - builtins.attrValues { - inherit - (pkgs) - material-icons - material-design-icons - roboto - work-sans - comic-neue - source-sans - twemoji-color-font - comfortaa - inter - lato - lexend - jost - dejavu_fonts - noto-fonts - noto-fonts-cjk-sans - noto-fonts-emoji - ; - } - ++ [ - pkgs.nerd-fonts.jetbrains-mono - # (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}) + fonts.packages = with pkgs; [ + cascadia-code + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + nerd-fonts.fira-code + nerd-fonts.ubuntu + proggyfonts + source-sans + source-sans-pro + source-serif-pro + font-awesome + font-awesome_5 + roboto + roboto-mono + roboto-serif + # dejavu_fonts + # twitter-color-emoji ]; - - enableDefaultPackages = false; - - # this fixes emoji stuff - fontconfig = { - defaultFonts = { - monospace = [ - "JetBrainsMono" - "JetBrainsMono Nerd Font" - "Noto Color Emoji" - ]; - sansSerif = ["Lexend" "Noto Color Emoji"]; - serif = ["Noto Serif" "Noto Color Emoji"]; - emoji = ["Noto Color Emoji"]; - }; - }; - }; + # fonts.fontconfig = { + # defaultFonts.emoji = ["Noto Color Emoji"]; + # }; }) ]; } From d24233b7163de2fa01b512f2c0a479f3b7f39117 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:07:27 +0300 Subject: [PATCH 1041/1768] Revert "i dont even know at this point" This reverts commit b83fee22ae2a0f698eff556566921f7ce27bec97. --- modules/fonts.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 04e1607..53f680a 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -38,9 +38,9 @@ # dejavu_fonts # twitter-color-emoji ]; - # fonts.fontconfig = { - # defaultFonts.emoji = ["Noto Color Emoji"]; - # }; + fonts.fontconfig = { + defaultFonts.emoji = ["Noto Color Emoji"]; + }; }) ]; } From 035f6d79ace5ec3e99695290562c76b91beabb13 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:07:29 +0300 Subject: [PATCH 1042/1768] Revert "i hate fonts" This reverts commit dd967a4f046f51f081ecadbcaa7ff5cb340d5ed9. --- modules/fonts.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 53f680a..68c8585 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -33,10 +33,7 @@ font-awesome font-awesome_5 roboto - roboto-mono - roboto-serif - # dejavu_fonts - # twitter-color-emoji + twitter-color-emoji ]; fonts.fontconfig = { defaultFonts.emoji = ["Noto Color Emoji"]; From 1ad875773bd32d5d8d0d860db89c67fbff8c1a70 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:07:55 +0300 Subject: [PATCH 1043/1768] add missing font --- modules/fonts.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/fonts.nix b/modules/fonts.nix index 68c8585..d7bbbc8 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -26,6 +26,7 @@ dina-font nerd-fonts.fira-code nerd-fonts.ubuntu + nerd-fonts.droid-sans-mono proggyfonts source-sans source-sans-pro From c3aaffbad35b5fcbb42d57b725b42366f2a322fe Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:13:47 +0300 Subject: [PATCH 1044/1768] add new fonts and set some settings --- modules/fonts.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index d7bbbc8..91470e5 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -29,15 +29,24 @@ nerd-fonts.droid-sans-mono proggyfonts source-sans + source-han-sans + source-han-mono source-sans-pro source-serif-pro font-awesome font-awesome_5 roboto twitter-color-emoji + iosevka ]; - fonts.fontconfig = { - defaultFonts.emoji = ["Noto Color Emoji"]; + # fonts.fontconfig = { + # defaultFonts.emoji = ["Noto Color Emoji"]; + # }; + fontconfig.defaultFonts = { + serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; + sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; + monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"]; + emoji = ["Noto Color Emoji"]; }; }) ]; From c3ac7b1bb383775256537a7dd91595d5172e3219 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:14:31 +0300 Subject: [PATCH 1045/1768] hotfix --- modules/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 91470e5..fce8d13 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -42,7 +42,7 @@ # fonts.fontconfig = { # defaultFonts.emoji = ["Noto Color Emoji"]; # }; - fontconfig.defaultFonts = { + fonts.fontconfig.defaultFonts = { serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"]; From 82e3113f11e5bbecc9d3fec714722f02e8228d92 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:29:34 +0300 Subject: [PATCH 1046/1768] problem is the monospace --- modules/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index fce8d13..b104103 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -45,7 +45,7 @@ fonts.fontconfig.defaultFonts = { serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"]; + monospace = ["Droid Sans Mono" "Noto Color Emoji"]; emoji = ["Noto Color Emoji"]; }; }) From 460c5e4b332fea744eefb6c47aaff230c8fdc16a Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:33:56 +0300 Subject: [PATCH 1047/1768] idk why this shit is not working --- modules/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index b104103..2eca56b 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -45,7 +45,7 @@ fonts.fontconfig.defaultFonts = { serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["Droid Sans Mono" "Noto Color Emoji"]; + monospace = ["Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; emoji = ["Noto Color Emoji"]; }; }) From 26c9f0f7e86474e53c0e0b5e4a4c4c76f9ac8f6f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:40:49 +0300 Subject: [PATCH 1048/1768] i will kill myself over this --- modules/fonts.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 2eca56b..b50c384 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -38,6 +38,7 @@ roboto twitter-color-emoji iosevka + dejavu_fonts ]; # fonts.fontconfig = { # defaultFonts.emoji = ["Noto Color Emoji"]; @@ -45,7 +46,7 @@ fonts.fontconfig.defaultFonts = { serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; + monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; emoji = ["Noto Color Emoji"]; }; }) From cf6f0b7fc2b8397e1b8cf9db51ab5ada7054d27e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 03:47:58 +0300 Subject: [PATCH 1049/1768] how about i dont mess with thir --- modules/fonts.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index b50c384..9b01659 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -43,12 +43,12 @@ # fonts.fontconfig = { # defaultFonts.emoji = ["Noto Color Emoji"]; # }; - fonts.fontconfig.defaultFonts = { - serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; - sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; - emoji = ["Noto Color Emoji"]; - }; + # fonts.fontconfig.defaultFonts = { + # serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; + # sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; + # monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; + # emoji = ["Noto Color Emoji"]; + # }; }) ]; } From a8e11a3d93fe974fd60f8e595abde28cc0601755 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 04:03:32 +0300 Subject: [PATCH 1050/1768] Revert "how about i dont mess with thir" This reverts commit cf6f0b7fc2b8397e1b8cf9db51ab5ada7054d27e. --- modules/fonts.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 9b01659..b50c384 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -43,12 +43,12 @@ # fonts.fontconfig = { # defaultFonts.emoji = ["Noto Color Emoji"]; # }; - # fonts.fontconfig.defaultFonts = { - # serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; - # sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - # monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; - # emoji = ["Noto Color Emoji"]; - # }; + fonts.fontconfig.defaultFonts = { + serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; + sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; + monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; + emoji = ["Noto Color Emoji"]; + }; }) ]; } From fcbcb56ac2a3e9507431e5d1853501f070b3e8ec Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 04:07:03 +0300 Subject: [PATCH 1051/1768] i am really just shooting at the dark here --- modules/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index b50c384..bdc38b1 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -46,7 +46,7 @@ fonts.fontconfig.defaultFonts = { serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code" "Noto Color Emoji"]; + monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code"]; emoji = ["Noto Color Emoji"]; }; }) From 0bfec6d0a717487299d9c8a457a154c1781aff19 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 04:13:13 +0300 Subject: [PATCH 1052/1768] no droid --- modules/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index bdc38b1..35f1801 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -46,7 +46,7 @@ fonts.fontconfig.defaultFonts = { serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["DejaVu Sans Mono" "Droid Sans Mono" "Source Han Mono" "Cascadia Code"]; + monospace = ["DejaVu Sans Mono" "Source Han Mono" "Cascadia Code"]; emoji = ["Noto Color Emoji"]; }; }) From a505f3603afc4d49d4e13e5fee879e2d3695d6d4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 04:20:42 +0300 Subject: [PATCH 1053/1768] i am sick of thir --- modules/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 35f1801..71d4820 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -46,7 +46,7 @@ fonts.fontconfig.defaultFonts = { serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["DejaVu Sans Mono" "Source Han Mono" "Cascadia Code"]; + monospace = ["Droid Sans Mono" "DejaVu Sans Mono" "Source Han Mono" "Cascadia Code"]; emoji = ["Noto Color Emoji"]; }; }) From 7e327c63e2a92686e913a9fa357a8f6c8476bfbe Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 04:33:42 +0300 Subject: [PATCH 1054/1768] i suspect --- modules/fonts.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/fonts.nix b/modules/fonts.nix index 71d4820..2097cea 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -16,7 +16,6 @@ (lib.mkIf config.myModules.enableFonts { fonts.packages = with pkgs; [ cascadia-code - noto-fonts noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf From d20010f3b77719fa17e6bebfd2b2528c5ebe5f4e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 13:47:55 +0300 Subject: [PATCH 1055/1768] add repl --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index e9297b0..ce6c452 100644 --- a/justfile +++ b/justfile @@ -35,6 +35,9 @@ update: check: nix flake check +repl: + nix repl -f flake:nixpkgs + collect-garbage: sudo nix-env --profile /nix/var/nix/profiles/system --delete-generations old # home-manager expire-generations now From d9fcce1a8908ddb539f6f39b88b75899cedecbf6 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 19:05:11 +0300 Subject: [PATCH 1056/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6a5454d..3f4a8f6 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1751407193, - "narHash": "sha256-bnnSX5+79OR2NHi/TzMZg+vktFMIGI2JfhQBbx/s+uQ=", + "lastModified": 1751469941, + "narHash": "sha256-ZIUkH4Djh1NUFQ0GnWCsw9HZBDcVgjvJASiTplMXEzc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5d2f3e3e7fbb2cd8cab8b5f9e51526b1269645b9", + "rev": "7c455533409411b4053bb6d7db71eb35e0544254", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751393906, - "narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { From da284218b6b08d6196b224011b1310c5f7e98fef Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 2 Jul 2025 19:16:34 +0300 Subject: [PATCH 1057/1768] workaround #1 --- modules/services/vscode-server.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index 451f457..f8756ac 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -4,7 +4,8 @@ ... }: { services.code-server = { - enable = true; + # only true if the machine is not pochita + enable = config.networking.hostName != "pochita"; port = 4444; disableTelemetry = true; disableUpdateCheck = true; From 14b478eac0e93acff16afc09734f628a04f97216 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 4 Jul 2025 20:22:11 +0300 Subject: [PATCH 1058/1768] add devshells to the nix registry --- modules/nix-settings.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index c7f5689..082790b 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -49,6 +49,11 @@ repo = "osbm.dev"; type = "github"; }; + devshells.to = { + owner = "osbm"; + repo = "devshells"; + type = "github"; + }; }; nix.settings.trusted-users = ["root" "osbm"]; From 7e1667f5a8786071d82428b59e765f3a1cbf71c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 4 Jul 2025 20:22:27 +0300 Subject: [PATCH 1059/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3f4a8f6..edde11f 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1751469941, - "narHash": "sha256-ZIUkH4Djh1NUFQ0GnWCsw9HZBDcVgjvJASiTplMXEzc=", + "lastModified": 1751638848, + "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c455533409411b4053bb6d7db71eb35e0544254", + "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", "type": "github" }, "original": { From 1318b11f47de0b96b05a4e255bef376850880fb6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 5 Jul 2025 18:09:19 +0300 Subject: [PATCH 1060/1768] add these --- modules/graphical-interface.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 98f6af8..0130d4b 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -78,6 +78,8 @@ huggingface-cli upload --repo-type dataset osbm/terraria-backups "Terraria_$timestamp.zip" "Terraria_$timestamp.zip" ''; }) + code-cursor + ungoogled-chromium ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; From ad9bf61d9de4cbebfa93785de31d622fc3176ced Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 5 Jul 2025 18:10:21 +0300 Subject: [PATCH 1061/1768] allow cursor --- modules/nix-settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 082790b..1c4a54b 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -18,6 +18,7 @@ "open-webui" "vscode-extension-github-copilot" "spotify" + "cursor" # nvidia related (i have to) "nvidia-x11" "cuda_cudart" From 90c0673b32f91843d6a00df24b433c0acf96144c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 5 Jul 2025 22:31:47 +0300 Subject: [PATCH 1062/1768] i hate this goddamn --- home/starship.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/starship.nix b/home/starship.nix index e23b98f..44baeec 100644 --- a/home/starship.nix +++ b/home/starship.nix @@ -11,6 +11,8 @@ gradle.disabled = true; java.disabled = true; ruby.disabled = true; + rust.disabled = true; + typst.disabled = true; }; }; } From 5e74d654e903db6b537b6cb1069b3892accd91fd Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 9 Jul 2025 03:00:18 +0300 Subject: [PATCH 1063/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index edde11f..cc208ee 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1751638848, - "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", + "lastModified": 1751990210, + "narHash": "sha256-krWErNDl9ggMLSfK00Q2BcoSk3+IRTSON/DiDgUzzMw=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", + "rev": "218da00bfa73f2a61682417efe74549416c16ba6", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1751170039, - "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9c932ae632d6b5150515e5749b198c175d8565db", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { From a8db53cc1dd973e15e9207efe8c4be591fe4bb5a Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 9 Jul 2025 16:29:05 +0300 Subject: [PATCH 1064/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index cc208ee..39fad76 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1751990210, - "narHash": "sha256-krWErNDl9ggMLSfK00Q2BcoSk3+IRTSON/DiDgUzzMw=", + "lastModified": 1752062782, + "narHash": "sha256-Dod77HcIByOyfGLEJOgRxg2Fmk2Y5lVgMEcN/xVEt/8=", "owner": "nix-community", "repo": "home-manager", - "rev": "218da00bfa73f2a61682417efe74549416c16ba6", + "rev": "bec8ff39811568eb7c8c8d1e2a1a476326748f51", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { From 13efa964183eb72575aa2434a681846b9c05b541 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 11 Jul 2025 01:08:30 +0300 Subject: [PATCH 1065/1768] undo --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 4ea4e22..9cbe2aa 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -9,7 +9,7 @@ ]; myModules = { - blockYoutube = true; + blockYoutube = false; blockTwitter = true; blockBluesky = false; enableKDE = true; From 6d09b2d6f4b9a9cf5c90319bf10d00b47ebb7b8d Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 11 Jul 2025 01:09:06 +0300 Subject: [PATCH 1066/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 39fad76..02e8916 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1752062782, - "narHash": "sha256-Dod77HcIByOyfGLEJOgRxg2Fmk2Y5lVgMEcN/xVEt/8=", + "lastModified": 1752180332, + "narHash": "sha256-CCufHi/GclygJZbbsKyTvqylz5E3pH2oHFL9ycB8YMM=", "owner": "nix-community", "repo": "home-manager", - "rev": "bec8ff39811568eb7c8c8d1e2a1a476326748f51", + "rev": "3978bcd6961847385121db30c58dbd444d4a73df", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { From 53cc916be5c378ff09afa6aeba2e52af645bd66d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 10:19:04 +0300 Subject: [PATCH 1067/1768] add system-logger --- modules/services/system-logger/default.nix | 60 ++++++++ .../services/system-logger/system-logger.sh | 136 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 modules/services/system-logger/default.nix create mode 100755 modules/services/system-logger/system-logger.sh diff --git a/modules/services/system-logger/default.nix b/modules/services/system-logger/default.nix new file mode 100644 index 0000000..67da14d --- /dev/null +++ b/modules/services/system-logger/default.nix @@ -0,0 +1,60 @@ +{ + pkgs, + config, + lib, + ... +}: let + system-logger = pkgs.writeShellApplication { + name = "system-logger"; + runtimeInputs = with pkgs; [curl jq zip gawk systemd]; + text = builtins.readFile ./system-logger.sh; + }; +in { + options.services.system-logger = { + enable = lib.mkEnableOption { + description = "Enable System Logger Service"; + default = false; + }; + + logDirectory = lib.mkOption { + type = lib.types.path; + default = "/var/lib/system-logger"; + description = "Directory to store log archives"; + }; + + maxSizeMB = lib.mkOption { + type = lib.types.int; + default = 1; + description = "Maximum size of daily log archive in megabytes"; + }; + + retentionDays = lib.mkOption { + type = lib.types.int; + default = 30; + description = "Number of days to retain log archives"; + }; + }; + + config = lib.mkIf config.services.system-logger.enable { + systemd.timers.system-logger = { + description = "System Logger Timer"; + wantedBy = ["timers.target"]; + timerConfig = { + OnCalendar = "daily"; + Persistent = true; + }; + }; + + systemd.services.system-logger = { + description = "System Logger Service"; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${lib.getExe system-logger}"; + Restart = "on-failure"; + RestartSec = 60; + User = "root"; + Group = "root"; + }; + }; + }; +} diff --git a/modules/services/system-logger/system-logger.sh b/modules/services/system-logger/system-logger.sh new file mode 100755 index 0000000..475ff7a --- /dev/null +++ b/modules/services/system-logger/system-logger.sh @@ -0,0 +1,136 @@ +#!/usr/bin/env bash +set -euo pipefail + +# Configuration +LOG_DIR="/var/lib/system-logger" +MAX_SIZE_MB=1 +RETENTION_DAYS=30 +DATE=$(date +%Y-%m-%d) +HOSTNAME=$(hostname) +TEMP_DIR=$(mktemp -d) + +# Create log directory if it doesn't exist +mkdir -p "$LOG_DIR" + +# Check if today's log already exists +if [ -f "$LOG_DIR/${DATE}-logs-${HOSTNAME}.zip" ]; then + echo "Logs for today already exist. Exiting..." + exit 0 +fi + +echo "Starting system log collection for $DATE" + +# Function to collect logs with size limit +collect_logs() { + local source="$1" + local output="$2" + local max_lines="$3" + + if [ -f "$source" ]; then + # Get the last N lines to stay within size limit + tail -n "$max_lines" "$source" > "$output" 2>/dev/null || true + echo "Collected from $source" + else + echo "Source $source not found, skipping..." + fi +} + +# Function to get journal logs with filtering +get_journal_logs() { + local output="$1" + local filter="$2" + local max_lines="$3" + + journalctl --since "00:00:00" --until "23:59:59" \ + --no-pager --output=short \ + | grep -i "$filter" | tail -n "$max_lines" > "$output" 2>/dev/null || true + echo "Collected journal logs for $filter" +} + +# Calculate approximate lines per log type to stay under 1MB +# Assuming average line is ~100 bytes, we aim for ~10,000 total lines +TOTAL_LINES=10000 +SSH_LINES=2000 +KERNEL_LINES=2000 +LOGIN_LINES=1000 +SYSTEM_LINES=2000 +AUTH_LINES=1000 +FAILED_LOGIN_LINES=500 +DISK_LINES=500 +NETWORK_LINES=500 +MEMORY_LINES=500 + +# Collect SSH connections +get_journal_logs "$TEMP_DIR/ssh.log" "sshd" "$SSH_LINES" + +# Collect kernel warnings and errors +get_journal_logs "$TEMP_DIR/kernel.log" "kernel.*warning\|kernel.*error" "$KERNEL_LINES" + +# Collect login/logout events +get_journal_logs "$TEMP_DIR/login.log" "session.*opened\|session.*closed\|login\|logout" "$LOGIN_LINES" + +# Collect system messages +get_journal_logs "$TEMP_DIR/system.log" "systemd\|daemon" "$SYSTEM_LINES" + +# Collect authentication events +get_journal_logs "$TEMP_DIR/auth.log" "authentication\|auth" "$AUTH_LINES" + +# Collect failed login attempts +get_journal_logs "$TEMP_DIR/failed_login.log" "failed\|failure\|denied" "$FAILED_LOGIN_LINES" + +# Collect disk usage and errors +get_journal_logs "$TEMP_DIR/disk.log" "disk\|storage\|iostat" "$DISK_LINES" + +# Collect network events +get_journal_logs "$TEMP_DIR/network.log" "network\|connection\|interface" "$NETWORK_LINES" + +# Collect memory usage +get_journal_logs "$TEMP_DIR/memory.log" "memory\|oom\|swap" "$MEMORY_LINES" + +# Collect traditional log files if they exist +collect_logs "/var/log/auth.log" "$TEMP_DIR/auth_traditional.log" 1000 +collect_logs "/var/log/syslog" "$TEMP_DIR/syslog_traditional.log" 1000 +collect_logs "/var/log/messages" "$TEMP_DIR/messages_traditional.log" 1000 + +# Create a summary file +{ + echo "=== System Log Summary for $DATE ===" + echo "Hostname: $HOSTNAME" + echo "Collection time: $(date)" + echo "Total lines collected:" + wc -l "$TEMP_DIR"/*.log 2>/dev/null || true + echo "" + echo "=== System Information ===" + echo "Uptime: $(uptime)" + echo "Load average: $(cat /proc/loadavg)" + echo "Memory usage:" + free -h + echo "" + echo "Disk usage:" + df -h + echo "" + echo "Active users:" + who +} > "$TEMP_DIR/summary.txt" + +# Create the zip file +cd "$TEMP_DIR" +zip -r "$LOG_DIR/${DATE}-logs-${HOSTNAME}.zip" ./* > /dev/null + +# Check file size and warn if too large +FILE_SIZE=$(stat -c%s "$LOG_DIR/${DATE}-logs-${HOSTNAME}.zip") +FILE_SIZE_MB=$((FILE_SIZE / 1024 / 1024)) + +if [ "$FILE_SIZE_MB" -gt "$MAX_SIZE_MB" ]; then + echo "WARNING: Log file size ($FILE_SIZE_MB MB) exceeds limit ($MAX_SIZE_MB MB)" +fi + +echo "Log collection completed: $LOG_DIR/${DATE}-logs-${HOSTNAME}.zip ($FILE_SIZE_MB MB)" + +# Clean up old logs (older than RETENTION_DAYS) +find "$LOG_DIR" -name "*-logs-*.zip" -type f -mtime +$RETENTION_DAYS -delete 2>/dev/null || true + +# Clean up temporary directory +rm -rf "$TEMP_DIR" + +echo "System log collection finished successfully" \ No newline at end of file From 0fc50992c884d7222486a1c9c19234a919ed8ade Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 10:25:04 +0300 Subject: [PATCH 1068/1768] mention --- modules/services/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/default.nix b/modules/services/default.nix index abb23c8..0698e7c 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -7,6 +7,7 @@ ./ollama.nix ./forgejo.nix ./jellyfin.nix + ./system-logger/ ./tailscale.nix ./vaultwarden.nix ./vscode-server.nix From 3b73b1d7caed4a2f75c59dc46cc0c3c188a81522 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 10:42:51 +0300 Subject: [PATCH 1069/1768] end of file --- modules/services/system-logger/system-logger.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/system-logger/system-logger.sh b/modules/services/system-logger/system-logger.sh index 475ff7a..b31e9f7 100755 --- a/modules/services/system-logger/system-logger.sh +++ b/modules/services/system-logger/system-logger.sh @@ -133,4 +133,4 @@ find "$LOG_DIR" -name "*-logs-*.zip" -type f -mtime +$RETENTION_DAYS -delete 2>/ # Clean up temporary directory rm -rf "$TEMP_DIR" -echo "System log collection finished successfully" \ No newline at end of file +echo "System log collection finished successfully" From ca3c15e172df29a971e3d4fe8d403bcb37504498 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 12:46:55 +0300 Subject: [PATCH 1070/1768] fix --- modules/services/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/default.nix b/modules/services/default.nix index 0698e7c..b679739 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -7,7 +7,7 @@ ./ollama.nix ./forgejo.nix ./jellyfin.nix - ./system-logger/ + ./system-logger ./tailscale.nix ./vaultwarden.nix ./vscode-server.nix From ecee9286b1c2c8787901c4b188a7f770d8187eb4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 12:47:26 +0300 Subject: [PATCH 1071/1768] add formatter --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 75a6f39..b827be1 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,9 @@ ... } @ inputs: let inherit (self) outputs; + supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); + makePkgs = system: import nixpkgs { inherit system; }; in { nixosConfigurations = { tartarus = nixpkgs.lib.nixosSystem { @@ -92,8 +95,7 @@ modules = [./hosts/atreus/configuration.nix]; }; - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra; - formatter.aarch64-linux = nixpkgs.legacyPackages.aarch64-linux.alejandra; + formatter = forAllSystems (system: (makePkgs system).nixfmt-rfc-style); deploy.nodes.harmonica = { hostname = "192.168.0.11"; profiles.system = { From 7ce780986beb87b48ea341e1c60e890a23b619dc Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 21:35:19 +0300 Subject: [PATCH 1072/1768] add lib --- lib/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 lib/default.nix diff --git a/lib/default.nix b/lib/default.nix new file mode 100644 index 0000000..140252b --- /dev/null +++ b/lib/default.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + + importList = lib.mapAttrsToList (name: _path: ./. + "/${name}") + (lib.filterAttrs (filename: kind: + filename != "default.nix" && (kind == "regular" || kind == "directory")) + (builtins.readDir ./.)); +} From 415715a4f9f0c586f997aeb87d161b7a626ac71c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 21:36:18 +0300 Subject: [PATCH 1073/1768] formatting --- flake.nix | 123 +++++++++--------- home/alacritty.nix | 10 +- home/firefox.nix | 21 +-- home/ghostty.nix | 3 +- home/gtk.nix | 3 +- home/home.nix | 3 +- home/ssh.nix | 6 +- home/tlrc.nix | 2 +- home/tmux/default.nix | 14 +- home/wezterm.nix | 3 +- hosts/atreus/configuration.nix | 3 +- hosts/harmonica-sd/configuration.nix | 5 +- hosts/harmonica-sd/hardware-configuration.nix | 14 +- hosts/harmonica-sd/sd-image.nix | 24 ++-- hosts/harmonica/configuration.nix | 3 +- hosts/harmonica/hardware-configuration.nix | 14 +- hosts/iso/configuration.nix | 3 +- hosts/pochita-sd/configuration.nix | 15 ++- hosts/pochita/configuration.nix | 3 +- hosts/pochita/hardware-configuration.nix | 18 ++- hosts/tartarus/configuration.nix | 5 +- hosts/tartarus/hardware-configuration.nix | 24 +++- hosts/wallfacer/configuration.nix | 3 +- hosts/wallfacer/hardware-configuration.nix | 26 +++- hosts/ymir/configuration.nix | 10 +- hosts/ymir/hardware-configuration.nix | 25 +++- lib/default.nix | 12 +- modules/adb.nix | 5 +- modules/arduino.nix | 3 +- modules/common-packages.nix | 3 +- modules/concentration.nix | 3 +- modules/disable-hibernation.nix | 3 +- modules/emulation.nix | 5 +- modules/fonts.nix | 24 +++- modules/graphical-interface.nix | 5 +- modules/home.nix | 3 +- modules/i18n.nix | 3 +- modules/minegrub.nix | 17 ++- modules/nix-settings.nix | 16 ++- modules/remote-builds.nix | 3 +- modules/secrets.nix | 3 +- modules/services/caddy.nix | 11 +- modules/services/cloudflare-dyndns.nix | 10 +- modules/services/cloudflared.nix | 3 +- modules/services/forgejo.nix | 3 +- modules/services/jellyfin.nix | 5 +- modules/services/nextcloud.nix | 3 +- modules/services/ollama.nix | 8 +- modules/services/system-logger/default.nix | 16 ++- modules/services/tailscale.nix | 7 +- modules/services/vaultwarden.nix | 3 +- modules/services/vscode-server.nix | 8 +- modules/services/wanikani-bypass-lessons.nix | 13 +- .../services/wanikani-fetch-data/default.nix | 14 +- modules/sound.nix | 3 +- modules/users.nix | 11 +- modules/wake-on-lan.nix | 7 +- secrets/secrets.nix | 11 +- 58 files changed, 398 insertions(+), 229 deletions(-) diff --git a/flake.nix b/flake.nix index b827be1..94aea54 100644 --- a/flake.nix +++ b/flake.nix @@ -41,67 +41,74 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { - self, - nixpkgs, - nix-on-droid, - deploy-rs, - ... - } @ inputs: let - inherit (self) outputs; - supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); - makePkgs = system: import nixpkgs { inherit system; }; - in { - nixosConfigurations = { - tartarus = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [./hosts/tartarus/configuration.nix]; + outputs = + { + self, + nixpkgs, + nix-on-droid, + deploy-rs, + ... + }@inputs: + let + inherit (self) outputs; + supportedSystems = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + ]; + forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); + makePkgs = system: import nixpkgs { inherit system; }; + in + { + nixosConfigurations = { + tartarus = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/tartarus/configuration.nix ]; + }; + ymir = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/ymir/configuration.nix ]; + }; + harmonica = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/harmonica/configuration.nix ]; + }; + harmonica-sd = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/harmonica-sd/configuration.nix ]; + }; + pochita = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/pochita/configuration.nix ]; + }; + pochita-sd = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/pochita-sd/configuration.nix ]; + }; + myISO = nixpkgs.lib.nixosSystem { + modules = [ + ./hosts/iso/configuration.nix + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + ]; + }; + wallfacer = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/wallfacer/configuration.nix ]; + }; }; - ymir = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [./hosts/ymir/configuration.nix]; + nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { + extraSpecialArgs = { inherit inputs outputs; }; + pkgs = import nixpkgs { system = "aarch64-linux"; }; + modules = [ ./hosts/atreus/configuration.nix ]; }; - harmonica = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [./hosts/harmonica/configuration.nix]; - }; - harmonica-sd = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [./hosts/harmonica-sd/configuration.nix]; - }; - pochita = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [./hosts/pochita/configuration.nix]; - }; - pochita-sd = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [./hosts/pochita-sd/configuration.nix]; - }; - myISO = nixpkgs.lib.nixosSystem { - modules = [ - ./hosts/iso/configuration.nix - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" - ]; - }; - wallfacer = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [./hosts/wallfacer/configuration.nix]; - }; - }; - nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - extraSpecialArgs = {inherit inputs outputs;}; - pkgs = import nixpkgs {system = "aarch64-linux";}; - modules = [./hosts/atreus/configuration.nix]; - }; - formatter = forAllSystems (system: (makePkgs system).nixfmt-rfc-style); - deploy.nodes.harmonica = { - hostname = "192.168.0.11"; - profiles.system = { - user = "osbm"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; + formatter = forAllSystems (system: (makePkgs system).nixfmt-rfc-style); + deploy.nodes.harmonica = { + hostname = "192.168.0.11"; + profiles.system = { + user = "osbm"; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; + }; }; }; - }; } diff --git a/home/alacritty.nix b/home/alacritty.nix index 2c61acc..10c431b 100644 --- a/home/alacritty.nix +++ b/home/alacritty.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options.enableAlacritty = lib.mkEnableOption "Alacritty terminal emulator"; config = { programs.alacritty = { @@ -14,7 +15,12 @@ normal.family = "Cascadia Code"; }; terminal.shell = { - args = ["new-session" "-A" "-s" "general"]; + args = [ + "new-session" + "-A" + "-s" + "general" + ]; program = lib.getExe pkgs.tmux; }; window = { diff --git a/home/firefox.nix b/home/firefox.nix index 1c1b5c7..435e104 100644 --- a/home/firefox.nix +++ b/home/firefox.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options.enableFirefox = lib.mkEnableOption "enableFirefox"; config = { programs.firefox = { @@ -32,15 +33,17 @@ DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" # SearchBar = "unified"; # alternat - ExtensionSettings = with builtins; let - extension = shortId: uuid: { - name = uuid; - value = { - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; + ExtensionSettings = + with builtins; + let + extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; + }; }; - }; - in + in listToAttrs [ (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") (extension "ublock-origin" "uBlock0@raymondhill.net") diff --git a/home/ghostty.nix b/home/ghostty.nix index 913ecb7..2194d42 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options.enableGhostty = lib.mkEnableOption "Ghostty terminal emulator"; config = { programs.ghostty = { diff --git a/home/gtk.nix b/home/gtk.nix index eb3d5c4..5e171fa 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { # Enable the GTK theme enableGTK = lib.mkEnableOption "enableGTK"; diff --git a/home/home.nix b/home/home.nix index dafc3ec..5f53dc5 100644 --- a/home/home.nix +++ b/home/home.nix @@ -2,7 +2,8 @@ config, pkgs, ... -}: { +}: +{ imports = [ ./alacritty.nix ./tmux diff --git a/home/ssh.nix b/home/ssh.nix index 422ffef..a7ab6d8 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -1,4 +1,5 @@ -{...}: let +{ ... }: +let # define a block that just takes a hostname and returns attrset to not repeat the same fields sshBlock = hostname: { hostname = hostname; @@ -18,7 +19,8 @@ port = 8022; # fish not found error ??? }; -in { +in +{ programs.ssh = { enable = true; hashKnownHosts = true; diff --git a/home/tlrc.nix b/home/tlrc.nix index af7f3f1..562273a 100644 --- a/home/tlrc.nix +++ b/home/tlrc.nix @@ -5,7 +5,7 @@ }: # stolen from https://github.com/dmarcoux/dotfiles { - home.packages = [pkgs.tlrc]; + home.packages = [ pkgs.tlrc ]; xdg.configFile."tlrc/config.toml".text = '' [cache] dir = "${config.xdg.cacheHome}/tlrc" diff --git a/home/tmux/default.nix b/home/tmux/default.nix index e545a2d..1a773fd 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -2,10 +2,11 @@ pkgs, lib, ... -}: let - wanikani-current-reviews-script = builtins.path {path = ./wanikani-current-reviews.sh;}; - wanikani-level-script = builtins.path {path = ./wanikani-level.sh;}; - wanikani-progression-script = builtins.path {path = ./wanikani-progression.sh;}; +}: +let + wanikani-current-reviews-script = builtins.path { path = ./wanikani-current-reviews.sh; }; + wanikani-level-script = builtins.path { path = ./wanikani-level.sh; }; + wanikani-progression-script = builtins.path { path = ./wanikani-progression.sh; }; tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { pluginName = "dracula"; version = "3.0.0"; @@ -26,10 +27,11 @@ description = "Feature packed Dracula theme for tmux!"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ethancedwards8]; + maintainers = with maintainers; [ ethancedwards8 ]; }; }; -in { +in +{ programs.tmux = { enable = true; historyLimit = 100000; diff --git a/home/wezterm.nix b/home/wezterm.nix index de0f194..4f1b0c2 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -3,7 +3,8 @@ config, pkgs, ... -}: { +}: +{ options.enableWezterm = lib.mkEnableOption "Wezterm terminal emulator"; config = { programs.wezterm = { diff --git a/hosts/atreus/configuration.nix b/hosts/atreus/configuration.nix index 2a805e8..5b2ef4e 100644 --- a/hosts/atreus/configuration.nix +++ b/hosts/atreus/configuration.nix @@ -2,7 +2,8 @@ lib, pkgs, ... -}: { +}: +{ user.userName = lib.mkForce "osbm"; # fuck i hate unmaintained projects environment.packages = with pkgs; [ vim # or some other editor, e.g. nano or neovim diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/harmonica-sd/configuration.nix index 22c3ac1..a8f9874 100644 --- a/hosts/harmonica-sd/configuration.nix +++ b/hosts/harmonica-sd/configuration.nix @@ -2,7 +2,8 @@ lib, inputs, ... -}: { +}: +{ imports = [ ./sd-image.nix "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" @@ -28,7 +29,7 @@ interfaces."wlan0".useDHCP = true; wireless = { enable = true; - interfaces = ["wlan0"]; + interfaces = [ "wlan0" ]; networks = { "House_Bayram" = { psk = "PASSWORD"; diff --git a/hosts/harmonica-sd/hardware-configuration.nix b/hosts/harmonica-sd/hardware-configuration.nix index 6627bca..541780f 100644 --- a/hosts/harmonica-sd/hardware-configuration.nix +++ b/hosts/harmonica-sd/hardware-configuration.nix @@ -2,12 +2,12 @@ pkgs, lib, ... -}: { +}: +{ # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 nixpkgs.overlays = [ (final: super: { - makeModulesClosure = x: - super.makeModulesClosure (x // {allowMissing = true;}); + makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); }) ]; @@ -37,7 +37,7 @@ hardware = { enableRedistributableFirmware = lib.mkForce false; - firmware = [pkgs.raspberrypiWirelessFirmware]; # Keep this to make sure wifi works + firmware = [ pkgs.raspberrypiWirelessFirmware ]; # Keep this to make sure wifi works i2c.enable = true; deviceTree.filter = "bcm2837-rpi-zero*.dtb"; deviceTree.overlays = [ @@ -63,7 +63,11 @@ boot = { kernelPackages = pkgs.linuxPackages_rpi02w; - initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage"]; + initrd.availableKernelModules = [ + "xhci_pci" + "usbhid" + "usb_storage" + ]; loader = { grub.enable = false; generic-extlinux-compatible.enable = true; diff --git a/hosts/harmonica-sd/sd-image.nix b/hosts/harmonica-sd/sd-image.nix index 1893925..d6de7d4 100644 --- a/hosts/harmonica-sd/sd-image.nix +++ b/hosts/harmonica-sd/sd-image.nix @@ -4,11 +4,12 @@ config, lib, ... -}: { +}: +{ options.sdImage = with lib; { extraFirmwareConfig = mkOption { type = types.attrs; - default = {}; + default = { }; description = lib.mdDoc '' Extra configuration to be added to config.txt. ''; @@ -18,15 +19,14 @@ config = { sdImage.populateFirmwareCommands = lib.mkIf ((lib.length (lib.attrValues config.sdImage.extraFirmwareConfig)) > 0) - ( - let - # Convert the set into a string of lines of "key=value" pairs. - keyValueMap = name: value: name + "=" + toString value; - keyValueList = lib.mapAttrsToList keyValueMap config.sdImage.extraFirmwareConfig; - extraFirmwareConfigString = lib.concatStringsSep "\n" keyValueList; - in - lib.mkAfter - '' + ( + let + # Convert the set into a string of lines of "key=value" pairs. + keyValueMap = name: value: name + "=" + toString value; + keyValueList = lib.mapAttrsToList keyValueMap config.sdImage.extraFirmwareConfig; + extraFirmwareConfigString = lib.concatStringsSep "\n" keyValueList; + in + lib.mkAfter '' config=firmware/config.txt # The initial file has just been created without write permissions. Add them to be able to append the file. chmod u+w $config @@ -34,6 +34,6 @@ echo "${extraFirmwareConfigString}" >> $config chmod u-w $config '' - ); + ); }; } diff --git a/hosts/harmonica/configuration.nix b/hosts/harmonica/configuration.nix index d525bb8..928a786 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/harmonica/configuration.nix @@ -2,7 +2,8 @@ lib, inputs, ... -}: { +}: +{ imports = [ ./hardware-configuration.nix ../../modules diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/harmonica/hardware-configuration.nix index 1a0ba46..27edb68 100644 --- a/hosts/harmonica/hardware-configuration.nix +++ b/hosts/harmonica/hardware-configuration.nix @@ -2,12 +2,12 @@ pkgs, lib, ... -}: { +}: +{ # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 nixpkgs.overlays = [ (final: super: { - makeModulesClosure = x: - super.makeModulesClosure (x // {allowMissing = true;}); + makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); }) ]; @@ -23,7 +23,7 @@ hardware = { enableRedistributableFirmware = lib.mkForce false; - firmware = [pkgs.raspberrypiWirelessFirmware]; # Keep this to make sure wifi works + firmware = [ pkgs.raspberrypiWirelessFirmware ]; # Keep this to make sure wifi works i2c.enable = true; deviceTree.filter = "bcm2837-rpi-zero*.dtb"; deviceTree.overlays = [ @@ -49,7 +49,11 @@ boot = { kernelPackages = pkgs.linuxPackages_rpi02w; - initrd.availableKernelModules = ["xhci_pci" "usbhid" "usb_storage"]; + initrd.availableKernelModules = [ + "xhci_pci" + "usbhid" + "usb_storage" + ]; loader = { grub.enable = false; generic-extlinux-compatible.enable = true; diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index a7139a2..54c819d 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -4,7 +4,8 @@ pkgs, system, ... -}: { +}: +{ imports = [ ]; diff --git a/hosts/pochita-sd/configuration.nix b/hosts/pochita-sd/configuration.nix index 7b5815d..ae3bbe0 100644 --- a/hosts/pochita-sd/configuration.nix +++ b/hosts/pochita-sd/configuration.nix @@ -2,7 +2,8 @@ pkgs, inputs, ... -}: { +}: +{ imports = [ inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.raspberry-pi-nix.nixosModules.sd-image @@ -19,7 +20,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.osbm = { isNormalUser = true; - extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. initialPassword = "changeme"; }; @@ -37,9 +38,15 @@ wget ]; - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; - nix.settings.trusted-users = ["root" "osbm"]; + nix.settings.trusted-users = [ + "root" + "osbm" + ]; nixpkgs.hostPlatform = "aarch64-linux"; diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index a5ce70a..5863e02 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -3,7 +3,8 @@ lib, inputs, ... -}: { +}: +{ imports = [ ./hardware-configuration.nix ../../modules diff --git a/hosts/pochita/hardware-configuration.nix b/hosts/pochita/hardware-configuration.nix index 90ca28b..6a94256 100644 --- a/hosts/pochita/hardware-configuration.nix +++ b/hosts/pochita/hardware-configuration.nix @@ -5,15 +5,16 @@ lib, modulesPath, ... -}: { +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = []; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; @@ -23,10 +24,13 @@ fileSystems."/boot/firmware" = { device = "/dev/disk/by-uuid/2178-694E"; fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; + options = [ + "fmask=0022" + "dmask=0022" + ]; }; - swapDevices = []; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 0b1ade8..0a058b9 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -3,7 +3,8 @@ pkgs, inputs, ... -}: { +}: +{ imports = [ ./hardware-configuration.nix ../../modules @@ -19,7 +20,7 @@ }; virtualisation.virtualbox.host.enable = true; - users.extraGroups.vboxusers.members = ["osbm"]; + users.extraGroups.vboxusers.members = [ "osbm" ]; # Bootloader. boot.loader.systemd-boot.enable = true; diff --git a/hosts/tartarus/hardware-configuration.nix b/hosts/tartarus/hardware-configuration.nix index aecb129..9d9879a 100644 --- a/hosts/tartarus/hardware-configuration.nix +++ b/hosts/tartarus/hardware-configuration.nix @@ -7,15 +7,22 @@ pkgs, modulesPath, ... -}: { +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/246d3df7-3578-44b2-8aee-c1ed33581184"; @@ -25,11 +32,14 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/33D0-6524"; fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; + options = [ + "fmask=0077" + "dmask=0077" + ]; }; swapDevices = [ - {device = "/dev/disk/by-uuid/b74b04db-c7ea-44e7-b3fe-15cd6d0cd851";} + { device = "/dev/disk/by-uuid/b74b04db-c7ea-44e7-b3fe-15cd6d0cd851"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index bffe71f..9c059d9 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -1,4 +1,5 @@ -{lib, ...}: { +{ lib, ... }: +{ imports = [ ./hardware-configuration.nix ../../modules diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/wallfacer/hardware-configuration.nix index 79297e2..d9c96cf 100644 --- a/hosts/wallfacer/hardware-configuration.nix +++ b/hosts/wallfacer/hardware-configuration.nix @@ -7,15 +7,24 @@ pkgs, modulesPath, ... -}: { +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["ahci" "ehci_pci" "megaraid_sas" "nvme" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "ahci" + "ehci_pci" + "megaraid_sas" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/8270dba5-6d89-438a-90bd-d9f29b20cb5b"; @@ -25,11 +34,14 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/A1EB-43F8"; fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; + options = [ + "fmask=0077" + "dmask=0077" + ]; }; swapDevices = [ - {device = "/dev/disk/by-uuid/534ea30c-2664-498b-915f-41b037eba01b";} + { device = "/dev/disk/by-uuid/534ea30c-2664-498b-915f-41b037eba01b"; } ]; # 2 tb mini hdd diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 9cbe2aa..b97b4a6 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -2,7 +2,8 @@ config, pkgs, ... -}: { +}: +{ imports = [ ./hardware-configuration.nix ../../modules @@ -29,7 +30,10 @@ networking.hostName = "ymir"; # Define your hostname. - networking.firewall.allowedTCPPorts = [8889 8000]; + networking.firewall.allowedTCPPorts = [ + 8889 + 8000 + ]; # Enable networking networking.networkmanager.enable = true; @@ -47,7 +51,7 @@ virtualisation.waydroid.enable = true; # Load nvidia driver for Xorg and Wayland - services.xserver.videoDrivers = ["nvidia"]; + services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { # Modesetting is required. diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/ymir/hardware-configuration.nix index 2c07fa7..35232ea 100644 --- a/hosts/ymir/hardware-configuration.nix +++ b/hosts/ymir/hardware-configuration.nix @@ -7,15 +7,23 @@ pkgs, modulesPath, ... -}: { +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/fd6792b4-d1ec-493c-a686-64dbeaac3371"; @@ -25,11 +33,14 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/383D-1E8A"; fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; + options = [ + "fmask=0077" + "dmask=0077" + ]; }; swapDevices = [ - {device = "/dev/disk/by-uuid/33c6277d-eb0a-487d-8be0-829829a8a308";} + { device = "/dev/disk/by-uuid/33c6277d-eb0a-487d-8be0-829829a8a308"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/lib/default.nix b/lib/default.nix index 140252b..de0246b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,7 +1,9 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ - importList = lib.mapAttrsToList (name: _path: ./. + "/${name}") - (lib.filterAttrs (filename: kind: - filename != "default.nix" && (kind == "regular" || kind == "directory")) - (builtins.readDir ./.)); + importList = lib.mapAttrsToList (name: _path: ./. + "/${name}") ( + lib.filterAttrs ( + filename: kind: filename != "default.nix" && (kind == "regular" || kind == "directory") + ) (builtins.readDir ./.) + ); } diff --git a/modules/adb.nix b/modules/adb.nix index 85e5b48..44b8cdb 100644 --- a/modules/adb.nix +++ b/modules/adb.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableADB = lib.mkOption { type = lib.types.bool; @@ -14,7 +15,7 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableADB { programs.adb.enable = true; - users.users.osbm.extraGroups = ["adbusers"]; + users.users.osbm.extraGroups = [ "adbusers" ]; }) ]; } diff --git a/modules/arduino.nix b/modules/arduino.nix index c3d87c7..82f001e 100644 --- a/modules/arduino.nix +++ b/modules/arduino.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.arduinoSetup = lib.mkOption { type = lib.types.bool; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 52b7eb2..e71e4fd 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -2,7 +2,8 @@ pkgs, inputs, ... -}: { +}: +{ environment.systemPackages = with pkgs; [ inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default wget diff --git a/modules/concentration.nix b/modules/concentration.nix index b7486e9..1162f75 100644 --- a/modules/concentration.nix +++ b/modules/concentration.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options = { myModules = { blockYoutube = lib.mkOption { diff --git a/modules/disable-hibernation.nix b/modules/disable-hibernation.nix index 254d3a2..0b7f40b 100644 --- a/modules/disable-hibernation.nix +++ b/modules/disable-hibernation.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.disableHibernation = lib.mkOption { type = lib.types.bool; diff --git a/modules/emulation.nix b/modules/emulation.nix index 6daeef1..84ac972 100644 --- a/modules/emulation.nix +++ b/modules/emulation.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableAarch64Emulation = lib.mkOption { type = lib.types.bool; @@ -13,7 +14,7 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableAarch64Emulation { - boot.binfmt.emulatedSystems = ["aarch64-linux"]; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; }) ]; diff --git a/modules/fonts.nix b/modules/fonts.nix index 2097cea..a8a96f6 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableFonts = lib.mkOption { type = lib.types.bool; @@ -43,10 +44,23 @@ # defaultFonts.emoji = ["Noto Color Emoji"]; # }; fonts.fontconfig.defaultFonts = { - serif = ["Source Han Serif SC" "Source Han Serif TC" "Noto Color Emoji"]; - sansSerif = ["Source Han Sans SC" "Source Han Sans TC" "Noto Color Emoji"]; - monospace = ["Droid Sans Mono" "DejaVu Sans Mono" "Source Han Mono" "Cascadia Code"]; - emoji = ["Noto Color Emoji"]; + serif = [ + "Source Han Serif SC" + "Source Han Serif TC" + "Noto Color Emoji" + ]; + sansSerif = [ + "Source Han Sans SC" + "Source Han Sans TC" + "Noto Color Emoji" + ]; + monospace = [ + "Droid Sans Mono" + "DejaVu Sans Mono" + "Source Han Mono" + "Cascadia Code" + ]; + emoji = [ "Noto Color Emoji" ]; }; }) ]; diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 0130d4b..62d37b5 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableKDE = lib.mkOption { type = lib.types.bool; @@ -93,7 +94,7 @@ # Open ports in the firewall for Steam Local Network Game Transfers localNetworkGameTransfers.openFirewall = true; }; - networking.firewall.allowedTCPPorts = [51513]; + networking.firewall.allowedTCPPorts = [ 51513 ]; }) ]; } diff --git a/modules/home.nix b/modules/home.nix index 7ae00eb..3450737 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -3,7 +3,8 @@ pkgs, inputs, ... -}: { +}: +{ imports = [ inputs.home-manager.nixosModules.home-manager ]; diff --git a/modules/i18n.nix b/modules/i18n.nix index 35a4707..6860e81 100644 --- a/modules/i18n.nix +++ b/modules/i18n.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ time.timeZone = "Europe/Istanbul"; # Select internationalisation properties. diff --git a/modules/minegrub.nix b/modules/minegrub.nix index 02090f1..ce1fe94 100644 --- a/modules/minegrub.nix +++ b/modules/minegrub.nix @@ -4,7 +4,8 @@ lib, pkgs, ... -}: { +}: +{ # imports = [ # inputs.minegrub-theme.nixosModules.default # ]; @@ -24,14 +25,12 @@ # background = "background_options/1.8 - [Classic Minecraft].png"; # boot-options-count = 4; # }; - theme = - pkgs.fetchFromGitHub - { - owner = "Lxtharia"; - repo = "minegrub-theme"; - rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; - sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; - }; + theme = pkgs.fetchFromGitHub { + owner = "Lxtharia"; + repo = "minegrub-theme"; + rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; + sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; + }; }; }) ]; diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 1c4a54b..73abcb5 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -2,13 +2,15 @@ inputs, lib, ... -}: { +}: +{ imports = [ inputs.nix-index-database.nixosModules.nix-index ]; programs.nix-index-database.comma.enable = true; # Allow unfree packages - nixpkgs.config.allowUnfreePredicate = pkg: + nixpkgs.config.allowUnfreePredicate = + pkg: builtins.elem (lib.getName pkg) [ "vscode" # TODO: remove this "discord" @@ -30,7 +32,10 @@ ]; # enable nix flakes - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; # nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; @@ -57,7 +62,10 @@ }; }; - nix.settings.trusted-users = ["root" "osbm"]; + nix.settings.trusted-users = [ + "root" + "osbm" + ]; nix.gc = { automatic = true; diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 27a236b..e6b1f58 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -2,7 +2,8 @@ # config, # outputs, ... -}: { +}: +{ # nix.distributedBuilds = true; # nix.settings.builders-use-substitutes = true; # nix.buildMachines = [ diff --git a/modules/secrets.nix b/modules/secrets.nix index b71b622..91b0d08 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -4,7 +4,8 @@ inputs, lib, ... -}: { +}: +{ imports = [ inputs.agenix.nixosModules.default ]; diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 685178b..ad65ca7 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableCaddy = lib.mkOption { type = lib.types.bool; @@ -19,7 +20,7 @@ package = pkgs.caddy.withPlugins { # update time to time # last update: 2025-03-02 - plugins = ["github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de"]; + plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ]; hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; }; email = "contact@osbm.dev"; @@ -58,7 +59,11 @@ }; }; - networking.firewall.allowedTCPPorts = [80 443 3000]; + networking.firewall.allowedTCPPorts = [ + 80 + 443 + 3000 + ]; environment.systemPackages = with pkgs; [ nssTools diff --git a/modules/services/cloudflare-dyndns.nix b/modules/services/cloudflare-dyndns.nix index b298692..a2c0f2e 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/services/cloudflare-dyndns.nix @@ -3,10 +3,13 @@ config, pkgs, ... -}: let +}: +let # https://github.com/NixOS/nixpkgs/pull/394352 cloudflare-dyndns-5-3 = pkgs.cloudflare-dyndns.overridePythonAttrs rec { - version = lib.warnIfNot (pkgs.cloudflare-dyndns.version == "5.0") "The cloudflare-dyndns package is updated, you should remove this override" "5.3"; + version = lib.warnIfNot ( + pkgs.cloudflare-dyndns.version == "5.0" + ) "The cloudflare-dyndns package is updated, you should remove this override" "5.3"; src = pkgs.fetchFromGitHub { owner = "kissgyorgy"; repo = "cloudflare-dyndns"; @@ -23,7 +26,8 @@ truststore ]; }; -in { +in +{ options = { myModules.enableCloudflareDyndns = lib.mkOption { type = lib.types.bool; diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 6c28333..2855e56 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -2,7 +2,8 @@ config, lib, ... -}: { +}: +{ options = { myModules.enableCloudflared = lib.mkOption { type = lib.types.bool; diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index dd51099..de92f35 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableForgejo = lib.mkOption { type = lib.types.bool; diff --git a/modules/services/jellyfin.nix b/modules/services/jellyfin.nix index 43f1fb8..153bf5d 100644 --- a/modules/services/jellyfin.nix +++ b/modules/services/jellyfin.nix @@ -2,7 +2,8 @@ config, lib, ... -}: { +}: +{ options = { myModules.enableJellyfin = lib.mkOption { type = lib.types.bool; @@ -21,7 +22,7 @@ dataDir = "/home/osbm/.local/share/jellyfin"; }; - networking.firewall.allowedTCPPorts = [8096]; + networking.firewall.allowedTCPPorts = [ 8096 ]; }) ]; } diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index f5bac7b..a2667f0 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -3,7 +3,8 @@ config, pkgs, ... -}: { +}: +{ options = { myModules.enableNextcloud = lib.mkOption { type = lib.types.bool; diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index cb5dab8..40b0192 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options = { myModules = { enableOllama = lib.mkOption { @@ -18,7 +19,10 @@ services.ollama = { enable = true; acceleration = "cuda"; - loadModels = ["deepseek-r1:7b" "deepseek-r1:14b"]; + loadModels = [ + "deepseek-r1:7b" + "deepseek-r1:14b" + ]; }; services.open-webui = { diff --git a/modules/services/system-logger/default.nix b/modules/services/system-logger/default.nix index 67da14d..a6f72d3 100644 --- a/modules/services/system-logger/default.nix +++ b/modules/services/system-logger/default.nix @@ -3,13 +3,21 @@ config, lib, ... -}: let +}: +let system-logger = pkgs.writeShellApplication { name = "system-logger"; - runtimeInputs = with pkgs; [curl jq zip gawk systemd]; + runtimeInputs = with pkgs; [ + curl + jq + zip + gawk + systemd + ]; text = builtins.readFile ./system-logger.sh; }; -in { +in +{ options.services.system-logger = { enable = lib.mkEnableOption { description = "Enable System Logger Service"; @@ -38,7 +46,7 @@ in { config = lib.mkIf config.services.system-logger.enable { systemd.timers.system-logger = { description = "System Logger Timer"; - wantedBy = ["timers.target"]; + wantedBy = [ "timers.target" ]; timerConfig = { OnCalendar = "daily"; Persistent = true; diff --git a/modules/services/tailscale.nix b/modules/services/tailscale.nix index ace140f..c111a87 100644 --- a/modules/services/tailscale.nix +++ b/modules/services/tailscale.nix @@ -3,7 +3,8 @@ lib, pkgs, ... -}: { +}: +{ options = { myModules.enableTailscale = lib.mkOption { type = lib.types.bool; @@ -25,8 +26,8 @@ port = 51513; }; - networking.firewall.allowedUDPPorts = [config.services.tailscale.port]; - environment.systemPackages = [pkgs.tailscale]; + networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ]; + environment.systemPackages = [ pkgs.tailscale ]; }) ]; } diff --git a/modules/services/vaultwarden.nix b/modules/services/vaultwarden.nix index 1e8bd3c..d3db64e 100644 --- a/modules/services/vaultwarden.nix +++ b/modules/services/vaultwarden.nix @@ -2,7 +2,8 @@ config, lib, ... -}: { +}: +{ options = { myModules.enableVaultwarden = lib.mkOption { type = lib.types.bool; diff --git a/modules/services/vscode-server.nix b/modules/services/vscode-server.nix index f8756ac..279343c 100644 --- a/modules/services/vscode-server.nix +++ b/modules/services/vscode-server.nix @@ -2,7 +2,8 @@ config, pkgs, ... -}: { +}: +{ services.code-server = { # only true if the machine is not pochita enable = config.networking.hostName != "pochita"; @@ -16,7 +17,8 @@ hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; package = pkgs.vscode-with-extensions.override { vscode = pkgs.code-server; - vscodeExtensions = with pkgs.vscode-extensions; + vscodeExtensions = + with pkgs.vscode-extensions; [ bbenoist.nix catppuccin.catppuccin-vsc @@ -47,5 +49,5 @@ ]; }; }; - networking.firewall.allowedTCPPorts = [config.services.code-server.port]; + networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; } diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 19aaeac..43b48b4 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -3,10 +3,14 @@ config, pkgs, ... -}: let +}: +let waniKani-bypass-lessons = pkgs.writeShellApplication { name = "wanikani-bypass-lessons"; - runtimeInputs = with pkgs; [curl jq]; + runtimeInputs = with pkgs; [ + curl + jq + ]; text = '' #!/usr/bin/env bash @@ -44,7 +48,8 @@ sleep 3600 ''; }; -in { +in +{ options.services.wanikani-bypass-lessons.enable = lib.mkEnableOption { description = "Enable WaniKani Bypass Lessons"; default = false; @@ -53,7 +58,7 @@ in { config = lib.mkIf config.services.wanikani-bypass-lessons.enable { systemd.services.wanikani-bypass-lessons = { description = "WaniKani Bypass Lessons"; - wantedBy = ["multi-user.target"]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; ExecStart = "${lib.getExe waniKani-bypass-lessons}"; diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/services/wanikani-fetch-data/default.nix index 4193052..0cf09ae 100644 --- a/modules/services/wanikani-fetch-data/default.nix +++ b/modules/services/wanikani-fetch-data/default.nix @@ -3,13 +3,19 @@ config, lib, ... -}: let +}: +let wanikani-fetcher = pkgs.writeShellApplication { name = "wanikani-fetcher"; - runtimeInputs = with pkgs; [curl jq zip]; + runtimeInputs = with pkgs; [ + curl + jq + zip + ]; text = builtins.readFile ./wanikani-fetcher.sh; }; -in { +in +{ options.services.wanikani-fetch-data.enable = lib.mkEnableOption { description = "Enable WaniKani Fetch Data"; default = false; @@ -18,7 +24,7 @@ in { config = lib.mkIf config.services.wanikani-fetch-data.enable { systemd.timers.wanikani-fetch-data = { description = "WaniKani Fetch Data"; - wantedBy = ["timers.target"]; + wantedBy = [ "timers.target" ]; timerConfig = { OnCalendar = "02:00"; }; diff --git a/modules/sound.nix b/modules/sound.nix index 7b5f550..deb119d 100644 --- a/modules/sound.nix +++ b/modules/sound.nix @@ -2,7 +2,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableSound = lib.mkOption { type = lib.types.bool; diff --git a/modules/users.nix b/modules/users.nix index 95a0a2e..3056e19 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,10 +1,15 @@ -{...}: { +{ ... }: +{ users.users = { osbm = { isNormalUser = true; description = "osbm"; initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; - extraGroups = ["networkmanager" "wheel" "docker"]; + extraGroups = [ + "networkmanager" + "wheel" + "docker" + ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; @@ -15,7 +20,7 @@ isNormalUser = true; description = "bayram"; initialHashedPassword = "$6$IamAbigfailure$3BP231DVwbqUtZ.mq33nM/JitBrT2u26Y25VpsfBwhZbezMHz4XbySrOMnaMcCYdsb3wZFL3Ppcp0L.R8nonT."; - extraGroups = ["networkmanager"]; + extraGroups = [ "networkmanager" ]; packages = [ ]; }; diff --git a/modules/wake-on-lan.nix b/modules/wake-on-lan.nix index fa1b0d5..4a0f955 100644 --- a/modules/wake-on-lan.nix +++ b/modules/wake-on-lan.nix @@ -3,7 +3,8 @@ lib, config, ... -}: { +}: +{ options = { myModules.enableWakeOnLan = lib.mkOption { type = lib.types.bool; @@ -19,13 +20,13 @@ # see https://github.com/NixOS/nixpkgs/issues/91352 systemd.services.wakeonlan = { description = "Reenable wake on lan every boot"; - after = ["network.target"]; + after = [ "network.target" ]; serviceConfig = { Type = "simple"; RemainAfterExit = "true"; ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp3s0 wol g"; }; - wantedBy = ["default.target"]; + wantedBy = [ "default.target" ]; }; }) ]; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index aff5aee..8c79bf6 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -12,9 +12,10 @@ let pochita wallfacer ]; -in { - "network-manager.age".publicKeys = machines ++ [osbm]; - "ssh-key-private.age".publicKeys = machines ++ [osbm]; - "ssh-key-public.age".publicKeys = machines ++ [osbm]; - "cloudflare.age".publicKeys = machines ++ [osbm]; +in +{ + "network-manager.age".publicKeys = machines ++ [ osbm ]; + "ssh-key-private.age".publicKeys = machines ++ [ osbm ]; + "ssh-key-public.age".publicKeys = machines ++ [ osbm ]; + "cloudflare.age".publicKeys = machines ++ [ osbm ]; } From 0d8220076698ed2778da0f55bcab8690658b6412 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 21:47:37 +0300 Subject: [PATCH 1074/1768] i hope --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 94aea54..adea291 100644 --- a/flake.nix +++ b/flake.nix @@ -102,6 +102,7 @@ modules = [ ./hosts/atreus/configuration.nix ]; }; + lib = import ./lib { inherit (nixpkgs) lib; }; formatter = forAllSystems (system: (makePkgs system).nixfmt-rfc-style); deploy.nodes.harmonica = { hostname = "192.168.0.11"; From 59b5a9dc85bbfa566bf82df6cfe5b1e23a5a7d05 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 21:47:52 +0300 Subject: [PATCH 1075/1768] fix --- lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/default.nix b/lib/default.nix index de0246b..a31945a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ lib, ... }: { importList = lib.mapAttrsToList (name: _path: ./. + "/${name}") ( From c678959f8fa4e49c3e8ba1ace55a4f2b5bed8438 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 12 Jul 2025 22:37:00 +0300 Subject: [PATCH 1076/1768] better this way --- flake.nix | 2 +- hosts/iso/configuration.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index adea291..e441fd2 100644 --- a/flake.nix +++ b/flake.nix @@ -86,9 +86,9 @@ modules = [ ./hosts/pochita-sd/configuration.nix ]; }; myISO = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; modules = [ ./hosts/iso/configuration.nix - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" ]; }; wallfacer = nixpkgs.lib.nixosSystem { diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index 54c819d..999631c 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -3,10 +3,13 @@ lib, pkgs, system, + inputs, ... }: { imports = [ + "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; From d0138ece72636740307e41a15093fbbeaacce1d9 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Jul 2025 18:40:35 +0300 Subject: [PATCH 1077/1768] update flake.lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 02e8916..e1b610f 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1752180332, - "narHash": "sha256-CCufHi/GclygJZbbsKyTvqylz5E3pH2oHFL9ycB8YMM=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3978bcd6961847385121db30c58dbd444d4a73df", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1751405291, - "narHash": "sha256-CMckFcDMpxW+k44QOExZDJHDAb0RrbSfMUCXaZY9/o8=", + "lastModified": 1752413064, + "narHash": "sha256-bcWxBAAvf5hp0TmMbYrwU4SlBxc5sB/T2VsIBdX1gDk=", "owner": "Lxtharia", "repo": "minegrub-theme", - "rev": "ab298e5c9f9d31fba447d1ac66ab7420cb61c4a6", + "rev": "040b163268be6e7cf743ba990177525dc47ed944", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1751774635, - "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", + "lastModified": 1752441837, + "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "85686025ba6d18df31cc651a91d5adef63378978", + "rev": "839e02dece5845be3a322e507a79712b73a96ba2", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750811787, - "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1751144320, - "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", + "lastModified": 1752762787, + "narHash": "sha256-WZLSOR2Pei7C4nH/ntKUqOZOAa5rgvc2fVZl4RoEXmw=", "owner": "nix-community", "repo": "nixvim", - "rev": "ceb52aece5d571b37096945c2815604195a04eb4", + "rev": "bc0555c8694d43fb63ae2c7afec08b6987431a04", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1751409421, - "narHash": "sha256-9RWvWE7EW0MBdpW3faiQ4PLyedH/HkmWnQIk8WmGbzo=", + "lastModified": 1752766427, + "narHash": "sha256-kspZI9VEjvYGpROCENdKF/VoHb4lpmb9RABKAoXrRug=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "a74ee44f5b9ff01714de0a8f66271a9235df858e", + "rev": "fa9212f81917ab124a54d9c4071c67ddc661a670", "type": "github" }, "original": { From e6cf00bdb00f5956d9ef49905d20e170db48659e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Jul 2025 18:42:12 +0300 Subject: [PATCH 1078/1768] add this to readme to fix it later --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8d4140f..c3aa477 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,8 @@ $ zstdcat nixos-sd-image-24.05.20241116.e8c38b7-aarch64-linux.img.zst | dd of=/d and voila! when you plug the sd card to the raspberry pi 5 it will boot up with the configuration that you have built. And then you can ssh into it and further configure it. +build iso with: + nix build .#nixosConfigurations.myISO.config.system.build.isoImage # To-do list From 78ecf9c3e7357cca9db5772c115d6f7b279ed95e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 17 Jul 2025 21:15:12 +0300 Subject: [PATCH 1079/1768] undo nixpkgs --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e1b610f..b6b0f5a 100644 --- a/flake.lock +++ b/flake.lock @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "lastModified": 1750811787, + "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", "type": "github" }, "original": { From 95f489b0054d33e0846cc4a6a2ac6512fd770608 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 20 Jul 2025 22:22:34 +0300 Subject: [PATCH 1080/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b6b0f5a..4f1ea15 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1752814804, + "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1752441837, - "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=", + "lastModified": 1752985182, + "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "839e02dece5845be3a322e507a79712b73a96ba2", + "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1750811787, - "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=", + "lastModified": 1752077645, + "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1", + "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", "type": "github" }, "original": { From 48c4f52343cf42d5ef70290c964aee130f35762a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 24 Jul 2025 12:39:24 +0300 Subject: [PATCH 1081/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4f1ea15..738c581 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1752814804, - "narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=", + "lastModified": 1753294394, + "narHash": "sha256-1Dfgq09lHZ8AdYB2Deu/mYP1pMNpob8CgqT5Mzo44eI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0300c8808e41da81d6edfc202f3d3833c157daf", + "rev": "1fde6fb1be6cd5dc513dc1c287d69e4eb2de973e", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1747382160, - "narHash": "sha256-nlHPjA5GH4wdwnAoOzCt7BVLUKtIAAW2ClNGz2OxTrs=", + "lastModified": 1753100895, + "narHash": "sha256-nEuGlpIT7q4c/otPu00pGhb5Y12FtQm00pH3MXOJpfw=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "40b8c7465f78887279a0a3c743094fa6ea671ab1", + "rev": "27696cac81d4444319bb9158037b0da45e213f5e", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753250450, + "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", "type": "github" }, "original": { From e07ebe14ad746208e1134e552fb11728512d22d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 00:18:15 +0300 Subject: [PATCH 1082/1768] add gpg --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index e71e4fd..b5e9a75 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -48,6 +48,7 @@ fd du-dust dysk + gnupg ]; environment.variables = { From c6d3ff2c1a4a647ac9d14c5b5e6e48253f7afaf0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 00:41:50 +0300 Subject: [PATCH 1083/1768] add pinentry for gpg --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index b5e9a75..dc24cbf 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -49,6 +49,7 @@ du-dust dysk gnupg + pinentry-tty ]; environment.variables = { From 771f583e8ed575c45c1a2bf420ab26e717e9effb Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 00:42:12 +0300 Subject: [PATCH 1084/1768] sign using openpgp --- home/git.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home/git.nix b/home/git.nix index 7fa7129..a79edf7 100644 --- a/home/git.nix +++ b/home/git.nix @@ -3,7 +3,9 @@ enable = true; userEmail = "osmanfbayram@gmail.com"; userName = "osbm"; - signing.format = "ssh"; + signing = { + format = "openpgp"; + }; ignores = [ "*.pyc" # python "*.swp" # vim From 63cdf71b313e1369393e01776261660aaa32c0a6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 00:59:53 +0300 Subject: [PATCH 1085/1768] add gnupg --- modules/common-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index dc24cbf..82cade3 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -59,6 +59,8 @@ virtualisation.docker.enable = true; + services.gnupg.enable = true; + # Enable the OpenSSH daemon. services.openssh = { enable = true; From 144ac7d72145c00bb04a9d6d83e4e68d44ef23d4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 01:00:07 +0300 Subject: [PATCH 1086/1768] Revert "add pinentry for gpg" This reverts commit c6d3ff2c1a4a647ac9d14c5b5e6e48253f7afaf0. --- modules/common-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 82cade3..557c622 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -49,7 +49,6 @@ du-dust dysk gnupg - pinentry-tty ]; environment.variables = { From 1f3179e6c168022851f699f465c24692bff26c2d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 01:01:07 +0300 Subject: [PATCH 1087/1768] fix --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 557c622..bddca34 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -58,7 +58,7 @@ virtualisation.docker.enable = true; - services.gnupg.enable = true; + programs.gnupg.enable = true; # Enable the OpenSSH daemon. services.openssh = { From 3959e0a19d0268ccca399a0ec0f6b6899d0061ca Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 01:01:57 +0300 Subject: [PATCH 1088/1768] fix number 80 --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index bddca34..3ed06c9 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -58,7 +58,7 @@ virtualisation.docker.enable = true; - programs.gnupg.enable = true; + programs.gnupg.agent.enable = true; # Enable the OpenSSH daemon. services.openssh = { From 463f37ee736cddef0f4e57b85da3a1c43cd4cdea Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 01:08:05 +0300 Subject: [PATCH 1089/1768] gnupg sucks asss --- modules/common-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 3ed06c9..a76dbe2 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -58,7 +58,11 @@ virtualisation.docker.enable = true; - programs.gnupg.agent.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + services.pcscd.enable = true; # Enable the OpenSSH daemon. services.openssh = { From 87ecf173ace893955be4cfd8b79679a69e370dda Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 01:15:09 +0300 Subject: [PATCH 1090/1768] no pcscd --- modules/common-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index a76dbe2..fe556c9 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -62,7 +62,6 @@ enable = true; enableSSHSupport = true; }; - services.pcscd.enable = true; # Enable the OpenSSH daemon. services.openssh = { From 1901802cb3cdd33e04f6ea8d1bb4877c869cfc8f Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 01:32:40 +0300 Subject: [PATCH 1091/1768] doesnt fucking work --- modules/common-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index fe556c9..b5e9a75 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -58,11 +58,6 @@ virtualisation.docker.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - # Enable the OpenSSH daemon. services.openssh = { enable = true; From cf2a78de39e4011d2911a8d43c667cf3da3ab32a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 01:39:08 +0300 Subject: [PATCH 1092/1768] add gpg --- home/gpg.nix | 12 ++++++++++++ home/home.nix | 1 + 2 files changed, 13 insertions(+) create mode 100644 home/gpg.nix diff --git a/home/gpg.nix b/home/gpg.nix new file mode 100644 index 0000000..115be9d --- /dev/null +++ b/home/gpg.nix @@ -0,0 +1,12 @@ +{ + + services.gpg-agent = { + enable = true; + enableFishIntegration = true; + enableSshSupport = true; + extraConfig = '' + allow-loopback-pinentry + ''; + }; + programs.gpg.enable = true; +} diff --git a/home/home.nix b/home/home.nix index 5f53dc5..103f3dd 100644 --- a/home/home.nix +++ b/home/home.nix @@ -9,6 +9,7 @@ ./tmux ./ghostty.nix ./git.nix + ./gpg.nix ./gtk.nix ./ssh.nix ./bash.nix From 21c2dd24c53d52c103e19707dd450fe83aece313 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 11:47:07 +0300 Subject: [PATCH 1093/1768] update gpg home --- home/gpg.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/gpg.nix b/home/gpg.nix index 115be9d..6d582b0 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -7,6 +7,7 @@ extraConfig = '' allow-loopback-pinentry ''; + pinentry.program = "pinentry-wayprompt"; }; programs.gpg.enable = true; } From e94952fb794f2947f38d5f6303d71abd3e1d9bc1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 12:22:40 +0300 Subject: [PATCH 1094/1768] cursor? --- home/gpg.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home/gpg.nix b/home/gpg.nix index 6d582b0..6f733a9 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -1,4 +1,4 @@ -{ +{pkgs, ...}:{ services.gpg-agent = { enable = true; @@ -7,7 +7,8 @@ extraConfig = '' allow-loopback-pinentry ''; - pinentry.program = "pinentry-wayprompt"; + pinentry.program = "pinentry-cursor"; }; programs.gpg.enable = true; + home.packages = [ pkgs.pinentry-cursor ]; } From 00999ad6cd5bd60b42fbafd506759492f05eb6ea Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 12:24:43 +0300 Subject: [PATCH 1095/1768] am i stupid --- home/gpg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/gpg.nix b/home/gpg.nix index 6f733a9..3e67875 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -10,5 +10,5 @@ pinentry.program = "pinentry-cursor"; }; programs.gpg.enable = true; - home.packages = [ pkgs.pinentry-cursor ]; + home.packages = [ pkgs.pinentry-curses ]; } From 5dee47dc2383e09762805332d61656c7978015ff Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 12:30:53 +0300 Subject: [PATCH 1096/1768] try this why this shit doesnt work --- home/gpg.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home/gpg.nix b/home/gpg.nix index 3e67875..d436e5b 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -4,11 +4,11 @@ enable = true; enableFishIntegration = true; enableSshSupport = true; - extraConfig = '' - allow-loopback-pinentry - ''; - pinentry.program = "pinentry-cursor"; + # extraConfig = '' + # allow-loopback-pinentry + # ''; + pinentry.package = pkgs.pinentry-tty; }; programs.gpg.enable = true; - home.packages = [ pkgs.pinentry-curses ]; + # home.packages = [ pkgs.pinentry-curses ]; } From 6930d8bb59dbb308c4589e9921bf5731dcb75778 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 15:49:42 +0300 Subject: [PATCH 1097/1768] add signing --- home/git.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/git.nix b/home/git.nix index a79edf7..569ee7f 100644 --- a/home/git.nix +++ b/home/git.nix @@ -43,6 +43,10 @@ process = "git-lfs filter-process"; required = true; }; + signing = { + signByDefault = true; + key = "3A264839184185CF"; + }; }; }; } From d35dbcd645869ae8dc0b9af37770103621585865 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 15:55:28 +0300 Subject: [PATCH 1098/1768] test commit --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c3aa477..9e11210 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ Here i have 4 machines and 1 sd card image that i maintain. - Raspberry Pi 5 SD image **pochita-sd** (produces an sd image that could be used to flash the sd card of a rpi-5) - Phone **atreus** (unrooted, nix-on-droid) - I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) - Android phone (termux) **android** (not setup yet) From 208ea40c93e76a9390e583ebad92a0e77f0ebd91 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 15:56:33 +0300 Subject: [PATCH 1099/1768] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e11210..fbf67bd 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The nix configuration of mine. My intentions are just to maintain my configurati Here i have 4 machines and 1 sd card image that i maintain. - Laptop **tartarus** (faulty hardware, nvidia gpu doesnt work) -- Desktop **ymir** (beast, my most prized possesion as of now) +- Desktop **ymir** (beast, my most prized possession as of now) - Raspberry Pi 5 **pochita** (a server that i experiment with) - Raspberry Pi 5 SD image **pochita-sd** (produces an sd image that could be used to flash the sd card of a rpi-5) - Phone **atreus** (unrooted, nix-on-droid) From 5ab1a86bd20aeca40e73a1ed1ea3c4548795e9ec Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 16:08:20 +0300 Subject: [PATCH 1100/1768] update email --- home/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/git.nix b/home/git.nix index 569ee7f..333fc89 100644 --- a/home/git.nix +++ b/home/git.nix @@ -1,7 +1,7 @@ { programs.git = { enable = true; - userEmail = "osmanfbayram@gmail.com"; + userEmail = "osbm@osbm.dev"; userName = "osbm"; signing = { format = "openpgp"; From bce761ca0990297e8a00b85e8b0481745c6c889a Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 16:12:18 +0300 Subject: [PATCH 1101/1768] another atomic signed commit attempt --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fbf67bd..576ecfa 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) - Android phone (termux) **android** (not setup yet) +
How to bootstrap raspberry pi 5 From efa2aa8751f5596db5ae5b8644a519569cb28450 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 16:24:09 +0300 Subject: [PATCH 1102/1768] formatting --- home/gpg.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/gpg.nix b/home/gpg.nix index d436e5b..4e6161a 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -1,4 +1,5 @@ -{pkgs, ...}:{ +{ pkgs, ... }: +{ services.gpg-agent = { enable = true; From 054d346c974460076a2e9ea80689e72ec02d056b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 16:37:33 +0300 Subject: [PATCH 1103/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 738c581..17dad40 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1753294394, - "narHash": "sha256-1Dfgq09lHZ8AdYB2Deu/mYP1pMNpob8CgqT5Mzo44eI=", + "lastModified": 1753470191, + "narHash": "sha256-hOUWU5L62G9sm8NxdiLWlLIJZz9H52VuFiDllHdwmVA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1fde6fb1be6cd5dc513dc1c287d69e4eb2de973e", + "rev": "a1817d1c0e5eabe7dfdfe4caa46c94d9d8f3fdb6", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { From 2d7a917bcb4a9f7a6a47612b11ec182c36eec9ed Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 16:38:27 +0300 Subject: [PATCH 1104/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 17dad40..34478fb 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753429684, + "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "lastModified": 1753399495, + "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1752762787, - "narHash": "sha256-WZLSOR2Pei7C4nH/ntKUqOZOAa5rgvc2fVZl4RoEXmw=", + "lastModified": 1753533009, + "narHash": "sha256-4KlfDVsYL9c3ogEehJcQOBZ+pUBH7Lwvlu2J6FCtSJc=", "owner": "nix-community", "repo": "nixvim", - "rev": "bc0555c8694d43fb63ae2c7afec08b6987431a04", + "rev": "29edaafdb088cee3d8c616a4a5bb48b5eecc647c", "type": "github" }, "original": { @@ -558,11 +558,11 @@ ] }, "locked": { - "lastModified": 1749730855, - "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", + "lastModified": 1753450833, + "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", "owner": "NuschtOS", "repo": "search", - "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", + "rev": "40987cc1a24feba378438d691f87c52819f7bd75", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1752766427, - "narHash": "sha256-kspZI9VEjvYGpROCENdKF/VoHb4lpmb9RABKAoXrRug=", + "lastModified": 1753537027, + "narHash": "sha256-pwfrl+LWLXr9Uj1JmXVqraLfCSW+qo+2cU34HTuFyKw=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "fa9212f81917ab124a54d9c4071c67ddc661a670", + "rev": "defe8b29463851b2f18127df63e203809c0fa5d1", "type": "github" }, "original": { From 9e7a252e8abf3475b0e9c962529ee41057178d65 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 19:48:03 +0300 Subject: [PATCH 1105/1768] write it programmatically --- flake.nix | 50 +++++-------------- .../atreus/configuration.nix | 0 2 files changed, 13 insertions(+), 37 deletions(-) rename {hosts => nixOnDroidHosts}/atreus/configuration.nix (100%) diff --git a/flake.nix b/flake.nix index e441fd2..ad01c66 100644 --- a/flake.nix +++ b/flake.nix @@ -58,48 +58,24 @@ ]; forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); makePkgs = system: import nixpkgs { inherit system; }; + makeNixosConfig = configName: nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/${configName}/configuration.nix ]; + }; + configNames = builtins.attrNames (builtins.readDir ./hosts); + + makeNixosConfigurations = config_folder: + let + configNames = builtins.attrNames (builtins.readDir config_folder); + in + nixpkgs.lib.genAttrs configNames (name: makeNixosConfig name); in { - nixosConfigurations = { - tartarus = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/tartarus/configuration.nix ]; - }; - ymir = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/ymir/configuration.nix ]; - }; - harmonica = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/harmonica/configuration.nix ]; - }; - harmonica-sd = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/harmonica-sd/configuration.nix ]; - }; - pochita = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/pochita/configuration.nix ]; - }; - pochita-sd = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/pochita-sd/configuration.nix ]; - }; - myISO = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./hosts/iso/configuration.nix - ]; - }; - wallfacer = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/wallfacer/configuration.nix ]; - }; - }; + nixosConfigurations = makeNixosConfigurations ./hosts; nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { extraSpecialArgs = { inherit inputs outputs; }; pkgs = import nixpkgs { system = "aarch64-linux"; }; - modules = [ ./hosts/atreus/configuration.nix ]; + modules = [ ./nixOnDroidHosts/atreus/configuration.nix ]; }; lib = import ./lib { inherit (nixpkgs) lib; }; diff --git a/hosts/atreus/configuration.nix b/nixOnDroidHosts/atreus/configuration.nix similarity index 100% rename from hosts/atreus/configuration.nix rename to nixOnDroidHosts/atreus/configuration.nix From 43faec87e8234fdcd7c752ed1b99744ec19b3163 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 20:00:43 +0300 Subject: [PATCH 1106/1768] fix warnings --- hosts/iso/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/iso/configuration.nix b/hosts/iso/configuration.nix index 999631c..f1f82f9 100644 --- a/hosts/iso/configuration.nix +++ b/hosts/iso/configuration.nix @@ -1,8 +1,6 @@ { - config, lib, pkgs, - system, inputs, ... }: From e62c09fe242f9f19e8755266f572a25d535501ea Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 20:00:55 +0300 Subject: [PATCH 1107/1768] add new apple system --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index ad01c66..08b6836 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,7 @@ "x86_64-linux" "aarch64-linux" "x86_64-darwin" + "aarch64-darwin" ]; forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); makePkgs = system: import nixpkgs { inherit system; }; From ac9e25b2d24840df3600e0324b8890dd32b2c14c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 20:01:08 +0300 Subject: [PATCH 1108/1768] shorter --- flake.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 08b6836..7ab285c 100644 --- a/flake.nix +++ b/flake.nix @@ -64,15 +64,9 @@ modules = [ ./hosts/${configName}/configuration.nix ]; }; configNames = builtins.attrNames (builtins.readDir ./hosts); - - makeNixosConfigurations = config_folder: - let - configNames = builtins.attrNames (builtins.readDir config_folder); - in - nixpkgs.lib.genAttrs configNames (name: makeNixosConfig name); in { - nixosConfigurations = makeNixosConfigurations ./hosts; + nixosConfigurations = nixpkgs.lib.genAttrs configNames (name: makeNixosConfig name); nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { extraSpecialArgs = { inherit inputs outputs; }; pkgs = import nixpkgs { system = "aarch64-linux"; }; From 9906399f0eb16ecf716a4c8e397f7ea044e0179c Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 23:19:58 +0300 Subject: [PATCH 1109/1768] ts is fucking hard --- flake.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/flake.nix b/flake.nix index 7ab285c..d2aeff3 100644 --- a/flake.nix +++ b/flake.nix @@ -82,5 +82,21 @@ path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; }; }; + packages = forAllSystems (system: + let + makeDotfilesPackages = machines: + builtins.listToAttrs (map (machine: { + name = "${machine}-dotfiles"; + value = self.nixosConfigurations.${machine}.config.home-manager.users.osbm.home-files; + }) machines); + dotfilesMachines = [ "ymir" "pochita" "tartarus" "wallfacer" ]; + in + { + # export home-manager dotfiles + # /nix/store/61b1rzwps27pa4gb3ql8kdddyz22nhnn-home-manager-files/.bashrc + # /nix/store/61b1rzwps27pa4gb3ql8kdddyz22nhnn-home-manager-files/.config/git/config + # etc. + } // (makeDotfilesPackages dotfilesMachines) + ); }; } From feea5f45b85585473832d391b85c3ea8b3de9cdc Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 26 Jul 2025 23:49:02 +0300 Subject: [PATCH 1110/1768] with system override --- flake.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index d2aeff3..e8000a7 100644 --- a/flake.nix +++ b/flake.nix @@ -84,19 +84,19 @@ }; packages = forAllSystems (system: let - makeDotfilesPackages = machines: - builtins.listToAttrs (map (machine: { - name = "${machine}-dotfiles"; - value = self.nixosConfigurations.${machine}.config.home-manager.users.osbm.home-files; - }) machines); - dotfilesMachines = [ "ymir" "pochita" "tartarus" "wallfacer" ]; + makeNixosConfigWithSystemOverride = configName: nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ + ./hosts/${configName}/configuration.nix + { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; } + ]; + }; + dotfilesMachineNames = [ "ymir" "pochita" "tartarus" "wallfacer" ]; in - { - # export home-manager dotfiles - # /nix/store/61b1rzwps27pa4gb3ql8kdddyz22nhnn-home-manager-files/.bashrc - # /nix/store/61b1rzwps27pa4gb3ql8kdddyz22nhnn-home-manager-files/.config/git/config - # etc. - } // (makeDotfilesPackages dotfilesMachines) + builtins.listToAttrs (map (name: { + name = "${name}-dotfiles"; + value = (makeNixosConfigWithSystemOverride name).config.home-manager.users.osbm.home-files; + }) dotfilesMachineNames) ); }; } From 0b551af8ef60d7a4ac7c1b239cf119c962f0bc8d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 02:51:16 +0300 Subject: [PATCH 1111/1768] add hydra to wallfacer --- hosts/wallfacer/configuration.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 9c059d9..84235cb 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -9,10 +9,19 @@ enableFonts = false; enableNextcloud = true; }; + + services.hydra = { + enable = true; + hydraURL = "http://localhost:54543"; + notificationSender = "hydra@localhost"; + buildMachinesFiles = []; + useSubstitutes = true; + }; + networking.firewall.allowedTCPPorts = [ 54543 ]; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; i18n.inputMethod.enable = lib.mkForce false; networking.hostName = "wallfacer"; - # services.getty.autologinUser = "osbm"; system.stateVersion = "25.05"; } From fc5b4d614e248953c2e5d80b2788e66cde9488dd Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 02:51:25 +0300 Subject: [PATCH 1112/1768] add paperless to the pochita --- hosts/pochita/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 5863e02..8858c27 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,6 +27,10 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; + services.paperless = { + enable = true; + }; + i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method networking.hostName = "pochita"; From 03525546d5e96837ba0187f20e795f40e47bab02 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 02:59:35 +0300 Subject: [PATCH 1113/1768] fix hydra port --- hosts/wallfacer/configuration.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 84235cb..012fcae 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -1,4 +1,7 @@ { lib, ... }: +let + hydraPort = 54543; +in { imports = [ ./hardware-configuration.nix @@ -12,12 +15,13 @@ services.hydra = { enable = true; - hydraURL = "http://localhost:54543"; + hydraURL = "http://localhost:${hydraPort}"; notificationSender = "hydra@localhost"; buildMachinesFiles = []; useSubstitutes = true; + }; - networking.firewall.allowedTCPPorts = [ 54543 ]; + networking.firewall.allowedTCPPorts = [ hydraPort ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From 1c6384e576b3266387933ce36ec88795abc1f26e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 03:01:00 +0300 Subject: [PATCH 1114/1768] convert it to string --- hosts/wallfacer/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 012fcae..ae2dc4a 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -15,7 +15,7 @@ in services.hydra = { enable = true; - hydraURL = "http://localhost:${hydraPort}"; + hydraURL = "http://localhost:${builtins.toString hydraPort}"; notificationSender = "hydra@localhost"; buildMachinesFiles = []; useSubstitutes = true; From 967b5f45e33b2791c91f0dce8177e92b42eda319 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 03:12:40 +0300 Subject: [PATCH 1115/1768] migrate hydra to ymir --- hosts/wallfacer/configuration.nix | 7 ------- hosts/ymir/configuration.nix | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index ae2dc4a..b3bd85a 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -13,14 +13,7 @@ in enableNextcloud = true; }; - services.hydra = { - enable = true; - hydraURL = "http://localhost:${builtins.toString hydraPort}"; - notificationSender = "hydra@localhost"; - buildMachinesFiles = []; - useSubstitutes = true; - }; networking.firewall.allowedTCPPorts = [ hydraPort ]; boot.loader.systemd-boot.enable = true; diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index b97b4a6..2173c24 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -30,6 +30,15 @@ networking.hostName = "ymir"; # Define your hostname. + services.hydra = { + enable = true; + hydraURL = "http://localhost:3000"; + notificationSender = "hydra@localhost"; + buildMachinesFiles = []; + useSubstitutes = true; + }; + + networking.firewall.allowedTCPPorts = [ 8889 8000 From f8b4880b0caa912a28f4be7a8587e6df8631e895 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 03:16:53 +0300 Subject: [PATCH 1116/1768] increase sudo grace period --- modules/default.nix | 1 + modules/security.nix | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 modules/security.nix diff --git a/modules/default.nix b/modules/default.nix index 06c0d5f..12cfa8e 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -15,6 +15,7 @@ ./nix-settings.nix ./remote-builds.nix ./secrets.nix + ./security.nix ./sound.nix ./users.nix ./wake-on-lan.nix diff --git a/modules/security.nix b/modules/security.nix new file mode 100644 index 0000000..980f102 --- /dev/null +++ b/modules/security.nix @@ -0,0 +1,5 @@ +{ + security.sudo.extraConfig = '' + Defaults timestamp_timeout=30 + ''; +} From e60af4626ed471e779e0f7f5516b162d333f41c2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 15:48:31 +0300 Subject: [PATCH 1117/1768] add hydra module --- modules/services/default.nix | 1 + modules/services/hydra.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 modules/services/hydra.nix diff --git a/modules/services/default.nix b/modules/services/default.nix index b679739..b8342a6 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -6,6 +6,7 @@ ./nextcloud.nix ./ollama.nix ./forgejo.nix + ./hydra.nix ./jellyfin.nix ./system-logger ./tailscale.nix diff --git a/modules/services/hydra.nix b/modules/services/hydra.nix new file mode 100644 index 0000000..70d9ffc --- /dev/null +++ b/modules/services/hydra.nix @@ -0,0 +1,30 @@ +{ + config, + lib, + ... +}: +{ + options = { + myModules.enableHydra = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Hydra continuous integration server"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableHydra { + services.hydra = { + enable = true; + port = 3000; + hydraURL = "http://localhost:${toString config.services.hydra.port}"; + notificationSender = "hydra@localhost"; + buildMachinesFiles = []; + useSubstitutes = true; + }; + networking.firewall.allowedTCPPorts = [ + config.services.hydra.port + ]; + }) + ]; +} From 9464f20626a336bbff58bdba65bb66dd82d85b09 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 15:48:40 +0300 Subject: [PATCH 1118/1768] update email --- modules/services/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index ad65ca7..b0bc3d1 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -23,7 +23,7 @@ plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ]; hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; }; - email = "contact@osbm.dev"; + email = "osbm@osbm.dev"; extraConfig = '' (cloudflare) { tls { From 85bfa6bf887603c60dafaa7e074d166763755fc8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 15:48:56 +0300 Subject: [PATCH 1119/1768] no hosts defined in modules --- modules/services/caddy.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index b0bc3d1..3a23199 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -34,29 +34,6 @@ # globalConfig = '' # acme_dns cloudflare {env.CF_API_TOKEN} # ''; - virtualHosts = { - "chat.osbm.dev" = { - extraConfig = '' - reverse_proxy ymir.curl-boga.ts.net:3000 - import cloudflare - ''; - }; - "aifred.osbm.dev" = { - extraConfig = '' - reverse_proxy ymir.curl-boga.ts.net:8000 - import cloudflare - ''; - }; - "git.osbm.dev" = { - serverAliases = [ - "www.git.osbm.dev" - ]; - extraConfig = '' - reverse_proxy pochita.curl-boga.ts.net:${toString config.services.forgejo.settings.server.HTTP_PORT} - import cloudflare - ''; - }; - }; }; networking.firewall.allowedTCPPorts = [ From 71fe24c18972648468bd7935ba8cad9b855c670d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 15:49:15 +0300 Subject: [PATCH 1120/1768] no hydra in ymir --- hosts/ymir/configuration.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 2173c24..be87341 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -30,14 +30,6 @@ networking.hostName = "ymir"; # Define your hostname. - services.hydra = { - enable = true; - hydraURL = "http://localhost:3000"; - notificationSender = "hydra@localhost"; - buildMachinesFiles = []; - useSubstitutes = true; - }; - networking.firewall.allowedTCPPorts = [ 8889 From 6b9a322f62e217846f55df10596a37c2ddbe4778 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 15:49:30 +0300 Subject: [PATCH 1121/1768] hydra is added to wallfacer --- hosts/wallfacer/configuration.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index b3bd85a..b42907b 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -1,6 +1,7 @@ { lib, ... }: let hydraPort = 54543; + wallfacerTailscaleDomain = "wallfacer.curl-boga.ts.net"; in { imports = [ @@ -11,9 +12,18 @@ in enableKDE = false; enableFonts = false; enableNextcloud = true; + enableHydra = true; }; - + services.caddy.virtualHosts = { + "${wallfacerTailscaleDomain}" = { + extraConfig = '' + handle_path /hydra* { + reverse_proxy localhost:${toString hydraPort} + } + ''; + }; + }; networking.firewall.allowedTCPPorts = [ hydraPort ]; boot.loader.systemd-boot.enable = true; From db6910de7d7e05cf8ee3af08bf44cbf4a28402ac Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 16:01:34 +0300 Subject: [PATCH 1122/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 34478fb..5eabd20 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1753470191, - "narHash": "sha256-hOUWU5L62G9sm8NxdiLWlLIJZz9H52VuFiDllHdwmVA=", + "lastModified": 1753617834, + "narHash": "sha256-WEVfKrdIdu5CpppJ0Va3vzP0DKlS+ZTLbBjugMO2Drg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1817d1c0e5eabe7dfdfe4caa46c94d9d8f3fdb6", + "rev": "72cc1e3134a35005006f06640724319caa424737", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1752985182, - "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", + "lastModified": 1753589988, + "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", + "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", "type": "github" }, "original": { From 9f5256b2ad61f2b00d7bfd12813cb86a7839d621 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 16:01:40 +0300 Subject: [PATCH 1123/1768] accept acme --- modules/services/caddy.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 3a23199..cd3ebea 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -55,6 +55,9 @@ systemd.services.caddy.serviceConfig = { EnvironmentFile = "/etc/caddy/.env"; }; + + security.acme.acceptTerms = true; + }) ]; } From 67620912825160aee19a1b661792b34e28a23fe4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 16:25:47 +0300 Subject: [PATCH 1124/1768] nextcloud shenanigans --- hosts/wallfacer/configuration.nix | 3 +++ modules/services/nextcloud.nix | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index b42907b..28cbe14 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -21,6 +21,9 @@ in handle_path /hydra* { reverse_proxy localhost:${toString hydraPort} } + handle_path /nextcloud* { + reverse_proxy localhost:443 + } ''; }; }; diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index a2667f0..77f1e37 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -19,12 +19,13 @@ services.nextcloud = { enable = true; package = pkgs.nextcloud31; - hostName = "localhost"; + hostName = "localhost/nextcloud"; config.adminpassFile = "/etc/nextcloud-admin-pass"; config.dbtype = "sqlite"; database.createLocally = true; settings.trusted_domains = [ "wallfacer.curl-boga.ts.net" + "localhost" ]; }; }) From e9483582dff1ef061b5064b4df22235acde2a015 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 16:34:23 +0300 Subject: [PATCH 1125/1768] testjust hydra --- hosts/wallfacer/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 28cbe14..173edc9 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -11,7 +11,7 @@ in myModules = { enableKDE = false; enableFonts = false; - enableNextcloud = true; + # enableNextcloud = true; enableHydra = true; }; @@ -22,7 +22,7 @@ in reverse_proxy localhost:${toString hydraPort} } handle_path /nextcloud* { - reverse_proxy localhost:443 + retun hello "Nextcloud is not configured yet. Please set up the service."; } ''; }; From 73f111f11c204578fb7a0cb54f2caee4fc94c089 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 16:38:26 +0300 Subject: [PATCH 1126/1768] move acme stuff and remove sudo clause --- hosts/pochita/configuration.nix | 12 ------------ modules/services/caddy.nix | 4 ++++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 8858c27..feb2aad 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -40,18 +40,6 @@ pkgs.raspberrypi-eeprom ]; - security.sudo = { - enable = true; - wheelNeedsPassword = false; - }; - - security.acme.defaults = { - email = "osmanfbayram@gmail.com"; - acceptTerms = true; - }; - - # services.getty.autologinUser = "osbm"; - # The board and wanted kernel version raspberry-pi-nix = { board = "bcm2712"; diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index cd3ebea..7b558fb 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -57,6 +57,10 @@ }; security.acme.acceptTerms = true; + security.acme.defaults = { + email = "osbm@osbm.dev"; + acceptTerms = true; + }; }) ]; From 47de86956e960d6fb2d8cdc2576018adc9319675 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 16:39:40 +0300 Subject: [PATCH 1127/1768] disable paperless for now --- hosts/pochita/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index feb2aad..0b5fd85 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,9 +27,10 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; - services.paperless = { - enable = true; - }; + # paperless is giving an error + # services.paperless = { + # enable = true; + # }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From 1432200cc613a437dbb0fd8120b1e3879cc439db Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 16:42:39 +0300 Subject: [PATCH 1128/1768] use correct port --- hosts/wallfacer/configuration.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 173edc9..a4b6cb0 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -1,6 +1,5 @@ -{ lib, ... }: +{ lib, config, ... }: let - hydraPort = 54543; wallfacerTailscaleDomain = "wallfacer.curl-boga.ts.net"; in { @@ -19,7 +18,7 @@ in "${wallfacerTailscaleDomain}" = { extraConfig = '' handle_path /hydra* { - reverse_proxy localhost:${toString hydraPort} + reverse_proxy localhost:${toString config.services.hydra.port} } handle_path /nextcloud* { retun hello "Nextcloud is not configured yet. Please set up the service."; @@ -27,7 +26,7 @@ in ''; }; }; - networking.firewall.allowedTCPPorts = [ hydraPort ]; + networking.firewall.allowedTCPPorts = [ config.services.hydra.port ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From f3534b5516e38888c305039514fca4a79d1ded5b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 17:11:14 +0300 Subject: [PATCH 1129/1768] fix url --- hosts/wallfacer/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index a4b6cb0..11032bb 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -17,11 +17,11 @@ in services.caddy.virtualHosts = { "${wallfacerTailscaleDomain}" = { extraConfig = '' - handle_path /hydra* { + handle_path /hydra/* { reverse_proxy localhost:${toString config.services.hydra.port} } - handle_path /nextcloud* { - retun hello "Nextcloud is not configured yet. Please set up the service."; + handle_path /nextcloud/* { + return hello "Nextcloud is not configured yet. Please set up the service." } ''; }; From a349b7a389b6ed6fc6437adc5a14500d7997891e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 17:16:20 +0300 Subject: [PATCH 1130/1768] fix hydra url --- modules/services/hydra.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/hydra.nix b/modules/services/hydra.nix index 70d9ffc..febcb37 100644 --- a/modules/services/hydra.nix +++ b/modules/services/hydra.nix @@ -17,7 +17,7 @@ services.hydra = { enable = true; port = 3000; - hydraURL = "http://localhost:${toString config.services.hydra.port}"; + hydraURL = "http://${config.networking.hostName}.curl-boga.ts.net/hydra/"; notificationSender = "hydra@localhost"; buildMachinesFiles = []; useSubstitutes = true; From 8cd61e7bcb9939923279630519f26f46b8eaa524 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 17:19:25 +0300 Subject: [PATCH 1131/1768] add caddy to walfacer --- hosts/wallfacer/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 11032bb..4011083 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -12,6 +12,7 @@ in enableFonts = false; # enableNextcloud = true; enableHydra = true; + enableCaddy = true; }; services.caddy.virtualHosts = { From 4d63dc34391dd6699f39154ccbe776909139f873 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 17:29:28 +0300 Subject: [PATCH 1132/1768] this is the stupitest shit ever --- modules/services/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 7b558fb..f2291f7 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -21,7 +21,7 @@ # update time to time # last update: 2025-03-02 plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ]; - hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc="; + hash = "sha256-x5SJSns16VaqOyKLCtaMIMWaooT+C0f9iSWKFBTywnA="; }; email = "osbm@osbm.dev"; extraConfig = '' From 87bf4ff2988fbac86040eb81a48371a771de3c9b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 17:37:06 +0300 Subject: [PATCH 1133/1768] use set version --- modules/services/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index f2291f7..038cd9d 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -20,7 +20,7 @@ package = pkgs.caddy.withPlugins { # update time to time # last update: 2025-03-02 - plugins = [ "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de" ]; + plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; hash = "sha256-x5SJSns16VaqOyKLCtaMIMWaooT+C0f9iSWKFBTywnA="; }; email = "osbm@osbm.dev"; From c81adb5f865c2d2046551829b091ae472426e99d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 17:38:48 +0300 Subject: [PATCH 1134/1768] update hash --- modules/services/caddy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index 038cd9d..ed97da1 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -21,7 +21,7 @@ # update time to time # last update: 2025-03-02 plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; - hash = "sha256-x5SJSns16VaqOyKLCtaMIMWaooT+C0f9iSWKFBTywnA="; + hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A="; }; email = "osbm@osbm.dev"; extraConfig = '' From cebc4cecec47630a6d689e62a0801f3b09a142a2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 17:58:47 +0300 Subject: [PATCH 1135/1768] fix command --- hosts/wallfacer/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 4011083..fd844ab 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -22,7 +22,7 @@ in reverse_proxy localhost:${toString config.services.hydra.port} } handle_path /nextcloud/* { - return hello "Nextcloud is not configured yet. Please set up the service." + respond "Nextcloud is not configured yet. Please set up the service." } ''; }; From b34deeabfb6662c7a0df641ad841c9ccf7cc7537 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 18:20:45 +0300 Subject: [PATCH 1136/1768] hmm --- hosts/wallfacer/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index fd844ab..67083e9 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -18,6 +18,7 @@ in services.caddy.virtualHosts = { "${wallfacerTailscaleDomain}" = { extraConfig = '' + tls off handle_path /hydra/* { reverse_proxy localhost:${toString config.services.hydra.port} } From ac6f9657f8e2753c5d8472219580bb75ec126b89 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 19:15:42 +0300 Subject: [PATCH 1137/1768] what if there was no tls --- modules/services/caddy.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix index ed97da1..650b868 100644 --- a/modules/services/caddy.nix +++ b/modules/services/caddy.nix @@ -17,20 +17,20 @@ (lib.mkIf config.myModules.enableCaddy { services.caddy = { enable = true; - package = pkgs.caddy.withPlugins { - # update time to time - # last update: 2025-03-02 - plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; - hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A="; - }; - email = "osbm@osbm.dev"; - extraConfig = '' - (cloudflare) { - tls { - dns cloudflare {env.CF_API_TOKEN} - } - } - ''; + # package = pkgs.caddy.withPlugins { + # # update time to time + # # last update: 2025-03-02 + # plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; + # hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A="; + # }; + # email = "osbm@osbm.dev"; + # extraConfig = '' + # (cloudflare) { + # tls { + # dns cloudflare {env.CF_API_TOKEN} + # } + # } + # ''; # globalConfig = '' # acme_dns cloudflare {env.CF_API_TOKEN} # ''; From f47f8cdb16d0b8a76deebad0769326ddea33b351 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 19:58:17 +0300 Subject: [PATCH 1138/1768] fucking halucination --- hosts/wallfacer/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 67083e9..fd844ab 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -18,7 +18,6 @@ in services.caddy.virtualHosts = { "${wallfacerTailscaleDomain}" = { extraConfig = '' - tls off handle_path /hydra/* { reverse_proxy localhost:${toString config.services.hydra.port} } From c5e1a8d83cb363bad17da432a6e30fa262d9e3b8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 20:26:48 +0300 Subject: [PATCH 1139/1768] add glance --- hosts/pochita/configuration.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 0b5fd85..69610da 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,6 +27,23 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; + services.glance = { + enable = true; + openFirewall = true; + settings = { + server = { + port = 3838; + host = "0.0.0.0"; + }; + pages = { + "home" = { + title = "Home"; + content = "Welcome to Pochita's home page!"; + }; + }; + }; + }; + # paperless is giving an error # services.paperless = { # enable = true; From 47e3d7a07c1d01986159706c002cc363a5cb3542 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 20:57:09 +0300 Subject: [PATCH 1140/1768] update --- hosts/pochita/configuration.nix | 49 +++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 69610da..3dd1f2c 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -35,12 +35,51 @@ port = 3838; host = "0.0.0.0"; }; - pages = { - "home" = { - title = "Home"; + pages = [ + { + columns = [ + { + size = "small"; + widgets = [ + {type = "calendar";} + { + type = "repository"; + repository = "NixOS/nixpkgs"; + } + ]; + } + { + size = "full"; + widgets = [ + { + type = "repository"; + repository = "NixOS/nixpkgs"; + } + { + cache = "1m"; + sites = [ + { + icon = "si:vaultwarden"; + title = "Vaultwarden"; + url = "https://ymir.curl-boga.ts.net:7070/"; + } + # http://ymir.curl-boga.ts.net:4444 ymir remote web vscode + { + icon = "si:vs-code"; + title = "Ymir Remote VSCode"; + url = "https://ymir.curl-boga.ts.net:4444/"; + } + ]; + title = "Services"; + type = "monitor"; + } + ]; + } + ]; + name = "Home"; content = "Welcome to Pochita's home page!"; - }; - }; + } + ]; }; }; From fc6d1e38aee0ff715f3ad85d66d7844cbc22ce67 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 21:04:33 +0300 Subject: [PATCH 1141/1768] update links --- hosts/pochita/configuration.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 3dd1f2c..32e0412 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -59,15 +59,15 @@ cache = "1m"; sites = [ { - icon = "si:vaultwarden"; - title = "Vaultwarden"; - url = "https://ymir.curl-boga.ts.net:7070/"; + icon = "si:ollama"; + title = "Open Webui"; + url = "http://ymir.curl-boga.ts.net:7070/"; } # http://ymir.curl-boga.ts.net:4444 ymir remote web vscode { icon = "si:vs-code"; title = "Ymir Remote VSCode"; - url = "https://ymir.curl-boga.ts.net:4444/"; + url = "http://ymir.curl-boga.ts.net:4444/"; } ]; title = "Services"; From b475086cb704f9acb9fba132ac8eac881f3ad6b0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 21:13:54 +0300 Subject: [PATCH 1142/1768] add tunnel --- modules/services/cloudflared.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 2855e56..f0f1978 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -17,20 +17,27 @@ services.cloudflared = { enable = true; certificateFile = "/home/osbm/.cloudflared/cert.pem"; - tunnels."eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { - default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; - ingress = { - "git.osbm.dev" = { - service = "http://localhost:3000"; + tunnels = { + "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; + ingress = { + "git.osbm.dev" = { + service = "http://localhost:3000"; + }; + }; + }; + "288d47fb-95ee-4019-9e07-6f918ab02357" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; + ingress = { + "git.osbm.dev" = { + service = "http://localhost:3000"; + }; }; }; }; }; - boot.kernel.sysctl = { - "net.core.rmem_max" = 7500000; - "net.core.wmem_max" = 7500000; - }; }) ]; } From 0024bd9c915505521c681c69ec6d32a2fc657512 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 21:19:09 +0300 Subject: [PATCH 1143/1768] create token --- modules/services/cloudflared.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index f0f1978..f92955d 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -29,7 +29,7 @@ }; "288d47fb-95ee-4019-9e07-6f918ab02357" = { default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; + credentialsFile = "/home/osbm/.cloudflared/288d47fb-95ee-4019-9e07-6f918ab02357.json"; ingress = { "git.osbm.dev" = { service = "http://localhost:3000"; From 6a78b183a76465cbe590a052567deb9255f91ed3 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 27 Jul 2025 21:25:30 +0300 Subject: [PATCH 1144/1768] now it seems sane --- modules/services/cloudflared.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index f92955d..bd75e32 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -27,12 +27,12 @@ }; }; }; - "288d47fb-95ee-4019-9e07-6f918ab02357" = { + "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/288d47fb-95ee-4019-9e07-6f918ab02357.json"; + credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; ingress = { - "git.osbm.dev" = { - service = "http://localhost:3000"; + "home.osbm.dev" = { + service = "http://localhost:3838"; }; }; }; From e64d78eb26d20619f9c61daaf4936f842bcc5c12 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 16:41:59 +0300 Subject: [PATCH 1145/1768] update services --- hosts/pochita/configuration.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 32e0412..25b49b5 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -63,12 +63,21 @@ title = "Open Webui"; url = "http://ymir.curl-boga.ts.net:7070/"; } - # http://ymir.curl-boga.ts.net:4444 ymir remote web vscode { - icon = "si:vs-code"; + icon = "sh:jellyfin"; + title = "Jellyfin"; + url = "htty://ymir.curl-boga.ts.net:8096/"; + } + { + icon = "sh:visual-studio-code"; title = "Ymir Remote VSCode"; url = "http://ymir.curl-boga.ts.net:4444/"; } + { + icon = "sh:visual-studio-code"; + title = "Tartarus Remote VSCode"; + url = "http://tartarus.curl-boga.ts.net:4444/" + } ]; title = "Services"; type = "monitor"; From ad336e0f264ecd1a811c7168c04981f4a8b743f7 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 16:42:48 +0300 Subject: [PATCH 1146/1768] forgot the semicolon --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 25b49b5..5309a11 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -76,7 +76,7 @@ { icon = "sh:visual-studio-code"; title = "Tartarus Remote VSCode"; - url = "http://tartarus.curl-boga.ts.net:4444/" + url = "http://tartarus.curl-boga.ts.net:4444/"; } ]; title = "Services"; From 42ed3bbee1a6fc52564fac2cf8c312d036ff4076 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 16:53:55 +0300 Subject: [PATCH 1147/1768] am i stupid --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 5309a11..555f7e3 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -66,7 +66,7 @@ { icon = "sh:jellyfin"; title = "Jellyfin"; - url = "htty://ymir.curl-boga.ts.net:8096/"; + url = "http://ymir.curl-boga.ts.net:8096/"; } { icon = "sh:visual-studio-code"; From 1f004550175632ec7f91480a12503e236d31ed0c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 17:14:20 +0300 Subject: [PATCH 1148/1768] add wallfacer --- hosts/pochita/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 555f7e3..96ab992 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -78,6 +78,11 @@ title = "Tartarus Remote VSCode"; url = "http://tartarus.curl-boga.ts.net:4444/"; } + { + icon = "sh:visual-studio-code"; + title = "Wallfacer Remote VSCode"; + url = "http://wallfacer.curl-boga.ts.net:4444/"; + } ]; title = "Services"; type = "monitor"; From 6fba29969c2b54a50b7e4c0532ed0a8fd0630a38 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 17:18:48 +0300 Subject: [PATCH 1149/1768] add hydra --- hosts/pochita/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 96ab992..e07120e 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -68,6 +68,11 @@ title = "Jellyfin"; url = "http://ymir.curl-boga.ts.net:8096/"; } + { + icon = "sh:nixos"; + title = "Hydra"; + url = "http://wallfacer.curl-boga.ts.net:3000"; + } { icon = "sh:visual-studio-code"; title = "Ymir Remote VSCode"; From 1fc43f9526e2170a57c3e1a969c84016dff874fa Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 17:23:00 +0300 Subject: [PATCH 1150/1768] add forgejo --- hosts/pochita/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index e07120e..1e0a2cc 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -58,6 +58,11 @@ { cache = "1m"; sites = [ + { + icon = "sh:forgejo"; + title = "Forgejo git server"; + url = "https://git.osbm.dev"; + } { icon = "si:ollama"; title = "Open Webui"; From bc879dafffbeaae253bfd490cd0673df112b93e3 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 17:47:24 +0300 Subject: [PATCH 1151/1768] add attic --- hosts/wallfacer/configuration.nix | 1 + modules/services/attic.nix | 29 +++++++++++++++++++++++++++++ modules/services/default.nix | 1 + 3 files changed, 31 insertions(+) create mode 100644 modules/services/attic.nix diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index fd844ab..a80d1ab 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -13,6 +13,7 @@ in # enableNextcloud = true; enableHydra = true; enableCaddy = true; + enableAttic = true; }; services.caddy.virtualHosts = { diff --git a/modules/services/attic.nix b/modules/services/attic.nix new file mode 100644 index 0000000..c914342 --- /dev/null +++ b/modules/services/attic.nix @@ -0,0 +1,29 @@ +{ + config, + lib, + ... +}: +{ + options = { + myModules.enableAttic = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Attic nix cache service"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableAttic { + services.atticd = { + enable = true; + settings = { + listen = "[::]:5000"; + storage = { + type = "local"; + path = "/data/atreus/attic"; + }; + }; + }; + }) + ]; +} diff --git a/modules/services/default.nix b/modules/services/default.nix index b8342a6..ed06ab8 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./attic.nix ./caddy.nix ./cloudflare-dyndns.nix ./cloudflared.nix From 27e0f06ac414a5fb528c0bc03e80ccc4fc6f4b0a Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 17:52:25 +0300 Subject: [PATCH 1152/1768] add attic environment --- modules/services/attic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index c914342..7e8013f 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -16,6 +16,7 @@ (lib.mkIf config.myModules.enableAttic { services.atticd = { enable = true; + environmentFile = "/persist/attic.env"; settings = { listen = "[::]:5000"; storage = { From 26bc49f4691940ee9521175e7886bfced34ea16b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 18:00:23 +0300 Subject: [PATCH 1153/1768] open port --- modules/services/attic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index 7e8013f..e0e8dd5 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -25,6 +25,8 @@ }; }; }; + networking.firewall.allowedTCPPorts = [ 5000 ]; + }) ]; } From c7f63271fa3f66643cc44312e04d92c99a236d77 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 18:06:52 +0300 Subject: [PATCH 1154/1768] add attic --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index b5e9a75..6032369 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -49,6 +49,7 @@ du-dust dysk gnupg + attic ]; environment.variables = { From 52507e1786c3b103aab09c5aee90304b250214b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 18:56:16 +0300 Subject: [PATCH 1155/1768] will this work --- modules/services/attic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index e0e8dd5..29bd432 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -19,6 +19,7 @@ environmentFile = "/persist/attic.env"; settings = { listen = "[::]:5000"; + jwt = { }; storage = { type = "local"; path = "/data/atreus/attic"; From 87200aa51896bce60097660e29a9b41db233e005 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 18:57:52 +0300 Subject: [PATCH 1156/1768] fix --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 6032369..8734142 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -49,7 +49,7 @@ du-dust dysk gnupg - attic + attic-client ]; environment.variables = { From 0721bb416638a62fad64ba8c5b5b0c1b89a6ba30 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:12:58 +0300 Subject: [PATCH 1157/1768] move forgejo tunnel config --- modules/services/cloudflared.nix | 9 --------- modules/services/forgejo.nix | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index bd75e32..961e38d 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -18,15 +18,6 @@ enable = true; certificateFile = "/home/osbm/.cloudflared/cert.pem"; tunnels = { - "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { - default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; - ingress = { - "git.osbm.dev" = { - service = "http://localhost:3000"; - }; - }; - }; "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { default = "http_status:404"; credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index de92f35..a5d8487 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -41,6 +41,17 @@ }; }; }; + services.cloudflared.tunnels = { + "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; + ingress = { + "git.osbm.dev" = { + service = "http://localhost:3000"; + }; + }; + }; + }; }) ]; } From 0ce31f137b4f365a6b31dff74f4ab2887fcb8b63 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:14:53 +0300 Subject: [PATCH 1158/1768] move glance away --- hosts/pochita/configuration.nix | 81 +---------------------- modules/services/default.nix | 1 + modules/services/glance.nix | 110 ++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 80 deletions(-) create mode 100644 modules/services/glance.nix diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 1e0a2cc..688920a 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -22,91 +22,12 @@ # enableCloudflareDyndns = true; enableCloudflared = true; enableVaultwarden = true; + enableGlance = true; }; services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; - services.glance = { - enable = true; - openFirewall = true; - settings = { - server = { - port = 3838; - host = "0.0.0.0"; - }; - pages = [ - { - columns = [ - { - size = "small"; - widgets = [ - {type = "calendar";} - { - type = "repository"; - repository = "NixOS/nixpkgs"; - } - ]; - } - { - size = "full"; - widgets = [ - { - type = "repository"; - repository = "NixOS/nixpkgs"; - } - { - cache = "1m"; - sites = [ - { - icon = "sh:forgejo"; - title = "Forgejo git server"; - url = "https://git.osbm.dev"; - } - { - icon = "si:ollama"; - title = "Open Webui"; - url = "http://ymir.curl-boga.ts.net:7070/"; - } - { - icon = "sh:jellyfin"; - title = "Jellyfin"; - url = "http://ymir.curl-boga.ts.net:8096/"; - } - { - icon = "sh:nixos"; - title = "Hydra"; - url = "http://wallfacer.curl-boga.ts.net:3000"; - } - { - icon = "sh:visual-studio-code"; - title = "Ymir Remote VSCode"; - url = "http://ymir.curl-boga.ts.net:4444/"; - } - { - icon = "sh:visual-studio-code"; - title = "Tartarus Remote VSCode"; - url = "http://tartarus.curl-boga.ts.net:4444/"; - } - { - icon = "sh:visual-studio-code"; - title = "Wallfacer Remote VSCode"; - url = "http://wallfacer.curl-boga.ts.net:4444/"; - } - ]; - title = "Services"; - type = "monitor"; - } - ]; - } - ]; - name = "Home"; - content = "Welcome to Pochita's home page!"; - } - ]; - }; - }; - # paperless is giving an error # services.paperless = { # enable = true; diff --git a/modules/services/default.nix b/modules/services/default.nix index ed06ab8..8a9183b 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -7,6 +7,7 @@ ./nextcloud.nix ./ollama.nix ./forgejo.nix + ./glance.nix ./hydra.nix ./jellyfin.nix ./system-logger diff --git a/modules/services/glance.nix b/modules/services/glance.nix new file mode 100644 index 0000000..25de628 --- /dev/null +++ b/modules/services/glance.nix @@ -0,0 +1,110 @@ +{ + lib, + config, + ... +}: +{ + options = { + myModules.enableGlance = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Glance server"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableGlance { + services.glance = { + enable = true; + openFirewall = true; + settings = { + server = { + port = 3838; + host = "0.0.0.0"; + }; + pages = [ + { + columns = [ + { + size = "small"; + widgets = [ + {type = "calendar";} + { + type = "repository"; + repository = "NixOS/nixpkgs"; + } + ]; + } + { + size = "full"; + widgets = [ + { + type = "repository"; + repository = "NixOS/nixpkgs"; + } + { + cache = "1m"; + sites = [ + { + icon = "sh:forgejo"; + title = "Forgejo git server"; + url = "https://git.osbm.dev"; + } + { + icon = "si:ollama"; + title = "Open Webui"; + url = "http://ymir.curl-boga.ts.net:7070/"; + } + { + icon = "sh:jellyfin"; + title = "Jellyfin"; + url = "http://ymir.curl-boga.ts.net:8096/"; + } + { + icon = "sh:nixos"; + title = "Hydra"; + url = "http://wallfacer.curl-boga.ts.net:3000"; + } + { + icon = "sh:visual-studio-code"; + title = "Ymir Remote VSCode"; + url = "http://ymir.curl-boga.ts.net:4444/"; + } + { + icon = "sh:visual-studio-code"; + title = "Tartarus Remote VSCode"; + url = "http://tartarus.curl-boga.ts.net:4444/"; + } + { + icon = "sh:visual-studio-code"; + title = "Wallfacer Remote VSCode"; + url = "http://wallfacer.curl-boga.ts.net:4444/"; + } + ]; + title = "Services"; + type = "monitor"; + } + ]; + } + ]; + name = "Home"; + content = "Welcome to Pochita's home page!"; + } + ]; + }; + }; + networking.firewall.allowedTCPPorts = [ config.services.glance.port ]; + services.cloudflared.tunnels = { + "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; + ingress = { + "home.osbm.dev" = { + service = "http://localhost:3838"; + }; + }; + }; + }; + }) + ]; +} From 89e82e910e7cb557fb2492bee321ee57b9a27e1f Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:15:35 +0300 Subject: [PATCH 1159/1768] move the glance tunnel --- modules/services/cloudflared.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/modules/services/cloudflared.nix b/modules/services/cloudflared.nix index 961e38d..ec42ef6 100644 --- a/modules/services/cloudflared.nix +++ b/modules/services/cloudflared.nix @@ -17,17 +17,6 @@ services.cloudflared = { enable = true; certificateFile = "/home/osbm/.cloudflared/cert.pem"; - tunnels = { - "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { - default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; - ingress = { - "home.osbm.dev" = { - service = "http://localhost:3838"; - }; - }; - }; - }; }; }) ]; From e2048ff4f2e2657aa219fcaff713190269bad3a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:20:09 +0300 Subject: [PATCH 1160/1768] add cloudflare tunnel for attix --- modules/services/attic.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index 29bd432..3b96993 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -27,7 +27,17 @@ }; }; networking.firewall.allowedTCPPorts = [ 5000 ]; - + services.cloudflared.tunnels = { + "fa301a21-b259-4149-b3d0-b1438c7c81f8" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/fa301a21-b259-4149-b3d0-b1438c7c81f8.json"; + ingress = { + "cache.osbm.dev" = { + service = "http://localhost:5000"; + }; + }; + }; + }; }) ]; } From a29ad67bd54503d1d12af8707023388d4a4be31e Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:22:49 +0300 Subject: [PATCH 1161/1768] enable cloudflared --- hosts/wallfacer/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index a80d1ab..d668bcd 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -14,6 +14,7 @@ in enableHydra = true; enableCaddy = true; enableAttic = true; + enableCloudflared = true; }; services.caddy.virtualHosts = { From 2b617ae4a447bf856faabab756ef32c3d66a1d73 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:27:49 +0300 Subject: [PATCH 1162/1768] add attix nix cache to glance --- modules/services/glance.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 25de628..a4706a2 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -65,6 +65,11 @@ title = "Hydra"; url = "http://wallfacer.curl-boga.ts.net:3000"; } + { + icon = "sh:nixos"; + title = "Attix Binary Cache"; + url = "https://cache.osbm.dev"; + } { icon = "sh:visual-studio-code"; title = "Ymir Remote VSCode"; From 7e18c35912ac833971e169176239927b6f9fd04c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:30:29 +0300 Subject: [PATCH 1163/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 5eabd20..807ec03 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1753617834, - "narHash": "sha256-WEVfKrdIdu5CpppJ0Va3vzP0DKlS+ZTLbBjugMO2Drg=", + "lastModified": 1753709185, + "narHash": "sha256-fU0XPSNudRJHvbeMK2qWBXEbfd77t7r+e9V2L9ON5kI=", "owner": "nix-community", "repo": "home-manager", - "rev": "72cc1e3134a35005006f06640724319caa424737", + "rev": "20cf285e9f8e5e3968abca80081c03ea96e7ea73", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1753549186, + "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "17f6bd177404d6d43017595c5264756764444ab8", "type": "github" }, "original": { From a48910b046f2a62a723486b102d72460a3e58dc3 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 28 Jul 2025 22:31:46 +0300 Subject: [PATCH 1164/1768] fix port in glance --- modules/services/glance.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index a4706a2..eb9f937 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -98,14 +98,14 @@ ]; }; }; - networking.firewall.allowedTCPPorts = [ config.services.glance.port ]; + networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ]; services.cloudflared.tunnels = { "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { default = "http_status:404"; credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; ingress = { "home.osbm.dev" = { - service = "http://localhost:3838"; + service = "http://localhost:${toString config.services.glance.settings.server.port}"; }; }; }; From 29c782efb22378fa98c19ccb406ee78f8ca04558 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Jul 2025 00:35:52 +0300 Subject: [PATCH 1165/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 807ec03..037bd00 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1753709185, - "narHash": "sha256-fU0XPSNudRJHvbeMK2qWBXEbfd77t7r+e9V2L9ON5kI=", + "lastModified": 1753732062, + "narHash": "sha256-vojVM0SgFP8crFh1LDDXkzaI9/er/1cuRfbNPhfBHyc=", "owner": "nix-community", "repo": "home-manager", - "rev": "20cf285e9f8e5e3968abca80081c03ea96e7ea73", + "rev": "f49e872f55e36e67ebcb906ff65f86c7a1538f7c", "type": "github" }, "original": { From dbb8efeec25bbec015a9dc07b3846552453a2b35 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Jul 2025 00:51:26 +0300 Subject: [PATCH 1166/1768] formatting --- flake.nix | 46 +++++++---- hosts/ymir/configuration.nix | 1 - modules/services/glance.nix | 150 +++++++++++++++++------------------ modules/services/hydra.nix | 2 +- 4 files changed, 105 insertions(+), 94 deletions(-) diff --git a/flake.nix b/flake.nix index e8000a7..6fa0ab3 100644 --- a/flake.nix +++ b/flake.nix @@ -59,10 +59,12 @@ ]; forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); makePkgs = system: import nixpkgs { inherit system; }; - makeNixosConfig = configName: nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/${configName}/configuration.nix ]; - }; + makeNixosConfig = + configName: + nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ ./hosts/${configName}/configuration.nix ]; + }; configNames = builtins.attrNames (builtins.readDir ./hosts); in { @@ -82,21 +84,31 @@ path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; }; }; - packages = forAllSystems (system: + packages = forAllSystems ( + system: let - makeNixosConfigWithSystemOverride = configName: nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./hosts/${configName}/configuration.nix - { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; } - ]; - }; - dotfilesMachineNames = [ "ymir" "pochita" "tartarus" "wallfacer" ]; + makeNixosConfigWithSystemOverride = + configName: + nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ + ./hosts/${configName}/configuration.nix + { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; } + ]; + }; + dotfilesMachineNames = [ + "ymir" + "pochita" + "tartarus" + "wallfacer" + ]; in - builtins.listToAttrs (map (name: { - name = "${name}-dotfiles"; - value = (makeNixosConfigWithSystemOverride name).config.home-manager.users.osbm.home-files; - }) dotfilesMachineNames) + builtins.listToAttrs ( + map (name: { + name = "${name}-dotfiles"; + value = (makeNixosConfigWithSystemOverride name).config.home-manager.users.osbm.home-files; + }) dotfilesMachineNames + ) ); }; } diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index be87341..b97b4a6 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -30,7 +30,6 @@ networking.hostName = "ymir"; # Define your hostname. - networking.firewall.allowedTCPPorts = [ 8889 8000 diff --git a/modules/services/glance.nix b/modules/services/glance.nix index eb9f937..c59cb3a 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -14,90 +14,90 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableGlance { - services.glance = { - enable = true; - openFirewall = true; - settings = { - server = { - port = 3838; - host = "0.0.0.0"; - }; - pages = [ - { - columns = [ + services.glance = { + enable = true; + openFirewall = true; + settings = { + server = { + port = 3838; + host = "0.0.0.0"; + }; + pages = [ { - size = "small"; - widgets = [ - {type = "calendar";} + columns = [ { - type = "repository"; - repository = "NixOS/nixpkgs"; - } - ]; - } - { - size = "full"; - widgets = [ - { - type = "repository"; - repository = "NixOS/nixpkgs"; - } - { - cache = "1m"; - sites = [ + size = "small"; + widgets = [ + { type = "calendar"; } { - icon = "sh:forgejo"; - title = "Forgejo git server"; - url = "https://git.osbm.dev"; - } - { - icon = "si:ollama"; - title = "Open Webui"; - url = "http://ymir.curl-boga.ts.net:7070/"; - } - { - icon = "sh:jellyfin"; - title = "Jellyfin"; - url = "http://ymir.curl-boga.ts.net:8096/"; - } - { - icon = "sh:nixos"; - title = "Hydra"; - url = "http://wallfacer.curl-boga.ts.net:3000"; - } - { - icon = "sh:nixos"; - title = "Attix Binary Cache"; - url = "https://cache.osbm.dev"; - } - { - icon = "sh:visual-studio-code"; - title = "Ymir Remote VSCode"; - url = "http://ymir.curl-boga.ts.net:4444/"; - } - { - icon = "sh:visual-studio-code"; - title = "Tartarus Remote VSCode"; - url = "http://tartarus.curl-boga.ts.net:4444/"; - } - { - icon = "sh:visual-studio-code"; - title = "Wallfacer Remote VSCode"; - url = "http://wallfacer.curl-boga.ts.net:4444/"; + type = "repository"; + repository = "NixOS/nixpkgs"; + } + ]; + } + { + size = "full"; + widgets = [ + { + type = "repository"; + repository = "NixOS/nixpkgs"; + } + { + cache = "1m"; + sites = [ + { + icon = "sh:forgejo"; + title = "Forgejo git server"; + url = "https://git.osbm.dev"; + } + { + icon = "si:ollama"; + title = "Open Webui"; + url = "http://ymir.curl-boga.ts.net:7070/"; + } + { + icon = "sh:jellyfin"; + title = "Jellyfin"; + url = "http://ymir.curl-boga.ts.net:8096/"; + } + { + icon = "sh:nixos"; + title = "Hydra"; + url = "http://wallfacer.curl-boga.ts.net:3000"; + } + { + icon = "sh:nixos"; + title = "Attix Binary Cache"; + url = "https://cache.osbm.dev"; + } + { + icon = "sh:visual-studio-code"; + title = "Ymir Remote VSCode"; + url = "http://ymir.curl-boga.ts.net:4444/"; + } + { + icon = "sh:visual-studio-code"; + title = "Tartarus Remote VSCode"; + url = "http://tartarus.curl-boga.ts.net:4444/"; + } + { + icon = "sh:visual-studio-code"; + title = "Wallfacer Remote VSCode"; + url = "http://wallfacer.curl-boga.ts.net:4444/"; + } + ]; + title = "Services"; + type = "monitor"; } ]; - title = "Services"; - type = "monitor"; } ]; + name = "Home"; + content = "Welcome to Pochita's home page!"; } ]; - name = "Home"; - content = "Welcome to Pochita's home page!"; - } - ]; - }; - }; + }; + }; networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ]; services.cloudflared.tunnels = { "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { diff --git a/modules/services/hydra.nix b/modules/services/hydra.nix index febcb37..73ba924 100644 --- a/modules/services/hydra.nix +++ b/modules/services/hydra.nix @@ -19,7 +19,7 @@ port = 3000; hydraURL = "http://${config.networking.hostName}.curl-boga.ts.net/hydra/"; notificationSender = "hydra@localhost"; - buildMachinesFiles = []; + buildMachinesFiles = [ ]; useSubstitutes = true; }; networking.firewall.allowedTCPPorts = [ From dfac42ff0d2e77908b3c0752e52dbaeed5bb5150 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Jul 2025 02:25:01 +0300 Subject: [PATCH 1167/1768] add new glance bookmarks --- modules/services/glance.nix | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index c59cb3a..c32f3cc 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -30,8 +30,37 @@ widgets = [ { type = "calendar"; } { - type = "repository"; - repository = "NixOS/nixpkgs"; + type = "bookmarks"; + groups = [ + { + title = "My Profiles"; + same-tab = true; + color = "200 50 50"; + links = [ + { + title = "GitHub"; + url = "https://github.com/osbm"; + } + { + title = "Gitlab"; + url = "https://gitlab.com/osbm"; + } + { + title = "Crates.io"; + url = "https://crates.io/users/osbm"; + } + ]; + } + { + title = "Documents"; + links = [ + { + title = "Nixos Search"; + url = "https://search.nixos.org"; + } + ]; + } + ]; } ]; } From 11998e17656a9137eca67522252c3951e3074e9a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Jul 2025 02:31:29 +0300 Subject: [PATCH 1168/1768] add search --- modules/services/glance.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index c32f3cc..7e141b3 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -64,12 +64,30 @@ } ]; } + { size = "full"; widgets = [ { - type = "repository"; - repository = "NixOS/nixpkgs"; + type = "search"; + search-engine = "google"; + bangs = [ + { + title = "youtube"; + shortcut = "!yt"; + url = "https://www.youtube.com/results?search_query={QUERY}"; + } + { + title = "nixpkgs"; + shortcut = "!np"; + url = "https://search.nixos.org/packages?channel=unstable&query={QUERY}"; + } + { + title = "nixos"; + shortcut = "!no"; + url = "https://search.nixos.org/options?channel=unstable&query={QUERY}"; + } + ]; } { cache = "1m"; From c8384ecee48d71960baaba65b68cd6ef1be78520 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Jul 2025 02:34:03 +0300 Subject: [PATCH 1169/1768] add more links --- modules/services/glance.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 7e141b3..2aca0b1 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -49,6 +49,22 @@ title = "Crates.io"; url = "https://crates.io/users/osbm"; } + { + title = "HuggingFace"; + url = "https://huggingface.co/osbm"; + } + { + title = "Bluesky"; + url = "https://bsky.app/profile/osbm.dev"; + } + { + title = "Docker Hub"; + url = "https://hub.docker.com/u/osbm"; + } + { + title = "Kaggle"; + url = "https://www.kaggle.com/osmanf"; + } ]; } { From 3e39a2c1f9e0d11d77aecda7aead47c21eaa0b43 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 29 Jul 2025 02:36:11 +0300 Subject: [PATCH 1170/1768] add custom cute ass footer --- modules/services/glance.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 2aca0b1..1145ab2 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -22,6 +22,10 @@ port = 3838; host = "0.0.0.0"; }; + branding = { + # stolen from notohh/snowflake but i love it so much + custom-footer = ''

ᓚᘏᗢ

''; + }; pages = [ { columns = [ From 11a6aaa02827cab053dd3f4a5d38ccd704da1968 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 00:13:41 +0300 Subject: [PATCH 1171/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 037bd00..170f421 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1753732062, - "narHash": "sha256-vojVM0SgFP8crFh1LDDXkzaI9/er/1cuRfbNPhfBHyc=", + "lastModified": 1753822434, + "narHash": "sha256-yNjk/R2ca+rQm6PWzwKpa+MZZGkNnr6Y8rBf+ZZ6ICo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f49e872f55e36e67ebcb906ff65f86c7a1538f7c", + "rev": "909d39391efa9a1f74f7386cb6919b2722e06310", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753549186, - "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17f6bd177404d6d43017595c5264756764444ab8", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { From cc3e6a941ad125a2b510e71420542c549a4d2643 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 00:17:05 +0300 Subject: [PATCH 1172/1768] enabl nextcloud for ymir --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index b97b4a6..eb412f2 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -22,6 +22,7 @@ enableADB = true; enableOllama = true; enableMinegrubTheme = true; + enableNextcloud = true; }; # Bootloader. From 1b4810e72a56f967d31bcc34c5606e4b6e43e53a Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 00:21:57 +0300 Subject: [PATCH 1173/1768] gives error :( --- modules/graphical-interface.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix index 62d37b5..d04ac63 100644 --- a/modules/graphical-interface.nix +++ b/modules/graphical-interface.nix @@ -52,7 +52,6 @@ gimp kitty obs-studio - audacity qbittorrent ani-cli prismlauncher From 4566fbb8872214d52242d037c9f84171b425a651 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 00:46:11 +0300 Subject: [PATCH 1174/1768] add syncthing --- modules/services/default.nix | 1 + modules/services/syncthing.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 modules/services/syncthing.nix diff --git a/modules/services/default.nix b/modules/services/default.nix index 8a9183b..bc459ac 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -11,6 +11,7 @@ ./hydra.nix ./jellyfin.nix ./system-logger + ./syncthing.nix ./tailscale.nix ./vaultwarden.nix ./vscode-server.nix diff --git a/modules/services/syncthing.nix b/modules/services/syncthing.nix new file mode 100644 index 0000000..0be3b52 --- /dev/null +++ b/modules/services/syncthing.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + ... +}: +{ + options = { + myModules.enableSyncthing = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Syncthing file synchronization service"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableSyncthing { + services.syncthing = { + enable = true; + openDefaultPorts = true; + # port is 8384 + }; + }) + ]; +} From 8f70e53c618e7efb0c88f154e0e3b0bd0c5dcdbc Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 17:04:54 +0300 Subject: [PATCH 1175/1768] enable paperless --- hosts/pochita/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 688920a..2d31424 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -29,9 +29,9 @@ services.wanikani-fetch-data.enable = true; # paperless is giving an error - # services.paperless = { - # enable = true; - # }; + services.paperless = { + enable = true; + }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From f9d72d6c1a1fd46cadfa6b67d04300691984c31f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 17:05:19 +0300 Subject: [PATCH 1176/1768] enable nextcloud and disable caddy --- hosts/wallfacer/configuration.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index d668bcd..0fa9883 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -1,8 +1,4 @@ -{ lib, config, ... }: -let - wallfacerTailscaleDomain = "wallfacer.curl-boga.ts.net"; -in -{ +{ lib, config, ... }: { imports = [ ./hardware-configuration.nix ../../modules @@ -10,27 +6,13 @@ in myModules = { enableKDE = false; enableFonts = false; - # enableNextcloud = true; + enableNextcloud = true; enableHydra = true; - enableCaddy = true; + # enableCaddy = true; enableAttic = true; enableCloudflared = true; }; - services.caddy.virtualHosts = { - "${wallfacerTailscaleDomain}" = { - extraConfig = '' - handle_path /hydra/* { - reverse_proxy localhost:${toString config.services.hydra.port} - } - handle_path /nextcloud/* { - respond "Nextcloud is not configured yet. Please set up the service." - } - ''; - }; - }; - networking.firewall.allowedTCPPorts = [ config.services.hydra.port ]; - boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; i18n.inputMethod.enable = lib.mkForce false; From e5a41e1992e14c5ad4e9ffc3e467cc86459246c4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 18:04:01 +0300 Subject: [PATCH 1177/1768] unset path --- modules/services/attic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index 3b96993..17399ab 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -22,7 +22,8 @@ jwt = { }; storage = { type = "local"; - path = "/data/atreus/attic"; + # path = "/data/atreus/attic"; + # there is an issue }; }; }; From 8ef65267ac9c3da1d4a62f5f8c313d1dc3831681 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 18:11:11 +0300 Subject: [PATCH 1178/1768] specify hosts --- modules/services/attic.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index 17399ab..f85b22c 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -19,6 +19,12 @@ environmentFile = "/persist/attic.env"; settings = { listen = "[::]:5000"; + allowedHosts = [ + "cache.osbm.dev" + "wallfacer.curl-boga.ts.net" + "localhost" + "wallfacer" + ]; jwt = { }; storage = { type = "local"; From e19cc410874bc52e01585818154e349d6e7e74d8 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 18:11:22 +0300 Subject: [PATCH 1179/1768] will this work --- modules/services/attic.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index f85b22c..8d61f65 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -26,11 +26,11 @@ "wallfacer" ]; jwt = { }; - storage = { - type = "local"; - # path = "/data/atreus/attic"; - # there is an issue - }; + # storage = { + # type = "local"; + # # path = "/data/atreus/attic"; + # # there is an issue + # }; }; }; networking.firewall.allowedTCPPorts = [ 5000 ]; From d865c96158ecad47cc7147191a788e2d3bcb4a99 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 30 Jul 2025 18:14:08 +0300 Subject: [PATCH 1180/1768] hotfix --- modules/services/attic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index 8d61f65..d1b3ffb 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -19,7 +19,7 @@ environmentFile = "/persist/attic.env"; settings = { listen = "[::]:5000"; - allowedHosts = [ + allowed-hosts = [ "cache.osbm.dev" "wallfacer.curl-boga.ts.net" "localhost" From 10a6483cc59acd171154532f3ac0039f4eba0de5 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 15:56:56 +0300 Subject: [PATCH 1181/1768] error out here --- modules/services/wanikani-bypass-lessons.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 43b48b4..df3493d 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -19,7 +19,7 @@ let # i am going to read it from /persist/wanikani - [ ! -e /persist/wanikani ] && echo "/persist/wanikani doesnt exist here :(" + [ ! -e /persist/wanikani ] && echo "/persist/wanikani doesnt exist here :(" && exit 1 WANIKANI_TOKEN=$(< /persist/wanikani) From 15a40b93fd65f453abae58d1f2e0933acfa36875 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 15:59:30 +0300 Subject: [PATCH 1182/1768] update flake.lock --- modules/services/wanikani-bypass-lessons.nix | 51 +++++++++++++++++--- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index df3493d..3ead51c 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -23,20 +23,56 @@ let WANIKANI_TOKEN=$(< /persist/wanikani) - ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) + # Maximum number of reviews to maintain + MAX_REVIEWS=200 - echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" + echo "=== Checking current reviews ===" + + # Get current reviews (SRS stages 0-4) + current_reviews=0 + for i in {0..4}; do + stage_count=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?srs_stages=$i" | jq '.total_count') + current_reviews=$((current_reviews + stage_count)) + echo "SRS stage $i: $stage_count items" + done + + echo "Current total reviews: $current_reviews" + echo "Maximum reviews target: $MAX_REVIEWS" + + if [ $current_reviews -ge $MAX_REVIEWS ]; then + echo "Reviews ($current_reviews) >= max ($MAX_REVIEWS). No lessons to bypass." + sleep 3600 + exit 0 + fi + + lessons_to_bypass=$((MAX_REVIEWS - current_reviews)) + echo "Need to bypass $lessons_to_bypass lessons to reach $MAX_REVIEWS total" + + # Get available lessons (limited to what we need) + ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq -r ".data[] | .id" | head -n $lessons_to_bypass) + + available_lessons=$(echo "$ASSIGNMENT_IDS" | wc -l) + echo "Available lessons: $available_lessons" + + if [ $available_lessons -eq 0 ]; then + echo "No lessons available to bypass." + sleep 3600 + exit 0 + fi + + # Limit to what we actually need + actual_bypass=$(echo "$ASSIGNMENT_IDS" | wc -l) + echo "Will bypass $actual_bypass lessons" # "2017-09-05T23:41:28.980679Z" i need to create this from current time TIME_STRING=$(date -u +"%Y-%m-%dT%H:%M:%S.%6NZ") - echo "Current time:" - echo "$TIME_STRING" + echo "Current time: $TIME_STRING" - # echo Starting assignments: + echo "=== Starting assignments ===" for assignment_id in $ASSIGNMENT_IDS; do echo "Starting assignment $assignment_id" - curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ + curl -s "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ -X "PUT" \ -H "Wanikani-Revision: 20170710" \ -H "Content-Type: application/json; charset=utf-8" \ @@ -45,6 +81,9 @@ let echo sleep 1 done + + echo "Successfully bypassed $actual_bypass lessons" + echo "New total should be approximately: $((current_reviews + actual_bypass))" sleep 3600 ''; }; From 0a7c41a3e48eb875a91f372a9a93151b43e061af Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 16:00:04 +0300 Subject: [PATCH 1183/1768] Revert "update flake.lock" This reverts commit 15a40b93fd65f453abae58d1f2e0933acfa36875. --- modules/services/wanikani-bypass-lessons.nix | 51 +++----------------- 1 file changed, 6 insertions(+), 45 deletions(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 3ead51c..df3493d 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -23,56 +23,20 @@ let WANIKANI_TOKEN=$(< /persist/wanikani) - # Maximum number of reviews to maintain - MAX_REVIEWS=200 + ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) - echo "=== Checking current reviews ===" - - # Get current reviews (SRS stages 0-4) - current_reviews=0 - for i in {0..4}; do - stage_count=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?srs_stages=$i" | jq '.total_count') - current_reviews=$((current_reviews + stage_count)) - echo "SRS stage $i: $stage_count items" - done - - echo "Current total reviews: $current_reviews" - echo "Maximum reviews target: $MAX_REVIEWS" - - if [ $current_reviews -ge $MAX_REVIEWS ]; then - echo "Reviews ($current_reviews) >= max ($MAX_REVIEWS). No lessons to bypass." - sleep 3600 - exit 0 - fi - - lessons_to_bypass=$((MAX_REVIEWS - current_reviews)) - echo "Need to bypass $lessons_to_bypass lessons to reach $MAX_REVIEWS total" - - # Get available lessons (limited to what we need) - ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq -r ".data[] | .id" | head -n $lessons_to_bypass) - - available_lessons=$(echo "$ASSIGNMENT_IDS" | wc -l) - echo "Available lessons: $available_lessons" - - if [ $available_lessons -eq 0 ]; then - echo "No lessons available to bypass." - sleep 3600 - exit 0 - fi - - # Limit to what we actually need - actual_bypass=$(echo "$ASSIGNMENT_IDS" | wc -l) - echo "Will bypass $actual_bypass lessons" + echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" # "2017-09-05T23:41:28.980679Z" i need to create this from current time TIME_STRING=$(date -u +"%Y-%m-%dT%H:%M:%S.%6NZ") - echo "Current time: $TIME_STRING" + echo "Current time:" + echo "$TIME_STRING" - echo "=== Starting assignments ===" + # echo Starting assignments: for assignment_id in $ASSIGNMENT_IDS; do echo "Starting assignment $assignment_id" - curl -s "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ + curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ -X "PUT" \ -H "Wanikani-Revision: 20170710" \ -H "Content-Type: application/json; charset=utf-8" \ @@ -81,9 +45,6 @@ let echo sleep 1 done - - echo "Successfully bypassed $actual_bypass lessons" - echo "New total should be approximately: $((current_reviews + actual_bypass))" sleep 3600 ''; }; From a3dddf25e5cd048e01365e804e18010c3dcfe71e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 16:00:10 +0300 Subject: [PATCH 1184/1768] cap the reviews This reverts commit 0a7c41a3e48eb875a91f372a9a93151b43e061af. --- modules/services/wanikani-bypass-lessons.nix | 51 +++++++++++++++++--- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index df3493d..3ead51c 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -23,20 +23,56 @@ let WANIKANI_TOKEN=$(< /persist/wanikani) - ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq ".data[] | .id" ) + # Maximum number of reviews to maintain + MAX_REVIEWS=200 - echo "number of assignments: $(echo "$ASSIGNMENT_IDS" | wc -l)" + echo "=== Checking current reviews ===" + + # Get current reviews (SRS stages 0-4) + current_reviews=0 + for i in {0..4}; do + stage_count=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?srs_stages=$i" | jq '.total_count') + current_reviews=$((current_reviews + stage_count)) + echo "SRS stage $i: $stage_count items" + done + + echo "Current total reviews: $current_reviews" + echo "Maximum reviews target: $MAX_REVIEWS" + + if [ $current_reviews -ge $MAX_REVIEWS ]; then + echo "Reviews ($current_reviews) >= max ($MAX_REVIEWS). No lessons to bypass." + sleep 3600 + exit 0 + fi + + lessons_to_bypass=$((MAX_REVIEWS - current_reviews)) + echo "Need to bypass $lessons_to_bypass lessons to reach $MAX_REVIEWS total" + + # Get available lessons (limited to what we need) + ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq -r ".data[] | .id" | head -n $lessons_to_bypass) + + available_lessons=$(echo "$ASSIGNMENT_IDS" | wc -l) + echo "Available lessons: $available_lessons" + + if [ $available_lessons -eq 0 ]; then + echo "No lessons available to bypass." + sleep 3600 + exit 0 + fi + + # Limit to what we actually need + actual_bypass=$(echo "$ASSIGNMENT_IDS" | wc -l) + echo "Will bypass $actual_bypass lessons" # "2017-09-05T23:41:28.980679Z" i need to create this from current time TIME_STRING=$(date -u +"%Y-%m-%dT%H:%M:%S.%6NZ") - echo "Current time:" - echo "$TIME_STRING" + echo "Current time: $TIME_STRING" - # echo Starting assignments: + echo "=== Starting assignments ===" for assignment_id in $ASSIGNMENT_IDS; do echo "Starting assignment $assignment_id" - curl "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ + curl -s "https://api.wanikani.com/v2/assignments/$assignment_id/start" \ -X "PUT" \ -H "Wanikani-Revision: 20170710" \ -H "Content-Type: application/json; charset=utf-8" \ @@ -45,6 +81,9 @@ let echo sleep 1 done + + echo "Successfully bypassed $actual_bypass lessons" + echo "New total should be approximately: $((current_reviews + actual_bypass))" sleep 3600 ''; }; From 3b85743ace2b935fa5be4aa6e5a631d3018dce5c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 16:11:51 +0300 Subject: [PATCH 1185/1768] shellcheck suggestions --- modules/services/wanikani-bypass-lessons.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/services/wanikani-bypass-lessons.nix index 3ead51c..c15ba61 100644 --- a/modules/services/wanikani-bypass-lessons.nix +++ b/modules/services/wanikani-bypass-lessons.nix @@ -39,7 +39,7 @@ let echo "Current total reviews: $current_reviews" echo "Maximum reviews target: $MAX_REVIEWS" - if [ $current_reviews -ge $MAX_REVIEWS ]; then + if [ "$current_reviews" -ge "$MAX_REVIEWS" ]; then echo "Reviews ($current_reviews) >= max ($MAX_REVIEWS). No lessons to bypass." sleep 3600 exit 0 @@ -49,12 +49,12 @@ let echo "Need to bypass $lessons_to_bypass lessons to reach $MAX_REVIEWS total" # Get available lessons (limited to what we need) - ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq -r ".data[] | .id" | head -n $lessons_to_bypass) + ASSIGNMENT_IDS=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_lessons=true" | jq -r ".data[] | .id" | head -n "$lessons_to_bypass") available_lessons=$(echo "$ASSIGNMENT_IDS" | wc -l) echo "Available lessons: $available_lessons" - if [ $available_lessons -eq 0 ]; then + if [ "$available_lessons" -eq 0 ]; then echo "No lessons available to bypass." sleep 3600 exit 0 From d6fd5c5e1323eb1e4176f5e659f964a9d0da2df0 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 16:43:02 +0300 Subject: [PATCH 1186/1768] i am sick of this actually --- hosts/pochita/configuration.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 2d31424..688920a 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -29,9 +29,9 @@ services.wanikani-fetch-data.enable = true; # paperless is giving an error - services.paperless = { - enable = true; - }; + # services.paperless = { + # enable = true; + # }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From 48279ca657f1fc7c97dadfae0bf359591ee19513 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 17:22:11 +0300 Subject: [PATCH 1187/1768] init the service --- hosts/pochita/configuration.nix | 1 + modules/services/default.nix | 1 + modules/services/wanikani-stats/app.py | 30 ++++++++++ modules/services/wanikani-stats/default.nix | 61 +++++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 modules/services/wanikani-stats/app.py create mode 100644 modules/services/wanikani-stats/default.nix diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 688920a..30149a6 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,6 +27,7 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; + services.wanikani-stats.enable = true; # paperless is giving an error # services.paperless = { diff --git a/modules/services/default.nix b/modules/services/default.nix index bc459ac..440cfbd 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -17,5 +17,6 @@ ./vscode-server.nix ./wanikani-bypass-lessons.nix ./wanikani-fetch-data + ./wanikani-stats ]; } diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py new file mode 100644 index 0000000..e03e9cc --- /dev/null +++ b/modules/services/wanikani-stats/app.py @@ -0,0 +1,30 @@ +import zipfile +import json +from pathlib import Path +import streamlit as st +import pandas as pd +import matplotlib.pyplot as plt + +DATA_DIR = Path("/var/lib/wanikani-logs") + +def load_data(): + records = [] + for zip_path in sorted(DATA_DIR.glob("wanikani_data_*.zip")): + st.write(f"Processing {zip_path.name}...") + # with zipfile.ZipFile(zip_path) as z: + # for name in z.namelist(): + # with z.open(name) as f: + # data = json.load(f) + # date = zip_path.stem.split("_")[-1] + # # Adapt below to match your JSON structure + # record = { + # "date": date, + # "available_lessons": data.get("lessons", {}).get("available", 0), + # "level": data.get("level", 0), + # } + # records.append(record) + # return pd.DataFrame(records) + +st.title("📈 WaniKani Progress Tracker") +# df = load_data() +# st.line_chart(df.set_index("date")) \ No newline at end of file diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix new file mode 100644 index 0000000..a64549c --- /dev/null +++ b/modules/services/wanikani-stats/default.nix @@ -0,0 +1,61 @@ +{ + pkgs, + config, + lib, + ... +}: +let + wanikani-stats-streamlit = pkgs.writeShellApplication { + name = "wanikani-stats-streamlit"; + runtimeInputs = [ + pkgs.python312.withPackages ( + ppkgs: + with pkgs.python312Packages; [ + pip + streamlit + ] + ) + ]; + text = '' + #!/usr/bin/env bash + exec streamlit run /path/to/your/wanikani_stats_app.py + ''; + }; +in +{ + options.services.wanikani-stats = { + enable = lib.mkEnableOption { + description = "Enable WaniKani Stats Service"; + default = false; + }; + + logDirectory = lib.mkOption { + type = lib.types.path; + default = "/var/lib/wanikani-logs"; + description = "Directory to get the log archives"; + }; + }; + + config = lib.mkIf config.services.wanikani-stats.enable { + # systemd.timers.wanikani-stats = { + # description = "WaniKani Stats Timer"; + # wantedBy = [ "timers.target" ]; + # timerConfig = { + # OnCalendar = "daily"; + # Persistent = true; + # }; + # }; + + systemd.services.wanikani-stats = { + description = "WaniKani Stats Service"; + serviceConfig = { + Type = "simple"; + ExecStart = "${lib.getExe wanikani-stats-streamlit}"; + Restart = "always"; + RestartSec = 60; + User = "root"; + Group = "root"; + }; + }; + }; +} From 8881c46831df96a133be12edd1ddfbe9ac0836af Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 17:24:31 +0300 Subject: [PATCH 1188/1768] will this work --- modules/services/wanikani-stats/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index a64549c..7689855 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -8,13 +8,14 @@ let wanikani-stats-streamlit = pkgs.writeShellApplication { name = "wanikani-stats-streamlit"; runtimeInputs = [ - pkgs.python312.withPackages ( + (pkgs.python312.withPackages ( ppkgs: with pkgs.python312Packages; [ pip streamlit ] ) + ) ]; text = '' #!/usr/bin/env bash From 01cd5f097870bdb0930ae6adb051d7f5a9941bce Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 18:05:29 +0300 Subject: [PATCH 1189/1768] will this work --- modules/services/wanikani-stats/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 7689855..bbb71ac 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -49,11 +49,12 @@ in systemd.services.wanikani-stats = { description = "WaniKani Stats Service"; + after = [ "network.target" ]; serviceConfig = { Type = "simple"; ExecStart = "${lib.getExe wanikani-stats-streamlit}"; - Restart = "always"; - RestartSec = 60; + WorkingDirectory = "/var/lib/wanikani-stats"; + Restart = "on-failure"; User = "root"; Group = "root"; }; From 7603dfccb40746a9314be0ad249a59ce4047ba00 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 18:22:52 +0300 Subject: [PATCH 1190/1768] add debug layer --- modules/services/wanikani-stats/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index e03e9cc..acc286e 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -6,7 +6,7 @@ import pandas as pd import matplotlib.pyplot as plt DATA_DIR = Path("/var/lib/wanikani-logs") - +print("starting the WaniKani service") def load_data(): records = [] for zip_path in sorted(DATA_DIR.glob("wanikani_data_*.zip")): @@ -27,4 +27,4 @@ def load_data(): st.title("📈 WaniKani Progress Tracker") # df = load_data() -# st.line_chart(df.set_index("date")) \ No newline at end of file +# st.line_chart(df.set_index("date")) From 63129b076fedca0598ef3c6ab1cc704181bc174a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 18:27:45 +0300 Subject: [PATCH 1191/1768] set port --- modules/services/wanikani-stats/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index bbb71ac..1c0efaf 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -19,7 +19,9 @@ let ]; text = '' #!/usr/bin/env bash - exec streamlit run /path/to/your/wanikani_stats_app.py + echo "Starting WaniKani Stats Streamlit app..." + cat ${./app.py} + exec streamlit run ${./app.py} --server.port ${toString config.services.wanikani-stats.port} ''; }; in @@ -35,6 +37,12 @@ in default = "/var/lib/wanikani-logs"; description = "Directory to get the log archives"; }; + + port = lib.mkOption { + type = lib.types.port; + default = 8501; + description = "Port for the WaniKani Stats service"; + }; }; config = lib.mkIf config.services.wanikani-stats.enable { From bd3185260eba2626f2f3b686669d4f4a7f6e0835 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 18:28:05 +0300 Subject: [PATCH 1192/1768] allow port --- modules/services/wanikani-stats/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 1c0efaf..ffea25a 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -54,6 +54,9 @@ in # Persistent = true; # }; # }; + networking.firewall.allowedTCPPorts = [ + config.services.wanikani-stats.port + ]; systemd.services.wanikani-stats = { description = "WaniKani Stats Service"; From a1b010369b7965029996efb627fed25b9094c4f9 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 18:36:02 +0300 Subject: [PATCH 1193/1768] add wanted by --- modules/services/wanikani-stats/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index ffea25a..abc01ee 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -61,6 +61,7 @@ in systemd.services.wanikani-stats = { description = "WaniKani Stats Service"; after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; ExecStart = "${lib.getExe wanikani-stats-streamlit}"; From b72b02b5c1c66bb3a21d8cc658157e23e7cfc7b6 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 18:41:15 +0300 Subject: [PATCH 1194/1768] make the directory a state directory --- modules/services/wanikani-stats/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index abc01ee..1d81e4b 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -65,7 +65,7 @@ in serviceConfig = { Type = "simple"; ExecStart = "${lib.getExe wanikani-stats-streamlit}"; - WorkingDirectory = "/var/lib/wanikani-stats"; + StateDirectory = "/var/lib/wanikani-stats"; Restart = "on-failure"; User = "root"; Group = "root"; From da7ce676f0e9a282282df7feb1b37f66b5b2cd3c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 18:47:00 +0300 Subject: [PATCH 1195/1768] add missing deps --- modules/services/wanikani-stats/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 1d81e4b..57ba095 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -13,6 +13,10 @@ let with pkgs.python312Packages; [ pip streamlit + matplotlib + pandas + numpy + seaborn ] ) ) From bfaad76553258569d960b0d19bdfd5f29e89060f Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 20:21:11 +0300 Subject: [PATCH 1196/1768] remove debug line --- modules/services/wanikani-stats/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 57ba095..7306f06 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -24,7 +24,6 @@ let text = '' #!/usr/bin/env bash echo "Starting WaniKani Stats Streamlit app..." - cat ${./app.py} exec streamlit run ${./app.py} --server.port ${toString config.services.wanikani-stats.port} ''; }; From 7388c1b0dc805ea5c1f84cfff7f7f554f72f6d50 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 20:54:23 +0300 Subject: [PATCH 1197/1768] print files --- modules/services/wanikani-stats/app.py | 29 +++++++++++++------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index acc286e..704f345 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -8,23 +8,24 @@ import matplotlib.pyplot as plt DATA_DIR = Path("/var/lib/wanikani-logs") print("starting the WaniKani service") def load_data(): - records = [] + # records = [] for zip_path in sorted(DATA_DIR.glob("wanikani_data_*.zip")): st.write(f"Processing {zip_path.name}...") - # with zipfile.ZipFile(zip_path) as z: - # for name in z.namelist(): - # with z.open(name) as f: - # data = json.load(f) - # date = zip_path.stem.split("_")[-1] - # # Adapt below to match your JSON structure - # record = { - # "date": date, - # "available_lessons": data.get("lessons", {}).get("available", 0), - # "level": data.get("level", 0), - # } - # records.append(record) + with zipfile.ZipFile(zip_path) as z: + for name in z.namelist(): + print(f"Processing file: {name}") + # with z.open(name) as f: + # data = json.load(f) + # date = zip_path.stem.split("_")[-1] + # # Adapt below to match your JSON structure + # record = { + # "date": date, + # "available_lessons": data.get("lessons", {}).get("available", 0), + # "level": data.get("level", 0), + # } + # records.append(record) # return pd.DataFrame(records) st.title("📈 WaniKani Progress Tracker") -# df = load_data() +df = load_data() # st.line_chart(df.set_index("date")) From 8420594456103e644b997a5f65955d85a727068d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 21:02:11 +0300 Subject: [PATCH 1198/1768] how is speed now? --- modules/services/wanikani-stats/app.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 704f345..ef2b2c4 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -3,7 +3,6 @@ import json from pathlib import Path import streamlit as st import pandas as pd -import matplotlib.pyplot as plt DATA_DIR = Path("/var/lib/wanikani-logs") print("starting the WaniKani service") @@ -27,5 +26,5 @@ def load_data(): # return pd.DataFrame(records) st.title("📈 WaniKani Progress Tracker") -df = load_data() +# df = load_data() # st.line_chart(df.set_index("date")) From 9e22e1a0278613a4168d91c08d3e6780fb018157 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 21:08:21 +0300 Subject: [PATCH 1199/1768] disable telemetry --- modules/services/wanikani-stats/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 7306f06..ca6b928 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -24,7 +24,9 @@ let text = '' #!/usr/bin/env bash echo "Starting WaniKani Stats Streamlit app..." - exec streamlit run ${./app.py} --server.port ${toString config.services.wanikani-stats.port} + exec streamlit run ${./app.py} \ + --server.port ${toString config.services.wanikani-stats.port} \ + --browser.gatherUsageStats false ''; }; in From 7a987bdc3980f9af25c3db651c366e03bd8312c6 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 21:37:19 +0300 Subject: [PATCH 1200/1768] add new page --- modules/services/glance.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 1145ab2..7d361fc 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -162,6 +162,23 @@ name = "Home"; content = "Welcome to Pochita's home page!"; } + + { + columns = [ + { + size = "full"; + widgets = [ + { + type = "extension"; + url = "http://localhost:8501"; + } + ]; + } + ]; + name = "Wanikani Stats"; + content = "Welcome to Wanikani Stats page!"; + } + ]; }; }; From 6d22445254da73366ff00adf1d97674e41730a7a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 21:37:53 +0300 Subject: [PATCH 1201/1768] update nix script --- modules/services/wanikani-stats/default.nix | 26 ++++++--------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index ca6b928..afbdbf2 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -5,28 +5,24 @@ ... }: let - wanikani-stats-streamlit = pkgs.writeShellApplication { - name = "wanikani-stats-streamlit"; + wanikani-stats-flask = pkgs.writeShellApplication { + name = "wanikani-stats-flask"; runtimeInputs = [ (pkgs.python312.withPackages ( ppkgs: with pkgs.python312Packages; [ - pip - streamlit - matplotlib + flask pandas numpy - seaborn + jinja2 ] ) ) ]; text = '' #!/usr/bin/env bash - echo "Starting WaniKani Stats Streamlit app..." - exec streamlit run ${./app.py} \ - --server.port ${toString config.services.wanikani-stats.port} \ - --browser.gatherUsageStats false + echo "Starting WaniKani Stats Flask app..." + exec python ${./app.py} ${toString config.services.wanikani-stats.port} ''; }; in @@ -51,14 +47,6 @@ in }; config = lib.mkIf config.services.wanikani-stats.enable { - # systemd.timers.wanikani-stats = { - # description = "WaniKani Stats Timer"; - # wantedBy = [ "timers.target" ]; - # timerConfig = { - # OnCalendar = "daily"; - # Persistent = true; - # }; - # }; networking.firewall.allowedTCPPorts = [ config.services.wanikani-stats.port ]; @@ -69,7 +57,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "${lib.getExe wanikani-stats-streamlit}"; + ExecStart = "${lib.getExe wanikani-stats-flask}"; StateDirectory = "/var/lib/wanikani-stats"; Restart = "on-failure"; User = "root"; From 8ac80a6d245467417d287368add96c05c4df58ab Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 21:38:08 +0300 Subject: [PATCH 1202/1768] update script --- modules/services/wanikani-stats/app.py | 260 ++++++++++++++++++++++--- 1 file changed, 237 insertions(+), 23 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index ef2b2c4..2ec3615 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -1,30 +1,244 @@ import zipfile import json from pathlib import Path -import streamlit as st +from flask import Flask, render_template_string, Response import pandas as pd +from datetime import datetime +app = Flask(__name__) DATA_DIR = Path("/var/lib/wanikani-logs") -print("starting the WaniKani service") -def load_data(): - # records = [] - for zip_path in sorted(DATA_DIR.glob("wanikani_data_*.zip")): - st.write(f"Processing {zip_path.name}...") - with zipfile.ZipFile(zip_path) as z: - for name in z.namelist(): - print(f"Processing file: {name}") - # with z.open(name) as f: - # data = json.load(f) - # date = zip_path.stem.split("_")[-1] - # # Adapt below to match your JSON structure - # record = { - # "date": date, - # "available_lessons": data.get("lessons", {}).get("available", 0), - # "level": data.get("level", 0), - # } - # records.append(record) - # return pd.DataFrame(records) -st.title("📈 WaniKani Progress Tracker") -# df = load_data() -# st.line_chart(df.set_index("date")) +print("Starting WaniKani Flask service") + +def load_data(): + """Load and process WaniKani data from zip files""" + records = [] + try: + for zip_path in sorted(DATA_DIR.glob("wanikani_data_*.zip")): + print(f"Processing {zip_path.name}...") + with zipfile.ZipFile(zip_path) as z: + for name in z.namelist(): + if name.endswith('.json'): + try: + with z.open(name) as f: + data = json.load(f) + date = zip_path.stem.split("_")[-1] + # Extract relevant data from the JSON structure + record = { + "date": date, + "available_lessons": data.get("lessons", {}).get("available", 0) if isinstance(data.get("lessons"), dict) else 0, + "level": data.get("level", 0), + "reviews_available": data.get("reviews", {}).get("available", 0) if isinstance(data.get("reviews"), dict) else 0, + } + records.append(record) + except (json.JSONDecodeError, KeyError, TypeError) as e: + print(f"Error processing {name}: {e}") + continue + except Exception as e: + print(f"Error loading data: {e}") + + return pd.DataFrame(records) if records else pd.DataFrame() + +def generate_chart_html(df): + """Generate HTML with embedded chart using Chart.js""" + if df.empty: + return "

No data available

" + + # Prepare data for Chart.js + dates = df['date'].tolist() + levels = df['level'].tolist() + lessons = df['available_lessons'].tolist() + reviews = df['reviews_available'].tolist() + + chart_html = f""" +
+ +
+ + + """ + return chart_html + +HTML_TEMPLATE = """ + + + + + + + + +
+ {% if has_data %} +
+
+
{{ current_level }}
+
Current Level
+
+
+
{{ available_lessons }}
+
Lessons
+
+
+
{{ available_reviews }}
+
Reviews
+
+
+
+ {{ chart_html|safe }} +
+ {% else %} +
+

📚 No WaniKani data available

+

Check if data files exist in {{ data_dir }}

+
+ {% endif %} +
+ + +""" + +@app.route('/') +def index(): + """Main endpoint for Glance extension""" + df = load_data() + + # Prepare template variables + template_vars = { + 'has_data': not df.empty, + 'data_dir': str(DATA_DIR), + 'chart_html': '', + 'current_level': 0, + 'available_lessons': 0, + 'available_reviews': 0 + } + + if not df.empty: + # Get latest stats + latest = df.iloc[-1] + template_vars.update({ + 'current_level': int(latest['level']), + 'available_lessons': int(latest['available_lessons']), + 'available_reviews': int(latest['reviews_available']), + 'chart_html': generate_chart_html(df) + }) + + html = render_template_string(HTML_TEMPLATE, **template_vars) + + # Create response with Glance extension headers + response = Response(html, mimetype='text/html') + response.headers['Widget-Title'] = '📚 WaniKani Stats' + response.headers['Widget-Content-Type'] = 'html' + + return response + +@app.route('/health') +def health(): + """Health check endpoint""" + return {'status': 'ok', 'service': 'wanikani-stats'} + +if __name__ == '__main__': + import sys + port = int(sys.argv[1]) if len(sys.argv) > 1 else 8501 + print(f"Starting WaniKani Stats Flask app on port {port}") + app.run(host='0.0.0.0', port=port, debug=False) From 20ee7a9edea7c18b88cc316301e2b28d5c4423bc Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 21:44:33 +0300 Subject: [PATCH 1203/1768] add wanikani --- modules/services/glance.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 7d361fc..ca9c1a4 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -152,6 +152,11 @@ title = "Wallfacer Remote VSCode"; url = "http://wallfacer.curl-boga.ts.net:4444/"; } + { + icon = "sh:json"; + title = "Wanikani Stats Health"; + url = "http://localhost:8501/health"; + } ]; title = "Services"; type = "monitor"; From e383a1a3bcb5c5e3607ced7671855bc3f7f8d649 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 21:48:13 +0300 Subject: [PATCH 1204/1768] hotfix --- modules/services/glance.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index ca9c1a4..906dd6d 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -153,7 +153,7 @@ url = "http://wallfacer.curl-boga.ts.net:4444/"; } { - icon = "sh:json"; + icon = "si:json"; title = "Wanikani Stats Health"; url = "http://localhost:8501/health"; } From 7d28799fb94a3a3041898fc628097537613efc9e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:16:18 +0300 Subject: [PATCH 1205/1768] update script --- modules/services/wanikani-stats/app.py | 307 ++++++++----------------- 1 file changed, 95 insertions(+), 212 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 2ec3615..ca6d31f 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -4,233 +4,115 @@ from pathlib import Path from flask import Flask, render_template_string, Response import pandas as pd from datetime import datetime +import matplotlib.pyplot as plt +import seaborn as sns +import matplotlib +import functools +matplotlib.use('agg') +sns.set_theme(style="whitegrid") app = Flask(__name__) -DATA_DIR = Path("/var/lib/wanikani-logs") +DATA_DIR = Path("./data") -print("Starting WaniKani Flask service") +def get_zip_file_names(): + """Get a list of zip files in the data directory.""" + return [f for f in DATA_DIR.glob("*.zip") if f.is_file()] -def load_data(): - """Load and process WaniKani data from zip files""" - records = [] - try: - for zip_path in sorted(DATA_DIR.glob("wanikani_data_*.zip")): - print(f"Processing {zip_path.name}...") - with zipfile.ZipFile(zip_path) as z: - for name in z.namelist(): - if name.endswith('.json'): - try: - with z.open(name) as f: - data = json.load(f) - date = zip_path.stem.split("_")[-1] - # Extract relevant data from the JSON structure - record = { - "date": date, - "available_lessons": data.get("lessons", {}).get("available", 0) if isinstance(data.get("lessons"), dict) else 0, - "level": data.get("level", 0), - "reviews_available": data.get("reviews", {}).get("available", 0) if isinstance(data.get("reviews"), dict) else 0, - } - records.append(record) - except (json.JSONDecodeError, KeyError, TypeError) as e: - print(f"Error processing {name}: {e}") - continue - except Exception as e: - print(f"Error loading data: {e}") - return pd.DataFrame(records) if records else pd.DataFrame() +# this is an expensive function so we will cache the results +@functools.lru_cache(maxsize=None) +def load_zip(zip_path): + print(f"Processing {zip_path}") + """Load a zip file and return its contents as a dictionary.""" + with zipfile.ZipFile(zip_path, 'r') as z: + data = {} + # just read summary.json + with z.open("summary.json") as f: + summary_data = json.load(f) + num_reviews = len(summary_data['data']['reviews'][0]["subject_ids"]) + num_lessons = len(summary_data['data']['lessons'][0]["subject_ids"]) + data["num_reviews"] = num_reviews + data["num_lessons"] = num_lessons + # wanikani_data_2025-05-18.zip + data["date"] = zip_path.stem.split('_')[-1].replace('.zip', '') + return data -def generate_chart_html(df): - """Generate HTML with embedded chart using Chart.js""" - if df.empty: - return "

No data available

" +def get_dataframe(list_of_daily_data): + """Convert a list of daily data dictionaries into a pandas DataFrame.""" + df = pd.DataFrame(list_of_daily_data) + return df - # Prepare data for Chart.js - dates = df['date'].tolist() - levels = df['level'].tolist() - lessons = df['available_lessons'].tolist() - reviews = df['reviews_available'].tolist() +def render_html(df): + """Render the DataFrame as HTML.""" + import io - chart_html = f""" -
- -
- - + # Generate reviews plot SVG + plt.figure(figsize=(10, 5)) + plt.plot(df['date'], df['num_reviews'], marker='o', label='Reviews') + plt.title('Daily Reviews') + plt.xlabel('Date') + plt.ylabel('Number of Reviews') + # Show every 10th date label + plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) + plt.grid() + plt.legend() + + # Save to string buffer + reviews_buffer = io.StringIO() + plt.savefig(reviews_buffer, format='svg') + reviews_svg = reviews_buffer.getvalue() + reviews_buffer.close() + plt.close() + + # Generate lessons plot SVG + plt.figure(figsize=(10, 5)) + plt.plot(df['date'], df['num_lessons'], marker='o', label='Lessons', color='orange') + plt.title('Daily Lessons') + plt.xlabel('Date') + plt.ylabel('Number of Lessons') + # Show every 10th date label + plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) + plt.grid() + plt.legend() + + # Save to string buffer + lessons_buffer = io.StringIO() + plt.savefig(lessons_buffer, format='svg') + lessons_svg = lessons_buffer.getvalue() + lessons_buffer.close() + plt.close() + + # Render HTML with embedded SVGs + html_content = f""" + + WaniKani Stats + +

WaniKani Daily Stats

+

Reviews

+ {reviews_svg} +

Lessons

+ {lessons_svg} + + """ - return chart_html - -HTML_TEMPLATE = """ - - - - - - - - -
- {% if has_data %} -
-
-
{{ current_level }}
-
Current Level
-
-
-
{{ available_lessons }}
-
Lessons
-
-
-
{{ available_reviews }}
-
Reviews
-
-
-
- {{ chart_html|safe }} -
- {% else %} -
-

📚 No WaniKani data available

-

Check if data files exist in {{ data_dir }}

-
- {% endif %} -
- - -""" + return render_template_string(html_content) @app.route('/') def index(): - """Main endpoint for Glance extension""" - df = load_data() + """Index route""" + file_names = get_zip_file_names() - # Prepare template variables - template_vars = { - 'has_data': not df.empty, - 'data_dir': str(DATA_DIR), - 'chart_html': '', - 'current_level': 0, - 'available_lessons': 0, - 'available_reviews': 0 - } + print(f"Found {len(file_names)} zip files in {DATA_DIR}") + list_of_daily_data = [] + for file_name in file_names: + daily_data = load_zip(file_name) + list_of_daily_data.append(daily_data) - if not df.empty: - # Get latest stats - latest = df.iloc[-1] - template_vars.update({ - 'current_level': int(latest['level']), - 'available_lessons': int(latest['available_lessons']), - 'available_reviews': int(latest['reviews_available']), - 'chart_html': generate_chart_html(df) - }) + df = get_dataframe(list_of_daily_data) + # sort by date string + df.sort_values(by='date', inplace=True) - html = render_template_string(HTML_TEMPLATE, **template_vars) - - # Create response with Glance extension headers - response = Response(html, mimetype='text/html') - response.headers['Widget-Title'] = '📚 WaniKani Stats' - response.headers['Widget-Content-Type'] = 'html' - - return response + return render_html(df) @app.route('/health') def health(): @@ -242,3 +124,4 @@ if __name__ == '__main__': port = int(sys.argv[1]) if len(sys.argv) > 1 else 8501 print(f"Starting WaniKani Stats Flask app on port {port}") app.run(host='0.0.0.0', port=port, debug=False) + From 41154bbe4ea1f407126af35c668bae8803d212fd Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:18:35 +0300 Subject: [PATCH 1206/1768] add missing modules --- modules/services/wanikani-stats/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index afbdbf2..342194c 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -15,6 +15,8 @@ let pandas numpy jinja2 + matplotlib + seaborn ] ) ) From de067652f3cb5824b2e8acdc7fe182c8761bf652 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:20:21 +0300 Subject: [PATCH 1207/1768] fix path --- modules/services/wanikani-stats/app.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index ca6d31f..d1b0d40 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -11,8 +11,9 @@ import functools matplotlib.use('agg') sns.set_theme(style="whitegrid") + app = Flask(__name__) -DATA_DIR = Path("./data") +DATA_DIR = Path("/var/lib/wanikani-logs") def get_zip_file_names(): """Get a list of zip files in the data directory.""" From 9a81594f4bcd04e7693778960545fe1b1cc7b0d4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:23:21 +0300 Subject: [PATCH 1208/1768] allow html --- modules/services/glance.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 906dd6d..88a60b7 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -176,6 +176,8 @@ { type = "extension"; url = "http://localhost:8501"; + allow-potentially-dangerous-html = true; + } ]; } From 5e4224fcd840df6b87729aced27844c633cbcca0 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:35:34 +0300 Subject: [PATCH 1209/1768] lets add the header --- modules/services/wanikani-stats/app.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index d1b0d40..e2c70c3 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -3,7 +3,6 @@ import json from pathlib import Path from flask import Flask, render_template_string, Response import pandas as pd -from datetime import datetime import matplotlib.pyplot as plt import seaborn as sns import matplotlib @@ -113,7 +112,9 @@ def index(): # sort by date string df.sort_values(by='date', inplace=True) - return render_html(df) + response = Response(render_html(df), content_type='text/html') + response.headers['Widget-Content-Type'] = 'html' + return response @app.route('/health') def health(): From 2e888a183c15bee339d1a6fdcb216cb86853bbb4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:42:34 +0300 Subject: [PATCH 1210/1768] no clipping --- modules/services/wanikani-stats/app.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index e2c70c3..167ef37 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -9,7 +9,8 @@ import matplotlib import functools matplotlib.use('agg') -sns.set_theme(style="whitegrid") +# set dark theme for plots +sns.set_theme(style="darkgrid") app = Flask(__name__) DATA_DIR = Path("/var/lib/wanikani-logs") @@ -47,7 +48,7 @@ def render_html(df): import io # Generate reviews plot SVG - plt.figure(figsize=(10, 5)) + plt.figure(figsize=(10, 6)) plt.plot(df['date'], df['num_reviews'], marker='o', label='Reviews') plt.title('Daily Reviews') plt.xlabel('Date') @@ -56,16 +57,17 @@ def render_html(df): plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) plt.grid() plt.legend() + plt.tight_layout() # Save to string buffer reviews_buffer = io.StringIO() - plt.savefig(reviews_buffer, format='svg') + plt.savefig(reviews_buffer, format='svg', bbox_inches='tight') reviews_svg = reviews_buffer.getvalue() reviews_buffer.close() plt.close() # Generate lessons plot SVG - plt.figure(figsize=(10, 5)) + plt.figure(figsize=(10, 6)) plt.plot(df['date'], df['num_lessons'], marker='o', label='Lessons', color='orange') plt.title('Daily Lessons') plt.xlabel('Date') @@ -74,10 +76,11 @@ def render_html(df): plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) plt.grid() plt.legend() + plt.tight_layout() # Save to string buffer lessons_buffer = io.StringIO() - plt.savefig(lessons_buffer, format='svg') + plt.savefig(lessons_buffer, format='svg', bbox_inches='tight') lessons_svg = lessons_buffer.getvalue() lessons_buffer.close() plt.close() From 745e5132907ae1275945c5f8449383b0e62c50ce Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:51:55 +0300 Subject: [PATCH 1211/1768] i am not sure at allllll --- modules/services/wanikani-stats/app.py | 29 +++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 167ef37..52c5a94 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -11,6 +11,7 @@ import functools matplotlib.use('agg') # set dark theme for plots sns.set_theme(style="darkgrid") +plt.style.use('dark_background') app = Flask(__name__) DATA_DIR = Path("/var/lib/wanikani-logs") @@ -88,7 +89,33 @@ def render_html(df): # Render HTML with embedded SVGs html_content = f""" - WaniKani Stats + + WaniKani Stats + +

WaniKani Daily Stats

Reviews

From aa2dfde673e8f8548c5aa2f7f51324e5accd6632 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 31 Jul 2025 23:58:09 +0300 Subject: [PATCH 1212/1768] plot color --- modules/services/wanikani-stats/app.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 52c5a94..efd8f8c 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -49,7 +49,7 @@ def render_html(df): import io # Generate reviews plot SVG - plt.figure(figsize=(10, 6)) + plt.figure(figsize=(10, 6), facecolor='#151519') plt.plot(df['date'], df['num_reviews'], marker='o', label='Reviews') plt.title('Daily Reviews') plt.xlabel('Date') @@ -58,6 +58,7 @@ def render_html(df): plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) plt.grid() plt.legend() + plt.gca().set_facecolor('#151519') plt.tight_layout() # Save to string buffer @@ -68,7 +69,7 @@ def render_html(df): plt.close() # Generate lessons plot SVG - plt.figure(figsize=(10, 6)) + plt.figure(figsize=(10, 6), facecolor='#151519') plt.plot(df['date'], df['num_lessons'], marker='o', label='Lessons', color='orange') plt.title('Daily Lessons') plt.xlabel('Date') @@ -77,6 +78,7 @@ def render_html(df): plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) plt.grid() plt.legend() + plt.gca().set_facecolor('#151519') plt.tight_layout() # Save to string buffer @@ -99,16 +101,6 @@ def render_html(df): margin: 0; padding: 20px; }} - h1 {{ - color: hsl(240, 8%, 85%); - text-align: center; - margin-bottom: 30px; - }} - h2 {{ - color: hsl(240, 8%, 85%); - margin-top: 40px; - margin-bottom: 20px; - }} svg {{ display: block; margin: 0 auto; @@ -117,10 +109,7 @@ def render_html(df): -

WaniKani Daily Stats

-

Reviews

{reviews_svg} -

Lessons

{lessons_svg} From 42a61a30a78f6b353642780d719b922f860091d0 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Aug 2025 00:00:22 +0300 Subject: [PATCH 1213/1768] border radius --- modules/services/wanikani-stats/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index efd8f8c..cd33af2 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -105,6 +105,8 @@ def render_html(df): display: block; margin: 0 auto; background-color: transparent; + border-radius: 5px; + overflow: hidden; }} From e7f2f6c99eae37cfb471627921c8cecb262cf0a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Aug 2025 00:06:49 +0300 Subject: [PATCH 1214/1768] add border and padding --- modules/services/wanikani-stats/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index cd33af2..2a3db87 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -107,6 +107,8 @@ def render_html(df): background-color: transparent; border-radius: 5px; overflow: hidden; + border: 1px solid #1e1e24; + padding: 17px; }} From 5fd87319e2c6eaa5270b03d693f327c17f520aff Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Aug 2025 00:09:32 +0300 Subject: [PATCH 1215/1768] just set margin --- modules/services/wanikani-stats/app.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 2a3db87..b029c21 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -103,12 +103,11 @@ def render_html(df): }} svg {{ display: block; - margin: 0 auto; + margin: 17px auto; background-color: transparent; border-radius: 5px; overflow: hidden; border: 1px solid #1e1e24; - padding: 17px; }} From 24852402e8692fe502201425bf1f2f78ba4d5d57 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Aug 2025 00:16:42 +0300 Subject: [PATCH 1216/1768] these timers neat --- modules/services/wanikani-stats/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 342194c..86ee408 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -66,5 +66,25 @@ in Group = "root"; }; }; + + # Timer to restart the service every 12 hours + systemd.services.wanikani-stats-restart = { + description = "Restart WaniKani Stats Service"; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.systemd}/bin/systemctl restart wanikani-stats.service"; + User = "root"; + }; + }; + + systemd.timers.wanikani-stats-restart = { + description = "Timer to restart WaniKani Stats Service every 12 hours"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "*-*-* 00,12:00:00"; + Persistent = true; + RandomizedDelaySec = "5m"; + }; + }; }; } From 528a2733297864acdac5053fb004b95ee7813237 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 1 Aug 2025 00:20:28 +0300 Subject: [PATCH 1217/1768] set title --- modules/services/wanikani-stats/app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index b029c21..e162d71 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -136,6 +136,7 @@ def index(): response = Response(render_html(df), content_type='text/html') response.headers['Widget-Content-Type'] = 'html' + response.headers['Widget-Title'] = 'WaniKani Statistics' return response @app.route('/health') From 1aeab9a288354b2d7346e14596e87d84227868bf Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Aug 2025 02:46:13 +0300 Subject: [PATCH 1218/1768] seperate out --- modules/services/wanikani-stats/app.py | 67 ++++++++++---------------- 1 file changed, 26 insertions(+), 41 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index e162d71..930d862 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -44,49 +44,34 @@ def get_dataframe(list_of_daily_data): df = pd.DataFrame(list_of_daily_data) return df +def get_svg_plot(df, column, title, ylabel): + """Generate an SVG plot for a given DataFrame column.""" + plt.figure(figsize=(10, 6), facecolor='#151519') + plt.plot(df['date'], df[column], marker='o', label=column.capitalize()) + plt.title(title) + plt.xlabel('Date') + plt.ylabel(ylabel) + # Show every 10th date label + plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) + plt.grid() + plt.legend() + plt.gca().set_facecolor('#151519') + plt.tight_layout() + + # Save to string buffer + import io + buffer = io.StringIO() + plt.savefig(buffer, format='svg', bbox_inches='tight') + svg_content = buffer.getvalue() + buffer.close() + plt.close() + + return svg_content + def render_html(df): """Render the DataFrame as HTML.""" - import io - - # Generate reviews plot SVG - plt.figure(figsize=(10, 6), facecolor='#151519') - plt.plot(df['date'], df['num_reviews'], marker='o', label='Reviews') - plt.title('Daily Reviews') - plt.xlabel('Date') - plt.ylabel('Number of Reviews') - # Show every 10th date label - plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) - plt.grid() - plt.legend() - plt.gca().set_facecolor('#151519') - plt.tight_layout() - - # Save to string buffer - reviews_buffer = io.StringIO() - plt.savefig(reviews_buffer, format='svg', bbox_inches='tight') - reviews_svg = reviews_buffer.getvalue() - reviews_buffer.close() - plt.close() - - # Generate lessons plot SVG - plt.figure(figsize=(10, 6), facecolor='#151519') - plt.plot(df['date'], df['num_lessons'], marker='o', label='Lessons', color='orange') - plt.title('Daily Lessons') - plt.xlabel('Date') - plt.ylabel('Number of Lessons') - # Show every 10th date label - plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) - plt.grid() - plt.legend() - plt.gca().set_facecolor('#151519') - plt.tight_layout() - - # Save to string buffer - lessons_buffer = io.StringIO() - plt.savefig(lessons_buffer, format='svg', bbox_inches='tight') - lessons_svg = lessons_buffer.getvalue() - lessons_buffer.close() - plt.close() + reviews_svg = get_svg_plot(df, 'num_reviews', 'Daily Reviews', 'Number of Reviews') + lessons_svg = get_svg_plot(df, 'num_lessons', 'Daily Lessons', 'Number of Lessons') # Render HTML with embedded SVGs html_content = f""" From cd345dcd414548a52e5b165dd1687f9fe7aed7a0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Aug 2025 16:10:17 +0300 Subject: [PATCH 1219/1768] add progressions --- modules/services/wanikani-stats/app.py | 47 ++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 930d862..1016eb8 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -37,11 +37,44 @@ def load_zip(zip_path): data["num_lessons"] = num_lessons # wanikani_data_2025-05-18.zip data["date"] = zip_path.stem.split('_')[-1].replace('.zip', '') + + # with z.open("subjects.json") as f: + # subjects_data = json.load(f) + # print(f"Found total data subjects: {subjects_data['total_count']}") + # data["total_subjects"] = subjects_data['total_count'] + # so the subjects.json file is about 50 mb so we are just not gonna care if this value changes (doesnt change much) + data["total_subjects"] = 9300 + + with z.open("assignments.json") as f: + assignments_data = json.load(f) + print(f"Found total assignments: {assignments_data['total_count']}") + data["total_assignments"] = assignments_data['total_count'] + + # now the data key will give us all the srs stages + srs_stages = [0 for _ in range(10)] # 10 SRS stages + for assignment in assignments_data['data']: + srs_stage = assignment['data']['srs_stage'] + srs_stages[srs_stage] += 1 + + # add srs stages to data + for i, count in enumerate(srs_stages): + data[f'srs_stage_{i}'] = count + + print(data) return data def get_dataframe(list_of_daily_data): """Convert a list of daily data dictionaries into a pandas DataFrame.""" df = pd.DataFrame(list_of_daily_data) + + df["progression"] = df.apply(lambda row: sum(row[f'srs_stage_{i}'] * (i + 1) for i in range(10)) / (row['total_subjects'] * 10) * 100, axis=1) + + df["apprentice"] = df.apply(lambda row: row['srs_stage_1'] + row['srs_stage_2'] + row['srs_stage_3'] + row['srs_stage_4'], axis=1) + df["guru"] = df.apply(lambda row: row['srs_stage_5'] + row['srs_stage_6'], axis=1) + df["master"] = df['srs_stage_7'] + df["enlightened"] = df["srs_stage_8"] + df["burned"] = df["srs_stage_9"] + return df def get_svg_plot(df, column, title, ylabel): @@ -72,6 +105,14 @@ def render_html(df): """Render the DataFrame as HTML.""" reviews_svg = get_svg_plot(df, 'num_reviews', 'Daily Reviews', 'Number of Reviews') lessons_svg = get_svg_plot(df, 'num_lessons', 'Daily Lessons', 'Number of Lessons') + progression_svg = get_svg_plot(df, 'progression', 'SRS Progression', 'Progression (%)') + + # srs stages + srs_stage_apprentice_svg = get_svg_plot(df, 'apprentice', 'Apprentice Stage', 'Number of Subjects') + srs_stage_guru_svg = get_svg_plot(df, 'guru', 'Guru Stage', 'Number of Subjects') + srs_stage_master_svg = get_svg_plot(df, 'master', 'Master Stage', 'Number of Subjects') + srs_stage_enlightened_svg = get_svg_plot(df, 'enlightened', 'Enlightened Stage', 'Number of Subjects') + srs_stage_burned_svg = get_svg_plot(df, 'burned', 'Burned Stage', 'Number of Subjects') # Render HTML with embedded SVGs html_content = f""" @@ -99,6 +140,12 @@ def render_html(df): {reviews_svg} {lessons_svg} + {progression_svg} + {srs_stage_apprentice_svg} + {srs_stage_guru_svg} + {srs_stage_master_svg} + {srs_stage_enlightened_svg} + {srs_stage_burned_svg} """ From 304219e8407024ee69fc9610879377192c3b1822 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Aug 2025 16:30:05 +0300 Subject: [PATCH 1220/1768] formatting --- hosts/wallfacer/configuration.nix | 3 ++- modules/services/wanikani-stats/default.nix | 20 +++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hosts/wallfacer/configuration.nix b/hosts/wallfacer/configuration.nix index 0fa9883..7ec82c1 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/wallfacer/configuration.nix @@ -1,4 +1,5 @@ -{ lib, config, ... }: { +{ lib, config, ... }: +{ imports = [ ./hardware-configuration.nix ../../modules diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 86ee408..92adccc 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -9,17 +9,15 @@ let name = "wanikani-stats-flask"; runtimeInputs = [ (pkgs.python312.withPackages ( - ppkgs: - with pkgs.python312Packages; [ - flask - pandas - numpy - jinja2 - matplotlib - seaborn - ] - ) - ) + ppkgs: with pkgs.python312Packages; [ + flask + pandas + numpy + jinja2 + matplotlib + seaborn + ] + )) ]; text = '' #!/usr/bin/env bash From 697bf2b3db35c02a8e39934e069148d5cff07b44 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 2 Aug 2025 16:30:25 +0300 Subject: [PATCH 1221/1768] formatting python --- modules/services/wanikani-stats/app.py | 105 ++++++++++++++++--------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 1016eb8..f7d2129 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -8,14 +8,15 @@ import seaborn as sns import matplotlib import functools -matplotlib.use('agg') +matplotlib.use("agg") # set dark theme for plots sns.set_theme(style="darkgrid") -plt.style.use('dark_background') +plt.style.use("dark_background") app = Flask(__name__) DATA_DIR = Path("/var/lib/wanikani-logs") + def get_zip_file_names(): """Get a list of zip files in the data directory.""" return [f for f in DATA_DIR.glob("*.zip") if f.is_file()] @@ -26,17 +27,17 @@ def get_zip_file_names(): def load_zip(zip_path): print(f"Processing {zip_path}") """Load a zip file and return its contents as a dictionary.""" - with zipfile.ZipFile(zip_path, 'r') as z: + with zipfile.ZipFile(zip_path, "r") as z: data = {} # just read summary.json with z.open("summary.json") as f: summary_data = json.load(f) - num_reviews = len(summary_data['data']['reviews'][0]["subject_ids"]) - num_lessons = len(summary_data['data']['lessons'][0]["subject_ids"]) + num_reviews = len(summary_data["data"]["reviews"][0]["subject_ids"]) + num_lessons = len(summary_data["data"]["lessons"][0]["subject_ids"]) data["num_reviews"] = num_reviews data["num_lessons"] = num_lessons # wanikani_data_2025-05-18.zip - data["date"] = zip_path.stem.split('_')[-1].replace('.zip', '') + data["date"] = zip_path.stem.split("_")[-1].replace(".zip", "") # with z.open("subjects.json") as f: # subjects_data = json.load(f) @@ -48,71 +49,96 @@ def load_zip(zip_path): with z.open("assignments.json") as f: assignments_data = json.load(f) print(f"Found total assignments: {assignments_data['total_count']}") - data["total_assignments"] = assignments_data['total_count'] + data["total_assignments"] = assignments_data["total_count"] # now the data key will give us all the srs stages srs_stages = [0 for _ in range(10)] # 10 SRS stages - for assignment in assignments_data['data']: - srs_stage = assignment['data']['srs_stage'] + for assignment in assignments_data["data"]: + srs_stage = assignment["data"]["srs_stage"] srs_stages[srs_stage] += 1 # add srs stages to data for i, count in enumerate(srs_stages): - data[f'srs_stage_{i}'] = count + data[f"srs_stage_{i}"] = count print(data) return data + def get_dataframe(list_of_daily_data): """Convert a list of daily data dictionaries into a pandas DataFrame.""" df = pd.DataFrame(list_of_daily_data) - df["progression"] = df.apply(lambda row: sum(row[f'srs_stage_{i}'] * (i + 1) for i in range(10)) / (row['total_subjects'] * 10) * 100, axis=1) + df["progression"] = df.apply( + lambda row: sum(row[f"srs_stage_{i}"] * (i + 1) for i in range(10)) + / (row["total_subjects"] * 10) + * 100, + axis=1, + ) - df["apprentice"] = df.apply(lambda row: row['srs_stage_1'] + row['srs_stage_2'] + row['srs_stage_3'] + row['srs_stage_4'], axis=1) - df["guru"] = df.apply(lambda row: row['srs_stage_5'] + row['srs_stage_6'], axis=1) - df["master"] = df['srs_stage_7'] + df["apprentice"] = df.apply( + lambda row: row["srs_stage_1"] + + row["srs_stage_2"] + + row["srs_stage_3"] + + row["srs_stage_4"], + axis=1, + ) + df["guru"] = df.apply(lambda row: row["srs_stage_5"] + row["srs_stage_6"], axis=1) + df["master"] = df["srs_stage_7"] df["enlightened"] = df["srs_stage_8"] df["burned"] = df["srs_stage_9"] return df + def get_svg_plot(df, column, title, ylabel): """Generate an SVG plot for a given DataFrame column.""" - plt.figure(figsize=(10, 6), facecolor='#151519') - plt.plot(df['date'], df[column], marker='o', label=column.capitalize()) + plt.figure(figsize=(10, 6), facecolor="#151519") + plt.plot(df["date"], df[column], marker="o", label=column.capitalize()) plt.title(title) - plt.xlabel('Date') + plt.xlabel("Date") plt.ylabel(ylabel) # Show every 10th date label - plt.xticks(range(0, len(df['date']), 10), df['date'][::10], rotation=45) + plt.xticks(range(0, len(df["date"]), 10), df["date"][::10], rotation=45) plt.grid() plt.legend() - plt.gca().set_facecolor('#151519') + plt.gca().set_facecolor("#151519") plt.tight_layout() # Save to string buffer import io + buffer = io.StringIO() - plt.savefig(buffer, format='svg', bbox_inches='tight') + plt.savefig(buffer, format="svg", bbox_inches="tight") svg_content = buffer.getvalue() buffer.close() plt.close() return svg_content + def render_html(df): """Render the DataFrame as HTML.""" - reviews_svg = get_svg_plot(df, 'num_reviews', 'Daily Reviews', 'Number of Reviews') - lessons_svg = get_svg_plot(df, 'num_lessons', 'Daily Lessons', 'Number of Lessons') - progression_svg = get_svg_plot(df, 'progression', 'SRS Progression', 'Progression (%)') + reviews_svg = get_svg_plot(df, "num_reviews", "Daily Reviews", "Number of Reviews") + lessons_svg = get_svg_plot(df, "num_lessons", "Daily Lessons", "Number of Lessons") + progression_svg = get_svg_plot( + df, "progression", "SRS Progression", "Progression (%)" + ) # srs stages - srs_stage_apprentice_svg = get_svg_plot(df, 'apprentice', 'Apprentice Stage', 'Number of Subjects') - srs_stage_guru_svg = get_svg_plot(df, 'guru', 'Guru Stage', 'Number of Subjects') - srs_stage_master_svg = get_svg_plot(df, 'master', 'Master Stage', 'Number of Subjects') - srs_stage_enlightened_svg = get_svg_plot(df, 'enlightened', 'Enlightened Stage', 'Number of Subjects') - srs_stage_burned_svg = get_svg_plot(df, 'burned', 'Burned Stage', 'Number of Subjects') + srs_stage_apprentice_svg = get_svg_plot( + df, "apprentice", "Apprentice Stage", "Number of Subjects" + ) + srs_stage_guru_svg = get_svg_plot(df, "guru", "Guru Stage", "Number of Subjects") + srs_stage_master_svg = get_svg_plot( + df, "master", "Master Stage", "Number of Subjects" + ) + srs_stage_enlightened_svg = get_svg_plot( + df, "enlightened", "Enlightened Stage", "Number of Subjects" + ) + srs_stage_burned_svg = get_svg_plot( + df, "burned", "Burned Stage", "Number of Subjects" + ) # Render HTML with embedded SVGs html_content = f""" @@ -151,7 +177,8 @@ def render_html(df): """ return render_template_string(html_content) -@app.route('/') + +@app.route("/") def index(): """Index route""" file_names = get_zip_file_names() @@ -164,21 +191,23 @@ def index(): df = get_dataframe(list_of_daily_data) # sort by date string - df.sort_values(by='date', inplace=True) + df.sort_values(by="date", inplace=True) - response = Response(render_html(df), content_type='text/html') - response.headers['Widget-Content-Type'] = 'html' - response.headers['Widget-Title'] = 'WaniKani Statistics' + response = Response(render_html(df), content_type="text/html") + response.headers["Widget-Content-Type"] = "html" + response.headers["Widget-Title"] = "WaniKani Statistics" return response -@app.route('/health') + +@app.route("/health") def health(): """Health check endpoint""" - return {'status': 'ok', 'service': 'wanikani-stats'} + return {"status": "ok", "service": "wanikani-stats"} -if __name__ == '__main__': + +if __name__ == "__main__": import sys + port = int(sys.argv[1]) if len(sys.argv) > 1 else 8501 print(f"Starting WaniKani Stats Flask app on port {port}") - app.run(host='0.0.0.0', port=port, debug=False) - + app.run(host="0.0.0.0", port=port, debug=False) From 2b7e577936f2db9768ec264102da08031cb91eb7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 3 Aug 2025 14:06:01 +0300 Subject: [PATCH 1222/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 170f421..08e3ebe 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1753822434, - "narHash": "sha256-yNjk/R2ca+rQm6PWzwKpa+MZZGkNnr6Y8rBf+ZZ6ICo=", + "lastModified": 1754174776, + "narHash": "sha256-Sp3FRM6xNwNtGzYH/HByjzJYHSQvwsW+lDMMZNF43PQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "909d39391efa9a1f74f7386cb6919b2722e06310", + "rev": "e6e2f43a62b7dbc8aa8b1adb7101b0d8b9395445", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1753589988, - "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", + "lastModified": 1754195341, + "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", + "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753694789, - "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", + "lastModified": 1753939845, + "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", + "rev": "94def634a20494ee057c76998843c015909d6311", "type": "github" }, "original": { From f9f9219f0daa3126d3e3128c58d469cf424acd23 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 5 Aug 2025 01:39:47 +0300 Subject: [PATCH 1223/1768] add ymir data --- hosts/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index eb412f2..c1deeed 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -28,6 +28,7 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + services.wanikani-fetch-data.enable = true; networking.hostName = "ymir"; # Define your hostname. From 1f7351914be4608d76fab3f86eef3efadc55e0f8 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 5 Aug 2025 23:57:30 +0300 Subject: [PATCH 1224/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 08e3ebe..8459635 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754337839, + "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1754174776, - "narHash": "sha256-Sp3FRM6xNwNtGzYH/HByjzJYHSQvwsW+lDMMZNF43PQ=", + "lastModified": 1754421590, + "narHash": "sha256-TrlzGR5l/OltcTnBtihUxoKqv+JNEKWmUamDVWICtX0=", "owner": "nix-community", "repo": "home-manager", - "rev": "e6e2f43a62b7dbc8aa8b1adb7101b0d8b9395445", + "rev": "a0b1afdb5efbf59f4b6e934d090cf8d150517890", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754316476, + "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { From e7df7f357817e77bfce92c55336cdf8bd3b08a15 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Aug 2025 00:17:29 +0300 Subject: [PATCH 1225/1768] no need for wanikani progression here --- home/tmux/default.nix | 35 +++----------------------- home/tmux/wanikani-current-reviews.sh | 16 ------------ home/tmux/wanikani-level.sh | 25 ------------------- home/tmux/wanikani-progression.sh | 36 --------------------------- 4 files changed, 3 insertions(+), 109 deletions(-) delete mode 100755 home/tmux/wanikani-current-reviews.sh delete mode 100755 home/tmux/wanikani-level.sh delete mode 100755 home/tmux/wanikani-progression.sh diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 1a773fd..7d0fb20 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -2,36 +2,7 @@ pkgs, lib, ... -}: -let - wanikani-current-reviews-script = builtins.path { path = ./wanikani-current-reviews.sh; }; - wanikani-level-script = builtins.path { path = ./wanikani-level.sh; }; - wanikani-progression-script = builtins.path { path = ./wanikani-progression.sh; }; - tmux-dracula = pkgs.tmuxPlugins.mkTmuxPlugin rec { - pluginName = "dracula"; - version = "3.0.0"; - src = pkgs.fetchFromGitHub { - owner = "dracula"; - repo = "tmux"; - rev = "v${version}"; - hash = "sha256-VY4PyaQRwTc6LWhPJg4inrQf5K8+bp0+eqRhR7+Iexk="; - }; - postInstall = '' - # i am adding my custom widget to the plugin here cp the wanikani.sh script to the plugin directory - cp ${wanikani-current-reviews-script} $target/scripts/wanikani-current-reviews.sh - cp ${wanikani-level-script} $target/scripts/wanikani-level.sh - cp ${wanikani-progression-script} $target/scripts/wanikani-progression.sh - ''; - meta = with pkgs.lib; { - homepage = "https://draculatheme.com/tmux"; - description = "Feature packed Dracula theme for tmux!"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ ethancedwards8 ]; - }; - }; -in -{ +}: { programs.tmux = { enable = true; historyLimit = 100000; @@ -43,9 +14,9 @@ in tmuxPlugins.sensible tmuxPlugins.better-mouse-mode { - plugin = tmux-dracula; + plugin = tmuxPlugins.dracula; extraConfig = '' - set -g @dracula-plugins "custom:wanikani-level.sh custom:wanikani-progression.sh custom:wanikani-current-reviews.sh cpu-usage ram-usage gpu-usage battery" + set -g @dracula-plugins "cpu-usage ram-usage gpu-usage battery" set -g @dracula-show-left-icon hostname set -g @dracula-git-show-current-symbol ✓ set -g @dracula-git-no-repo-message "no-git" diff --git a/home/tmux/wanikani-current-reviews.sh b/home/tmux/wanikani-current-reviews.sh deleted file mode 100755 index fa70614..0000000 --- a/home/tmux/wanikani-current-reviews.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -#!nix-shell -i bash -p jq curl -get_wanikani() -{ - wanikani_reviews=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?immediately_available_for_review=true" | jq '.total_count') - echo "$wanikani_reviews reviews" -} - -main() -{ - get_wanikani - sleep 600 -} - -main - diff --git a/home/tmux/wanikani-level.sh b/home/tmux/wanikani-level.sh deleted file mode 100755 index 3dd6fca..0000000 --- a/home/tmux/wanikani-level.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash -#!nix-shell -i bash -p jq curl - -get_wanikani() -{ - wanikani_level_data=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/level_progressions") - wanikani_level=$(echo $wanikani_level_data | jq '.data[-1].data.level') - wanikani_level_start_date_string=$(echo $wanikani_level_data | jq '.data[-1].data.started_at') - wanikani_level_start_timestamp=$(date -d "${wanikani_level_start_date_string//\"/}" +%s) - - current_timestamp=$(date +%s) - difference=$((current_timestamp - wanikani_level_start_timestamp)) - wanikani_level_creation_date=$((difference / 86400)) - echo "At $wanikani_level for $wanikani_level_creation_date days" -} - -main() -{ - get_wanikani - # sleep for 1 hour - sleep 3600 -} - -main - diff --git a/home/tmux/wanikani-progression.sh b/home/tmux/wanikani-progression.sh deleted file mode 100755 index d33476e..0000000 --- a/home/tmux/wanikani-progression.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -#!nix-shell -i bash -p jq curl python312 - -get_wanikani() -{ - all_subjects=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/subjects") - total_subjects=$(echo $all_subjects | jq '.total_count') - - total=0 - for i in {0..9} - do - srs_level=$(curl -s -H "Authorization: Bearer 2da24e4a-ba89-4c4a-9047-d08f21e9dd01" "https://api.wanikani.com/v2/assignments?srs_stages=$i" | jq '.total_count') - # echo "SRS level $i: $srs_level" - multiplied=$((srs_level * (i + 1))) - # echo "SRS level $i multiplied: $multiplied" - total=$((total + multiplied)) - # echo "Total: $total" - done - - # now i need the percentage of (total/(total_subjects*10)) - # python will be used for this and i need the result to be %23.234 - python_command="python3 -c 'print(f\"{$total/$total_subjects*10:.3f}\")'" - # echo "Python command: $python_command" - percentage=$(nix-shell -p python312 --run "$python_command") - echo "%$percentage" -} - -main() -{ - get_wanikani - # sleep for 1 hour - sleep 3600 -} - -main - From e4b52b125796a2ac7e82c89d337606735d482f51 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Aug 2025 02:20:54 +0300 Subject: [PATCH 1226/1768] formatting --- home/tmux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 7d0fb20..04a6d78 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -2,7 +2,8 @@ pkgs, lib, ... -}: { +}: +{ programs.tmux = { enable = true; historyLimit = 100000; From a51faa2ffb9cf77b14f9e01f27145032b184263f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Aug 2025 02:26:22 +0300 Subject: [PATCH 1227/1768] no warning --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 6fa0ab3..bd1943b 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,7 @@ }; lib = import ./lib { inherit (nixpkgs) lib; }; - formatter = forAllSystems (system: (makePkgs system).nixfmt-rfc-style); + formatter = forAllSystems (system: (makePkgs system).nixfmt-tree); deploy.nodes.harmonica = { hostname = "192.168.0.11"; profiles.system = { From 3db78006d61a9ee8796b9219e2d4501514f6a60f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Aug 2025 23:35:10 +0300 Subject: [PATCH 1228/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 8459635..fe6a935 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754337839, - "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1754421590, - "narHash": "sha256-TrlzGR5l/OltcTnBtihUxoKqv+JNEKWmUamDVWICtX0=", + "lastModified": 1754503522, + "narHash": "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0b1afdb5efbf59f4b6e934d090cf8d150517890", + "rev": "13461dec40bf03d9196ff79d1abe48408268cc35", "type": "github" }, "original": { From 031a1a1080e97df4ccc25ccf529ab96268f1c2cf Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 6 Aug 2025 23:35:36 +0300 Subject: [PATCH 1229/1768] no fetch data on ymir --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index c1deeed..eb412f2 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -28,7 +28,6 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - services.wanikani-fetch-data.enable = true; networking.hostName = "ymir"; # Define your hostname. From 3d1a0466e8acfa47a06459bccba0d5e1b16e4816 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 7 Aug 2025 17:04:53 +0300 Subject: [PATCH 1230/1768] update ghostty --- home/ghostty.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/ghostty.nix b/home/ghostty.nix index 2194d42..d2080b4 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -9,6 +9,8 @@ programs.ghostty = { enable = config.enableGhostty; settings = { + maximize = true; + window-decoration = false; }; }; }; From 0c09874a48bac84c3236be0d0249098887c7b5cc Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 7 Aug 2025 17:08:53 +0300 Subject: [PATCH 1231/1768] update command --- home/ghostty.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/ghostty.nix b/home/ghostty.nix index d2080b4..66bb838 100644 --- a/home/ghostty.nix +++ b/home/ghostty.nix @@ -1,6 +1,7 @@ { lib, config, + pkgs, ... }: { @@ -11,6 +12,7 @@ settings = { maximize = true; window-decoration = false; + command = lib.getExe pkgs.tmux; }; }; }; From e0ef46a85346b5d38dcd6918eddd087e99f1d0ae Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 7 Aug 2025 17:43:44 +0300 Subject: [PATCH 1232/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index fe6a935..6cd7a45 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1754503522, - "narHash": "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=", + "lastModified": 1754575993, + "narHash": "sha256-0ut8TM76DeMnexgwNyMx2c5flhp4IPtqQ79XR0hpmY0=", "owner": "nix-community", "repo": "home-manager", - "rev": "13461dec40bf03d9196ff79d1abe48408268cc35", + "rev": "d8a475e179888553b6863204a93295da6ee13eb4", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754316476, - "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { From d7754ee1f4fb7166983bb7911f2ffe791c79fe09 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 7 Aug 2025 18:25:37 +0300 Subject: [PATCH 1233/1768] update tmux --- home/tmux/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 04a6d78..93895a9 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -30,6 +30,8 @@ # Automatically renumber windows set -g renumber-windows on set -g allow-passthrough on + set -ga update-environment TERM + set -ga update-environment TERM_PROGRAM ''; }; } From 1773120f7b844cbcb00bd5aed9856f9f331dd303 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 8 Aug 2025 01:44:13 +0300 Subject: [PATCH 1234/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6cd7a45..090ebdf 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1754575993, - "narHash": "sha256-0ut8TM76DeMnexgwNyMx2c5flhp4IPtqQ79XR0hpmY0=", + "lastModified": 1754593726, + "narHash": "sha256-bo6aSfDS/GGfM/6LXCKLH/246fDSKjFnBsaRMNE+Wmc=", "owner": "nix-community", "repo": "home-manager", - "rev": "d8a475e179888553b6863204a93295da6ee13eb4", + "rev": "5de16c704b0fc8f519b2c19ed3f683a9e68f3884", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1754498491, + "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", "type": "github" }, "original": { From f4cb1f6f8eb6a37979a5e15b28a044765f8f7343 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 10 Aug 2025 22:27:17 +0300 Subject: [PATCH 1235/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 090ebdf..5c79f1e 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1754593726, - "narHash": "sha256-bo6aSfDS/GGfM/6LXCKLH/246fDSKjFnBsaRMNE+Wmc=", + "lastModified": 1754842705, + "narHash": "sha256-2vvncPLsBWV6dRM5LfGHMGYZ+vzqRDqSPBzxPAS0R/A=", "owner": "nix-community", "repo": "home-manager", - "rev": "5de16c704b0fc8f519b2c19ed3f683a9e68f3884", + "rev": "91586008a23c01cc32894ee187dca8c0a7bd20a4", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1754195341, - "narHash": "sha256-YL71IEf2OugH3gmAsxQox6BJI0KOcHKtW2QqT/+s2SA=", + "lastModified": 1754800038, + "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b7fcd4e26d67fca48e77de9b0d0f954b18ae9562", + "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { From 4033d305395028b4b204de1da60c0410e2a9735f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 17 Aug 2025 21:44:35 +0300 Subject: [PATCH 1236/1768] update flake.lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 5c79f1e..ed3eefc 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1754842705, - "narHash": "sha256-2vvncPLsBWV6dRM5LfGHMGYZ+vzqRDqSPBzxPAS0R/A=", + "lastModified": 1755442500, + "narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=", "owner": "nix-community", "repo": "home-manager", - "rev": "91586008a23c01cc32894ee187dca8c0a7bd20a4", + "rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "nmt": "nmt_2" }, "locked": { - "lastModified": 1742249870, - "narHash": "sha256-U37ECk3zpfp92D3H0gzfWPyb5sf0RdOdublCq1zjq+w=", + "lastModified": 1753647809, + "narHash": "sha256-QCkCQIF2biY3Lh3j3J/FQ8hnwYWZrxxXnJzAY7Ow0T0=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "fe5b4498e3161191bd93fe0683dff347f6f689df", + "rev": "5c4c97df6a05fa102cc5d7907f516588f2e578c6", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1754800038, - "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", + "lastModified": 1755404379, + "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", + "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753399495, - "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", + "lastModified": 1754393734, + "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d00f23f023b7215b3f1035adb5247c8ec180dbc", + "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1753533009, - "narHash": "sha256-4KlfDVsYL9c3ogEehJcQOBZ+pUBH7Lwvlu2J6FCtSJc=", + "lastModified": 1754921951, + "narHash": "sha256-KY+/livAp6l3fI8SdNa+CLN/AA4Z038yL/pQL2PaW7g=", "owner": "nix-community", "repo": "nixvim", - "rev": "29edaafdb088cee3d8c616a4a5bb48b5eecc647c", + "rev": "7b53322d75a1c66f84fb145e4b5f0f411d9edc6b", "type": "github" }, "original": { @@ -558,11 +558,11 @@ ] }, "locked": { - "lastModified": 1753450833, - "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=", + "lastModified": 1754301638, + "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", "owner": "NuschtOS", "repo": "search", - "rev": "40987cc1a24feba378438d691f87c52819f7bd75", + "rev": "a60091045273484c040a91f5c229ba298f8ecc27", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1753537027, - "narHash": "sha256-pwfrl+LWLXr9Uj1JmXVqraLfCSW+qo+2cU34HTuFyKw=", + "lastModified": 1754945469, + "narHash": "sha256-4+ZZKS0LmPMl2scNncWmQ2dBCnO7NxSl2V1JcJazhqQ=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "defe8b29463851b2f18127df63e203809c0fa5d1", + "rev": "3b0fc7da4ddd32f70b4743d53e8778eeb148e019", "type": "github" }, "original": { From 4d8dcee86c8d447fe8a89662c8aae31117f8a606 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 17:24:36 +0300 Subject: [PATCH 1237/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index ed3eefc..2f28b8a 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1755442500, - "narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=", + "lastModified": 1755491080, + "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3", + "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1754921951, - "narHash": "sha256-KY+/livAp6l3fI8SdNa+CLN/AA4Z038yL/pQL2PaW7g=", + "lastModified": 1755095763, + "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", "owner": "nix-community", "repo": "nixvim", - "rev": "7b53322d75a1c66f84fb145e4b5f0f411d9edc6b", + "rev": "ecc7880e00a2a735074243d8a664a931d73beace", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1754945469, - "narHash": "sha256-4+ZZKS0LmPMl2scNncWmQ2dBCnO7NxSl2V1JcJazhqQ=", + "lastModified": 1755527048, + "narHash": "sha256-eJRC0+wvyF3KjFGzDkEGimyvSsCWOJD3I4MxKotVYqQ=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "3b0fc7da4ddd32f70b4743d53e8778eeb148e019", + "rev": "a13d094773786bdfb236032ae900bfabaf289f7c", "type": "github" }, "original": { From 663d6f7eea537a8dafa3d759c8c77d8dff8e49de Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 21:29:21 +0300 Subject: [PATCH 1238/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 2f28b8a..2033732 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1755491080, - "narHash": "sha256-ib1Xi13NEalrFqQAHceRsb+6aIPANFuQq80SS/bY10M=", + "lastModified": 1755538029, + "narHash": "sha256-XVsragfuN8A/tMiPToejH7RofH15toeIGhlXraX+yBo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f8af2cbe386f9b96dd9efa57ab15a09377f38f4d", + "rev": "bf450a0844e80e6aa22652d3f3728f20cd974527", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1755527048, - "narHash": "sha256-eJRC0+wvyF3KjFGzDkEGimyvSsCWOJD3I4MxKotVYqQ=", + "lastModified": 1755541721, + "narHash": "sha256-dnWGJmS8orqbSA9XDTTuw0VlS/v6ai3bRYq28UM+y5Q=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "a13d094773786bdfb236032ae900bfabaf289f7c", + "rev": "e98be4fd93934d9dca4eb4545e87c70a0147f218", "type": "github" }, "original": { From 184dd72cc6bdc4400f713c55b6fc6693783e4668 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 18 Aug 2025 23:30:10 +0300 Subject: [PATCH 1239/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2033732..da40080 100644 --- a/flake.lock +++ b/flake.lock @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1755541721, - "narHash": "sha256-dnWGJmS8orqbSA9XDTTuw0VlS/v6ai3bRYq28UM+y5Q=", + "lastModified": 1755548984, + "narHash": "sha256-9edd/eqzvbnlkq5o5l2symqXn78u5xmy0GbGi9/jk5c=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "e98be4fd93934d9dca4eb4545e87c70a0147f218", + "rev": "d78b9bc6243a33150da3322728b9115aff5a09c5", "type": "github" }, "original": { From 527c565462fe6630ba71be88f67a824d073523d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Aug 2025 03:29:45 +0300 Subject: [PATCH 1240/1768] use the same formatter in ci --- .github/workflows/nix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 25c8d7c..a546bb3 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -34,4 +34,4 @@ jobs: steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v31 - - run: nix shell nixpkgs#alejandra -c alejandra -c . + - run: nix run nixpkgs#nixfmt-tree -- --ci From a0eb07545b7c4be330ff4b306406ef42cc6b0b7f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Aug 2025 14:52:11 +0300 Subject: [PATCH 1241/1768] no need for these models --- modules/services/ollama.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index 40b0192..fa2e9a9 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -19,10 +19,10 @@ services.ollama = { enable = true; acceleration = "cuda"; - loadModels = [ - "deepseek-r1:7b" - "deepseek-r1:14b" - ]; + # loadModels = [ + # "deepseek-r1:7b" + # "deepseek-r1:14b" + # ]; }; services.open-webui = { From 5081595ed1d9e8f4f8c42dbb31384adf761eefda Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Aug 2025 14:52:43 +0300 Subject: [PATCH 1242/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index da40080..269c999 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1755538029, - "narHash": "sha256-XVsragfuN8A/tMiPToejH7RofH15toeIGhlXraX+yBo=", + "lastModified": 1755601933, + "narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf450a0844e80e6aa22652d3f3728f20cd974527", + "rev": "8af2e064f93234ee79df8b9858eeefbf84394488", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1755548984, - "narHash": "sha256-9edd/eqzvbnlkq5o5l2symqXn78u5xmy0GbGi9/jk5c=", + "lastModified": 1755604307, + "narHash": "sha256-4O+3/evF/h33yo7QseEBXGKE4MGAb62aCd1J2EqbPqE=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "d78b9bc6243a33150da3322728b9115aff5a09c5", + "rev": "d8efd81cbdfacef5a029b20171f9ce3814b97f96", "type": "github" }, "original": { From 497e4090c0c968196a19f3f55c502bdb57c36f6f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 19 Aug 2025 21:39:08 +0300 Subject: [PATCH 1243/1768] disable wayland in wezterm --- home/wezterm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/wezterm.nix b/home/wezterm.nix index 4f1b0c2..7a5a93c 100644 --- a/home/wezterm.nix +++ b/home/wezterm.nix @@ -24,6 +24,7 @@ default_prog = { _G.shells.fish }, window_decorations = "NONE", hide_tab_bar_if_only_one_tab = true, + enable_wayland = false, } ''; }; From 02a0717915493bb368471271202bced13d43d588 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 22 Aug 2025 22:56:08 +0300 Subject: [PATCH 1244/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 269c999..a66fde7 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1755601933, - "narHash": "sha256-iXZeeYyfy8NdpvH/OOW9V3C2AfsXE+fzDHfrIOHBPF0=", + "lastModified": 1755810213, + "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8af2e064f93234ee79df8b9858eeefbf84394488", + "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { From 9645d70061e5868344437cbcb78776c7432388a6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 25 Aug 2025 00:53:45 +0300 Subject: [PATCH 1245/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a66fde7..f04a8f0 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1755810213, - "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", + "lastModified": 1756022458, + "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", "owner": "nix-community", "repo": "home-manager", - "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", + "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1755404379, - "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=", + "lastModified": 1756008611, + "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3", + "rev": "52dec1cb33a614accb9e01307e17816be974d24d", "type": "github" }, "original": { From 1e377d5f59d299d17190d80815244f1c24cfea7a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 28 Aug 2025 15:29:49 +0300 Subject: [PATCH 1246/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f04a8f0..2d97753 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { From 3659bcb2d1d8c2fbd0e69de6018fbf9ea3ed305d Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 31 Aug 2025 14:07:49 +0300 Subject: [PATCH 1247/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2d97753..fdfe7b7 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1756261190, - "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", + "lastModified": 1756579987, + "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", "owner": "nix-community", "repo": "home-manager", - "rev": "77f348da3176dc68b20a73dab94852a417daf361", + "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1756008611, - "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", + "lastModified": 1756612744, + "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "52dec1cb33a614accb9e01307e17816be974d24d", + "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756266583, - "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { From fd8e6215ec04e92d22000d40dd83c4dd67d9cbd6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 31 Aug 2025 23:15:51 +0300 Subject: [PATCH 1248/1768] disable open-webui for now --- modules/services/ollama.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/ollama.nix b/modules/services/ollama.nix index fa2e9a9..5b0f21c 100644 --- a/modules/services/ollama.nix +++ b/modules/services/ollama.nix @@ -26,7 +26,7 @@ }; services.open-webui = { - enable = true; + enable = false; # TODO gives error fix later port = 7070; host = "0.0.0.0"; openFirewall = true; From 4d0ce0f089d2b77cb69e00dff157204fa02fb59c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 31 Aug 2025 23:20:50 +0300 Subject: [PATCH 1249/1768] deprecated error --- hosts/harmonica-sd/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/harmonica-sd/hardware-configuration.nix b/hosts/harmonica-sd/hardware-configuration.nix index 541780f..7e65109 100644 --- a/hosts/harmonica-sd/hardware-configuration.nix +++ b/hosts/harmonica-sd/hardware-configuration.nix @@ -16,10 +16,10 @@ algorithm = "zstd"; }; + image.fileName = "zero2.img"; sdImage = { # bzip2 compression takes loads of time with emulation, skip it. Enable this if you're low on space. compressImage = false; - imageName = "zero2.img"; extraFirmwareConfig = { # Give up VRAM for more Free System Memory From 3190f38b21454cce25c821505cbc100eb0b39343 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 4 Sep 2025 22:05:05 +0300 Subject: [PATCH 1250/1768] move these --- home/ssh.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/home/ssh.nix b/home/ssh.nix index a7ab6d8..b793406 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -10,6 +10,8 @@ let "RemoteCommand" = "fish"; "RequestTTY" = "force"; }; + hashKnownHosts = true; + compression = true; }; # sshBlockAtreus is the same as sshBlock but with 8090 as the port sshBlockAtreus = hostname: { @@ -17,14 +19,15 @@ let user = "osbm"; identityFile = "/home/osbm/.ssh/id_ed25519"; port = 8022; + hashKnownHosts = true; + compression = true; # fish not found error ??? }; in { programs.ssh = { enable = true; - hashKnownHosts = true; - compression = true; + matchBlocks = { ymir = sshBlock "192.168.0.2"; ymir-ts = sshBlock "ymir.curl-boga.ts.net"; From 3136677e0e4d5a8c9804d834e7230fa690e32cb1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 4 Sep 2025 22:11:12 +0300 Subject: [PATCH 1251/1768] add apprentice --- modules/services/wanikani-stats/app.py | 51 ++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index f7d2129..6f0d1e2 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -83,6 +83,14 @@ def get_dataframe(list_of_daily_data): + row["srs_stage_4"], axis=1, ) + + # Individual apprentice stages for distribution analysis + df["apprentice_1"] = df["srs_stage_1"] + df["apprentice_2"] = df["srs_stage_2"] + df["apprentice_3"] = df["srs_stage_3"] + df["apprentice_4"] = df["srs_stage_4"] + df["unlocked"] = df["srs_stage_0"] + df["guru"] = df.apply(lambda row: row["srs_stage_5"] + row["srs_stage_6"], axis=1) df["master"] = df["srs_stage_7"] df["enlightened"] = df["srs_stage_8"] @@ -117,6 +125,45 @@ def get_svg_plot(df, column, title, ylabel): return svg_content +def get_apprentice_distribution_svg(df): + """Generate a stacked area chart showing apprentice stage distribution over time.""" + plt.figure(figsize=(12, 8), facecolor="#151519") + + # Create stacked area chart + plt.stackplot( + df["date"], + df["apprentice_1"], + df["apprentice_2"], + df["apprentice_3"], + df["apprentice_4"], + labels=["Apprentice I", "Apprentice II", "Apprentice III", "Apprentice IV"], + alpha=0.8, + colors=["#ff6b6b", "#4ecdc4", "#45b7d1", "#96ceb4"] + ) + + plt.title("Apprentice Stage Distribution Over Time", fontsize=16, pad=20) + plt.xlabel("Date") + plt.ylabel("Number of Items") + + # Show every 10th date label + plt.xticks(range(0, len(df["date"]), 10), df["date"][::10], rotation=45) + plt.grid(True, alpha=0.3) + plt.legend(loc="upper left", bbox_to_anchor=(0, 1)) + plt.gca().set_facecolor("#151519") + plt.tight_layout() + + # Save to string buffer + import io + + buffer = io.StringIO() + plt.savefig(buffer, format="svg", bbox_inches="tight") + svg_content = buffer.getvalue() + buffer.close() + plt.close() + + return svg_content + + def render_html(df): """Render the DataFrame as HTML.""" reviews_svg = get_svg_plot(df, "num_reviews", "Daily Reviews", "Number of Reviews") @@ -125,6 +172,9 @@ def render_html(df): df, "progression", "SRS Progression", "Progression (%)" ) + # apprentice distribution chart + apprentice_distribution_svg = get_apprentice_distribution_svg(df) + # srs stages srs_stage_apprentice_svg = get_svg_plot( df, "apprentice", "Apprentice Stage", "Number of Subjects" @@ -167,6 +217,7 @@ def render_html(df): {reviews_svg} {lessons_svg} {progression_svg} + {apprentice_distribution_svg} {srs_stage_apprentice_svg} {srs_stage_guru_svg} {srs_stage_master_svg} From 3bc937a8134d24957fa469d79e916f3437634307 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 5 Sep 2025 08:15:16 +0300 Subject: [PATCH 1252/1768] update flake.lock --- flake.lock | 68 +++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index fdfe7b7..46e9238 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1749105467, - "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", + "lastModified": 1756719547, + "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", + "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1756579987, - "narHash": "sha256-duCce8zGsaMsrqqOmLOsuaV1PVIw/vXWnKuLKZClsGg=", + "lastModified": 1756991914, + "narHash": "sha256-4ve/3ah5H/SpL2m3qmZ9GU+VinQYp2MN1G7GamimTds=", "owner": "nix-community", "repo": "home-manager", - "rev": "99a69bdf8a3c6bf038c4121e9c4b6e99706a187a", + "rev": "b08f8737776f10920c330657bee8b95834b7a70f", "type": "github" }, "original": { @@ -182,16 +182,16 @@ ] }, "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", "owner": "NuschtOS", "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.8", + "ref": "v0.1.1", "repo": "ixx", "type": "github" } @@ -286,11 +286,11 @@ "nmt": "nmt_2" }, "locked": { - "lastModified": 1753647809, - "narHash": "sha256-QCkCQIF2biY3Lh3j3J/FQ8hnwYWZrxxXnJzAY7Ow0T0=", + "lastModified": 1755887017, + "narHash": "sha256-UQLA9eBI9n1Cy6hROU6g5hUHvvqkA9pRTk76kIquMps=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "5c4c97df6a05fa102cc5d7907f516588f2e578c6", + "rev": "d6fc6c5446bf342c313df660869f96206b434c2d", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1756925795, + "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "ba6fab29768007e9f2657014a6e134637100c57d", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756542300, + "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1754393734, - "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", + "lastModified": 1755829505, + "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", + "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1755095763, - "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", + "lastModified": 1756587208, + "narHash": "sha256-pATHF/7rZeEYxnkvLZgrLbCjG4xBJDJ4zkjUiu+hhiU=", "owner": "nix-community", "repo": "nixvim", - "rev": "ecc7880e00a2a735074243d8a664a931d73beace", + "rev": "8bad4d407dace583ebf6a41d32cab479788898fe", "type": "github" }, "original": { @@ -558,11 +558,11 @@ ] }, "locked": { - "lastModified": 1754301638, - "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", + "lastModified": 1755555503, + "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", "owner": "NuschtOS", "repo": "search", - "rev": "a60091045273484c040a91f5c229ba298f8ecc27", + "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1755604307, - "narHash": "sha256-4O+3/evF/h33yo7QseEBXGKE4MGAb62aCd1J2EqbPqE=", + "lastModified": 1756705592, + "narHash": "sha256-ymdlspKlCY9XiJnxJNTAKu0ca5rkWh07+HK85Yp6BcQ=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "d8efd81cbdfacef5a029b20171f9ce3814b97f96", + "rev": "3ddc546f8d4c479724de871eea1cfd5d95be975a", "type": "github" }, "original": { From 4ecdf2c7239becedd15c572179c351322b6e3249 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 5 Sep 2025 08:33:00 +0300 Subject: [PATCH 1253/1768] update to plotly --- modules/services/wanikani-stats/app.py | 371 +++++++++++++++----- modules/services/wanikani-stats/default.nix | 1 + 2 files changed, 282 insertions(+), 90 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index 6f0d1e2..db94c87 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -3,15 +3,14 @@ import json from pathlib import Path from flask import Flask, render_template_string, Response import pandas as pd -import matplotlib.pyplot as plt -import seaborn as sns -import matplotlib +import plotly.graph_objects as go +import plotly.express as px +from plotly.subplots import make_subplots +import plotly.io as pio import functools -matplotlib.use("agg") -# set dark theme for plots -sns.set_theme(style="darkgrid") -plt.style.use("dark_background") +# Set Plotly dark theme +pio.templates.default = "plotly_dark" app = Flask(__name__) DATA_DIR = Path("/var/lib/wanikani-logs") @@ -99,102 +98,265 @@ def get_dataframe(list_of_daily_data): return df -def get_svg_plot(df, column, title, ylabel): - """Generate an SVG plot for a given DataFrame column.""" - plt.figure(figsize=(10, 6), facecolor="#151519") - plt.plot(df["date"], df[column], marker="o", label=column.capitalize()) - plt.title(title) - plt.xlabel("Date") - plt.ylabel(ylabel) - # Show every 10th date label - plt.xticks(range(0, len(df["date"]), 10), df["date"][::10], rotation=45) - plt.grid() - plt.legend() - plt.gca().set_facecolor("#151519") - plt.tight_layout() +def get_plotly_html(df, column, title, ylabel): + """Generate an interactive Plotly HTML for a given DataFrame column.""" + fig = go.Figure() - # Save to string buffer - import io + fig.add_trace(go.Scatter( + x=df["date"], + y=df[column], + mode='lines+markers', + name=column.capitalize(), + line=dict(width=2), + marker=dict(size=6) + )) - buffer = io.StringIO() - plt.savefig(buffer, format="svg", bbox_inches="tight") - svg_content = buffer.getvalue() - buffer.close() - plt.close() - - return svg_content - - -def get_apprentice_distribution_svg(df): - """Generate a stacked area chart showing apprentice stage distribution over time.""" - plt.figure(figsize=(12, 8), facecolor="#151519") - - # Create stacked area chart - plt.stackplot( - df["date"], - df["apprentice_1"], - df["apprentice_2"], - df["apprentice_3"], - df["apprentice_4"], - labels=["Apprentice I", "Apprentice II", "Apprentice III", "Apprentice IV"], - alpha=0.8, - colors=["#ff6b6b", "#4ecdc4", "#45b7d1", "#96ceb4"] + fig.update_layout( + title=title, + xaxis_title="Date", + yaxis_title=ylabel, + template="plotly_dark", + plot_bgcolor='#151519', + paper_bgcolor='#151519', + width=1000, + height=500, + margin=dict(l=50, r=50, t=50, b=50) ) - plt.title("Apprentice Stage Distribution Over Time", fontsize=16, pad=20) - plt.xlabel("Date") - plt.ylabel("Number of Items") + # Show every 10th date label for better readability + date_indices = list(range(0, len(df), 10)) + fig.update_xaxes( + tickmode='array', + tickvals=[df.iloc[i]["date"] for i in date_indices], + ticktext=[df.iloc[i]["date"] for i in date_indices], + tickangle=45 + ) - # Show every 10th date label - plt.xticks(range(0, len(df["date"]), 10), df["date"][::10], rotation=45) - plt.grid(True, alpha=0.3) - plt.legend(loc="upper left", bbox_to_anchor=(0, 1)) - plt.gca().set_facecolor("#151519") - plt.tight_layout() + return fig.to_html(include_plotlyjs=True, div_id=f"plot_{column}") - # Save to string buffer - import io - buffer = io.StringIO() - plt.savefig(buffer, format="svg", bbox_inches="tight") - svg_content = buffer.getvalue() - buffer.close() - plt.close() +def get_apprentice_distribution_html(df): + """Generate a stacked area chart showing apprentice stage distribution over time.""" + fig = go.Figure() - return svg_content + # Add stacked area traces + fig.add_trace(go.Scatter( + x=df["date"], + y=df["apprentice_1"], + mode='lines', + name='Apprentice I', + stackgroup='one', + fillcolor='rgba(255, 107, 107, 0.8)', + line=dict(width=0.5, color='#ff6b6b') + )) + + fig.add_trace(go.Scatter( + x=df["date"], + y=df["apprentice_2"], + mode='lines', + name='Apprentice II', + stackgroup='one', + fillcolor='rgba(78, 205, 196, 0.8)', + line=dict(width=0.5, color='#4ecdc4') + )) + + fig.add_trace(go.Scatter( + x=df["date"], + y=df["apprentice_3"], + mode='lines', + name='Apprentice III', + stackgroup='one', + fillcolor='rgba(69, 183, 209, 0.8)', + line=dict(width=0.5, color='#45b7d1') + )) + + fig.add_trace(go.Scatter( + x=df["date"], + y=df["apprentice_4"], + mode='lines', + name='Apprentice IV', + stackgroup='one', + fillcolor='rgba(150, 206, 180, 0.8)', + line=dict(width=0.5, color='#96ceb4') + )) + + fig.update_layout( + title="Apprentice Stage Distribution Over Time", + xaxis_title="Date", + yaxis_title="Number of Items", + template="plotly_dark", + plot_bgcolor='#151519', + paper_bgcolor='#151519', + width=1200, + height=600, + margin=dict(l=50, r=50, t=50, b=50), + legend=dict( + orientation="h", + yanchor="bottom", + y=1.02, + xanchor="right", + x=1 + ) + ) + + # Show every 10th date label for better readability + date_indices = list(range(0, len(df), 10)) + fig.update_xaxes( + tickmode='array', + tickvals=[df.iloc[i]["date"] for i in date_indices], + ticktext=[df.iloc[i]["date"] for i in date_indices], + tickangle=45 + ) + + return fig.to_html(include_plotlyjs=True, div_id="apprentice_distribution") + + +def generate_standalone_html(df, output_path=None): + """Generate a completely self-contained HTML file with all charts.""" + # Generate all chart HTML + reviews_html = get_plotly_html(df, "num_reviews", "Daily Reviews", "Number of Reviews") + lessons_html = get_plotly_html(df, "num_lessons", "Daily Lessons", "Number of Lessons") + progression_html = get_plotly_html( + df, "progression", "SRS Progression", "Progression (%)" + ) + apprentice_distribution_html = get_apprentice_distribution_html(df) + srs_stage_apprentice_html = get_plotly_html( + df, "apprentice", "Apprentice Stage", "Number of Subjects" + ) + srs_stage_guru_html = get_plotly_html(df, "guru", "Guru Stage", "Number of Subjects") + srs_stage_master_html = get_plotly_html( + df, "master", "Master Stage", "Number of Subjects" + ) + srs_stage_enlightened_html = get_plotly_html( + df, "enlightened", "Enlightened Stage", "Number of Subjects" + ) + srs_stage_burned_html = get_plotly_html( + df, "burned", "Burned Stage", "Number of Subjects" + ) + + # Create complete standalone HTML + html_content = f""" + + + + WaniKani Statistics Dashboard + + + + + +

WaniKani Statistics Dashboard

+
+ Interactive dashboard showing your WaniKani learning progress over time +
+ +
{reviews_html}
+
{lessons_html}
+
{progression_html}
+
{apprentice_distribution_html}
+
{srs_stage_apprentice_html}
+
{srs_stage_guru_html}
+
{srs_stage_master_html}
+
{srs_stage_enlightened_html}
+
{srs_stage_burned_html}
+ + + """ + + # Save to file if output_path is provided + if output_path: + with open(output_path, 'w', encoding='utf-8') as f: + f.write(html_content) + print(f"Standalone HTML dashboard saved to: {output_path}") + + return html_content + + +@app.route("/download") +def download_dashboard(): + """Route to download a standalone HTML file.""" + file_names = get_zip_file_names() + + print(f"Found {len(file_names)} zip files in {DATA_DIR}") + list_of_daily_data = [] + for file_name in file_names: + daily_data = load_zip(file_name) + list_of_daily_data.append(daily_data) + + df = get_dataframe(list_of_daily_data) + df.sort_values(by="date", inplace=True) + + html_content = generate_standalone_html(df) + + response = Response(html_content, content_type="text/html") + response.headers["Content-Disposition"] = "attachment; filename=wanikani_dashboard.html" + return response def render_html(df): - """Render the DataFrame as HTML.""" - reviews_svg = get_svg_plot(df, "num_reviews", "Daily Reviews", "Number of Reviews") - lessons_svg = get_svg_plot(df, "num_lessons", "Daily Lessons", "Number of Lessons") - progression_svg = get_svg_plot( + """Render the DataFrame as HTML with interactive Plotly charts.""" + reviews_html = get_plotly_html(df, "num_reviews", "Daily Reviews", "Number of Reviews") + lessons_html = get_plotly_html(df, "num_lessons", "Daily Lessons", "Number of Lessons") + progression_html = get_plotly_html( df, "progression", "SRS Progression", "Progression (%)" ) # apprentice distribution chart - apprentice_distribution_svg = get_apprentice_distribution_svg(df) + apprentice_distribution_html = get_apprentice_distribution_html(df) # srs stages - srs_stage_apprentice_svg = get_svg_plot( + srs_stage_apprentice_html = get_plotly_html( df, "apprentice", "Apprentice Stage", "Number of Subjects" ) - srs_stage_guru_svg = get_svg_plot(df, "guru", "Guru Stage", "Number of Subjects") - srs_stage_master_svg = get_svg_plot( + srs_stage_guru_html = get_plotly_html(df, "guru", "Guru Stage", "Number of Subjects") + srs_stage_master_html = get_plotly_html( df, "master", "Master Stage", "Number of Subjects" ) - srs_stage_enlightened_svg = get_svg_plot( + srs_stage_enlightened_html = get_plotly_html( df, "enlightened", "Enlightened Stage", "Number of Subjects" ) - srs_stage_burned_svg = get_svg_plot( + srs_stage_burned_html = get_plotly_html( df, "burned", "Burned Stage", "Number of Subjects" ) - # Render HTML with embedded SVGs + # Render HTML with embedded Plotly charts html_content = f""" + WaniKani Stats + + - {reviews_svg} - {lessons_svg} - {progression_svg} - {apprentice_distribution_svg} - {srs_stage_apprentice_svg} - {srs_stage_guru_svg} - {srs_stage_master_svg} - {srs_stage_enlightened_svg} - {srs_stage_burned_svg} +

WaniKani Statistics Dashboard

+
{reviews_html}
+
{lessons_html}
+
{progression_html}
+
{apprentice_distribution_html}
+
{srs_stage_apprentice_html}
+
{srs_stage_guru_html}
+
{srs_stage_master_html}
+
{srs_stage_enlightened_html}
+
{srs_stage_burned_html}
""" @@ -259,6 +426,30 @@ def health(): if __name__ == "__main__": import sys - port = int(sys.argv[1]) if len(sys.argv) > 1 else 8501 - print(f"Starting WaniKani Stats Flask app on port {port}") - app.run(host="0.0.0.0", port=port, debug=False) + # Check if user wants to generate standalone HTML + if len(sys.argv) > 1 and sys.argv[1] == "generate": + output_file = sys.argv[2] if len(sys.argv) > 2 else "wanikani_dashboard.html" + + print("Generating standalone HTML dashboard...") + file_names = get_zip_file_names() + + print(f"Found {len(file_names)} zip files in {DATA_DIR}") + list_of_daily_data = [] + for file_name in file_names: + daily_data = load_zip(file_name) + list_of_daily_data.append(daily_data) + + df = get_dataframe(list_of_daily_data) + df.sort_values(by="date", inplace=True) + + generate_standalone_html(df, output_file) + print(f"✅ Standalone HTML dashboard generated: {output_file}") + print("📊 You can now open this file in any web browser to view your interactive WaniKani stats!") + + else: + # Start Flask server + port = int(sys.argv[1]) if len(sys.argv) > 1 else 8501 + print(f"Starting WaniKani Stats Flask app on port {port}") + print(f"📊 View dashboard at: http://localhost:{port}") + print(f"💾 Download standalone HTML at: http://localhost:{port}/download") + app.run(host="0.0.0.0", port=port, debug=False) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 92adccc..882f42b 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -16,6 +16,7 @@ let jinja2 matplotlib seaborn + plotly ] )) ]; From a7565ae4be5f2c42f7311297e1ee6428b75b4349 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 11:39:03 +0300 Subject: [PATCH 1254/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 46e9238..bc49281 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1756991914, - "narHash": "sha256-4ve/3ah5H/SpL2m3qmZ9GU+VinQYp2MN1G7GamimTds=", + "lastModified": 1757075491, + "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b08f8737776f10920c330657bee8b95834b7a70f", + "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "nmt": "nmt_2" }, "locked": { - "lastModified": 1755887017, - "narHash": "sha256-UQLA9eBI9n1Cy6hROU6g5hUHvvqkA9pRTk76kIquMps=", + "lastModified": 1756744433, + "narHash": "sha256-6BSEvkprwEQDQQgW5UH/1GkBPGM8M9+qX6o9ePslr6E=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "d6fc6c5446bf342c313df660869f96206b434c2d", + "rev": "63b748033a3fa0af80f8ed908521122e48858c30", "type": "github" }, "original": { @@ -346,11 +346,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756925795, - "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ba6fab29768007e9f2657014a6e134637100c57d", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -410,11 +410,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756542300, - "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1756587208, - "narHash": "sha256-pATHF/7rZeEYxnkvLZgrLbCjG4xBJDJ4zkjUiu+hhiU=", + "lastModified": 1757145319, + "narHash": "sha256-F5islzaJ5zGXomXAGM7Kqi5skyGaNXOLD77atgmReZw=", "owner": "nix-community", "repo": "nixvim", - "rev": "8bad4d407dace583ebf6a41d32cab479788898fe", + "rev": "a04b93fa7bf4160a9dc60d0713fff44c0fff9af6", "type": "github" }, "original": { @@ -578,11 +578,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1756705592, - "narHash": "sha256-ymdlspKlCY9XiJnxJNTAKu0ca5rkWh07+HK85Yp6BcQ=", + "lastModified": 1757147921, + "narHash": "sha256-U3RAVmKNdah9ZQgxUrhsnPOONTXw4/E4hle1Rt99fKs=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "3ddc546f8d4c479724de871eea1cfd5d95be975a", + "rev": "db9189edfc9007f339e766c176a741f598651e61", "type": "github" }, "original": { From 0bdf89f1d19ab4f68646ac22c4234b9436dfb092 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 15:55:27 +0300 Subject: [PATCH 1255/1768] lets disable ts --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 30149a6..9234c0d 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,7 +27,7 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; - services.wanikani-stats.enable = true; + # services.wanikani-stats.enable = true; # paperless is giving an error # services.paperless = { From bfbddcf2757b24e54757128f732cbe1c17a109c1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 15:59:33 +0300 Subject: [PATCH 1256/1768] enable remote builds --- modules/remote-builds.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index e6b1f58..01451b9 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -4,16 +4,16 @@ ... }: { - # nix.distributedBuilds = true; + nix.distributedBuilds = true; # nix.settings.builders-use-substitutes = true; - # nix.buildMachines = [ - # { - # hostName = "ymir.curl-boga.ts.net"; - # systems = ["x86_64-linux" "aarch64-linux"]; - # supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; - # sshKey = config.age.secrets.ssh-key-private.path; - # sshUser = "osbm"; - # protocol = "ssh-ng"; - # } - # ]; + nix.buildMachines = [ + { + hostName = "ymir.curl-boga.ts.net"; + systems = ["x86_64-linux" "aarch64-linux"]; + supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; + sshKey = config.age.secrets.ssh-key-private.path; + sshUser = "osbm"; + protocol = "ssh-ng"; + } + ]; } From 4175049269d4ca8fd223e2a69bb316378284a6d9 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 16:00:18 +0300 Subject: [PATCH 1257/1768] fix --- modules/remote-builds.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 01451b9..e1305db 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,6 +1,6 @@ { - # config, - # outputs, + config, + outputs, ... }: { From 4db674cbb987a98e4fa0a871bb4f5bd1a72a65fb Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 16:03:23 +0300 Subject: [PATCH 1258/1768] Revert "lets disable ts" This reverts commit 0bdf89f1d19ab4f68646ac22c4234b9436dfb092. --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 9234c0d..30149a6 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,7 +27,7 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; - # services.wanikani-stats.enable = true; + services.wanikani-stats.enable = true; # paperless is giving an error # services.paperless = { From 879d5f4358a0162483c88c57bbb1e13b1320f166 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 16:16:48 +0300 Subject: [PATCH 1259/1768] change machine name --- modules/remote-builds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index e1305db..6ebb2ea 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -8,7 +8,7 @@ # nix.settings.builders-use-substitutes = true; nix.buildMachines = [ { - hostName = "ymir.curl-boga.ts.net"; + hostName = "ymir"; systems = ["x86_64-linux" "aarch64-linux"]; supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; sshKey = config.age.secrets.ssh-key-private.path; From 473fa43b593792dd6a5e689263f825af51db4744 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 16:17:04 +0300 Subject: [PATCH 1260/1768] Reapply "lets disable ts" This reverts commit 4db674cbb987a98e4fa0a871bb4f5bd1a72a65fb. --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 30149a6..9234c0d 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,7 +27,7 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; - services.wanikani-stats.enable = true; + # services.wanikani-stats.enable = true; # paperless is giving an error # services.paperless = { From 79fdf11ecb763e79628fe312c0e8e5816ec5c62d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Sep 2025 16:29:09 +0300 Subject: [PATCH 1261/1768] Revert "lets disable ts" This reverts commit 0bdf89f1d19ab4f68646ac22c4234b9436dfb092. --- hosts/pochita/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/pochita/configuration.nix b/hosts/pochita/configuration.nix index 9234c0d..30149a6 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/pochita/configuration.nix @@ -27,7 +27,7 @@ services.wanikani-bypass-lessons.enable = true; services.wanikani-fetch-data.enable = true; - # services.wanikani-stats.enable = true; + services.wanikani-stats.enable = true; # paperless is giving an error # services.paperless = { From 018f4da4ad38bafc7d66dff320da655e04bae428 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 10:57:51 +0300 Subject: [PATCH 1262/1768] update remote builds --- modules/remote-builds.nix | 41 ++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 6ebb2ea..116dfa4 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,19 +1,38 @@ { config, outputs, + lib, ... }: { - nix.distributedBuilds = true; - # nix.settings.builders-use-substitutes = true; - nix.buildMachines = [ - { - hostName = "ymir"; - systems = ["x86_64-linux" "aarch64-linux"]; - supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; - sshKey = config.age.secrets.ssh-key-private.path; - sshUser = "osbm"; - protocol = "ssh-ng"; - } + config = lib.mkMerge [ + (lib.mkIf (config.networking.hostName != "ymir") { + nix.distributedBuilds = true; + # nix.settings.builders-use-substitutes = true; + nix.buildMachines = [ + { + hostName = "ymir"; + systems = ["x86_64-linux" "aarch64-linux"]; + supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; + sshKey = config.age.secrets.ssh-key-private.path; + sshUser = "osbm"; + protocol = "ssh-ng"; + } + ]; + }) + (lib.mkIf (config.networking.hostName != "wallfacer") { + nix.distributedBuilds = true; + # nix.settings.builders-use-substitutes = true; + nix.buildMachines = [ + { + hostName = "wallfacer"; + systems = ["x86_64-linux"]; + supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features; + sshKey = config.age.secrets.ssh-key-private.path; + sshUser = "osbm"; + protocol = "ssh-ng"; + } + ]; + }) ]; } From f32504ed7edee2dcebd1c79042852a46d296be24 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 13:51:30 +0300 Subject: [PATCH 1263/1768] use python 313 --- modules/services/wanikani-stats/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 882f42b..2f7991c 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -8,7 +8,7 @@ let wanikani-stats-flask = pkgs.writeShellApplication { name = "wanikani-stats-flask"; runtimeInputs = [ - (pkgs.python312.withPackages ( + (pkgs.python3.withPackages ( ppkgs: with pkgs.python312Packages; [ flask pandas From a2f5aaffa52cdafc14f39f60a1b512e189b47bd0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 13:54:34 +0300 Subject: [PATCH 1264/1768] fix --- modules/services/wanikani-stats/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 2f7991c..b1c4f9e 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -9,7 +9,7 @@ let name = "wanikani-stats-flask"; runtimeInputs = [ (pkgs.python3.withPackages ( - ppkgs: with pkgs.python312Packages; [ + ppkgs: with pkgs.python3Packages; [ flask pandas numpy From 1f5820c557c1ba1e479cfce352bdc2ad0e1bcf1e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 13:56:37 +0300 Subject: [PATCH 1265/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bc49281..f06f995 100644 --- a/flake.lock +++ b/flake.lock @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1756612744, - "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", + "lastModified": 1757218147, + "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", + "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", "type": "github" }, "original": { @@ -362,11 +362,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { From b990ca7009c876d04a5e63a91dd14ff9d5d494ba Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 17:08:51 +0300 Subject: [PATCH 1266/1768] disable test --- modules/services/wanikani-stats/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index b1c4f9e..7859e04 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -5,11 +5,24 @@ ... }: let + python = let + packageOverrides = self: super: { + imageio = super.imageio.overridePythonAttrs (old: { + disabledTests = [ + "test_read_stream" + "test_uri_reading" + "test_trim_filter" + "test_tifffile_reading_writing" + ]; + }); + }; + in + pkgs.python313.override { inherit packageOverrides; self = python; }; wanikani-stats-flask = pkgs.writeShellApplication { name = "wanikani-stats-flask"; runtimeInputs = [ - (pkgs.python3.withPackages ( - ppkgs: with pkgs.python3Packages; [ + (python.withPackages ( + ppkgs: with python.pkgs; [ flask pandas numpy From 3a46d089eb8e4692e1cd684e7e717e6c07f49860 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 17:11:04 +0300 Subject: [PATCH 1267/1768] update test name --- modules/services/wanikani-stats/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 7859e04..64cd687 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -12,7 +12,7 @@ let "test_read_stream" "test_uri_reading" "test_trim_filter" - "test_tifffile_reading_writing" + "test_process_termination" ]; }); }; From 4081757a67473a971928c1c71c95f1cff57f319e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 17:43:51 +0300 Subject: [PATCH 1268/1768] add plotly disabled tests --- modules/services/wanikani-stats/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 64cd687..1a6ba51 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -15,6 +15,11 @@ let "test_process_termination" ]; }); + plotly = super.plotly.overridePythonAttrs (old: { + disabledTestPaths = (old.disabledTestPaths or []) ++ [ + "tests/test_optional/test_kaleido/test_kaleido.py" + ]; + }); }; in pkgs.python313.override { inherit packageOverrides; self = python; }; From 5aced6327e6278c9e508f8a1230a91a2c75f8067 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 18:07:50 +0300 Subject: [PATCH 1269/1768] fix --- modules/services/wanikani-stats/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index db94c87..fdd1041 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -393,7 +393,7 @@ def render_html(df): """ - return render_template_string(html_content) + return html_content @app.route("/") From 5e5246da959ed613d8a1b3f71aa25fa939814aeb Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 18:12:08 +0300 Subject: [PATCH 1270/1768] same as other --- modules/services/wanikani-stats/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/services/wanikani-stats/app.py b/modules/services/wanikani-stats/app.py index fdd1041..c9a2f1b 100644 --- a/modules/services/wanikani-stats/app.py +++ b/modules/services/wanikani-stats/app.py @@ -118,8 +118,8 @@ def get_plotly_html(df, column, title, ylabel): template="plotly_dark", plot_bgcolor='#151519', paper_bgcolor='#151519', - width=1000, - height=500, + width=1200, + height=600, margin=dict(l=50, r=50, t=50, b=50) ) From 89ba26bea7de176e82b5c8f6535a9322e761e976 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 18:29:40 +0300 Subject: [PATCH 1271/1768] make it an iframe --- modules/services/glance.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 88a60b7..70f8f20 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -174,10 +174,9 @@ size = "full"; widgets = [ { - type = "extension"; - url = "http://localhost:8501"; - allow-potentially-dangerous-html = true; - + type = "iframe"; + source = "http://localhost:8501"; + height = 1600; } ]; } From e4271e43db254c20dfe9f1cdf1905191c0249913 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 18:34:25 +0300 Subject: [PATCH 1272/1768] update --- modules/services/glance.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index 70f8f20..ed71653 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -175,7 +175,7 @@ widgets = [ { type = "iframe"; - source = "http://localhost:8501"; + source = "http://pochita:8501"; height = 1600; } ]; From b21a3724fb5bccf17769b8d271533a2df07289a2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 18:37:23 +0300 Subject: [PATCH 1273/1768] its fucking enough --- modules/services/glance.nix | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/modules/services/glance.nix b/modules/services/glance.nix index ed71653..ab793ce 100644 --- a/modules/services/glance.nix +++ b/modules/services/glance.nix @@ -154,8 +154,8 @@ } { icon = "si:json"; - title = "Wanikani Stats Health"; - url = "http://localhost:8501/health"; + title = "Wanikani Stats"; + url = "http://pochita:8501"; } ]; title = "Services"; @@ -167,24 +167,6 @@ name = "Home"; content = "Welcome to Pochita's home page!"; } - - { - columns = [ - { - size = "full"; - widgets = [ - { - type = "iframe"; - source = "http://pochita:8501"; - height = 1600; - } - ]; - } - ]; - name = "Wanikani Stats"; - content = "Welcome to Wanikani Stats page!"; - } - ]; }; }; From 024b8ed6d8776f89f0181e3bed5cd4753a2119b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 7 Sep 2025 21:12:56 +0300 Subject: [PATCH 1274/1768] only allow pochita to do ts --- modules/remote-builds.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 116dfa4..0f8917d 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -6,7 +6,7 @@ }: { config = lib.mkMerge [ - (lib.mkIf (config.networking.hostName != "ymir") { + (lib.mkIf (config.networking.hostName == "pochita") { nix.distributedBuilds = true; # nix.settings.builders-use-substitutes = true; nix.buildMachines = [ @@ -18,12 +18,6 @@ sshUser = "osbm"; protocol = "ssh-ng"; } - ]; - }) - (lib.mkIf (config.networking.hostName != "wallfacer") { - nix.distributedBuilds = true; - # nix.settings.builders-use-substitutes = true; - nix.buildMachines = [ { hostName = "wallfacer"; systems = ["x86_64-linux"]; From 44dd1f774ecf95c970bf220393d430b45d606836 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 8 Sep 2025 10:27:02 +0300 Subject: [PATCH 1275/1768] no vbox --- hosts/tartarus/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 0a058b9..78019b2 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -19,8 +19,6 @@ enableSound = true; }; - virtualisation.virtualbox.host.enable = true; - users.extraGroups.vboxusers.members = [ "osbm" ]; # Bootloader. boot.loader.systemd-boot.enable = true; From 02ee8fd4e1f1101301b6392cd436099c22189215 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 8 Sep 2025 20:15:12 +0300 Subject: [PATCH 1276/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f06f995..8e1f852 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1757075491, - "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", + "lastModified": 1757256385, + "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", + "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", "type": "github" }, "original": { From 33fa2a5847dbf36c49cada033d4980d4673713e1 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 8 Sep 2025 20:57:29 +0300 Subject: [PATCH 1277/1768] no aliases --- hosts/harmonica-sd/hardware-configuration.nix | 2 +- hosts/harmonica/hardware-configuration.nix | 2 +- modules/common-packages.nix | 2 +- modules/fonts.nix | 2 +- modules/nix-settings.nix | 1 + modules/secrets.nix | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hosts/harmonica-sd/hardware-configuration.nix b/hosts/harmonica-sd/hardware-configuration.nix index 7e65109..faa2820 100644 --- a/hosts/harmonica-sd/hardware-configuration.nix +++ b/hosts/harmonica-sd/hardware-configuration.nix @@ -61,7 +61,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_rpi02w; + kernelPackages = pkgs.linuxKernel.packages.linux_rpi3; initrd.availableKernelModules = [ "xhci_pci" diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/harmonica/hardware-configuration.nix index 27edb68..3d492ca 100644 --- a/hosts/harmonica/hardware-configuration.nix +++ b/hosts/harmonica/hardware-configuration.nix @@ -47,7 +47,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_rpi02w; + kernelPackages = pkgs.linuxKernel.packages.linux_rpi3; initrd.availableKernelModules = [ "xhci_pci" diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 8734142..9e50b7a 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -46,7 +46,7 @@ nix-inspect bat fd - du-dust + dust dysk gnupg attic-client diff --git a/modules/fonts.nix b/modules/fonts.nix index a8a96f6..07b27b2 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -18,7 +18,7 @@ fonts.packages = with pkgs; [ cascadia-code noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji liberation_ttf fira-code fira-code-symbols diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 73abcb5..878979d 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -30,6 +30,7 @@ "nvidia-settings" "cuda-merged" ]; + nixpkgs.config.allowAliases = false; # enable nix flakes nix.settings.experimental-features = [ diff --git a/modules/secrets.nix b/modules/secrets.nix index 91b0d08..f8a0843 100644 --- a/modules/secrets.nix +++ b/modules/secrets.nix @@ -20,7 +20,7 @@ config = lib.mkMerge [ (lib.mkIf config.myModules.enableSecrets { environment.systemPackages = [ - inputs.agenix.packages.${pkgs.hostPlatform.system}.agenix + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix pkgs.age ]; From 9ec0ca47d87227fa305f5f4f1c2686d173db3a1b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 10:43:21 +0300 Subject: [PATCH 1278/1768] add prometheus configuration --- darwinHosts/prometheus/configuration.nix | 8 +++ flake.lock | 62 +++++++++++++++++++----- flake.nix | 11 ++++- 3 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 darwinHosts/prometheus/configuration.nix diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix new file mode 100644 index 0000000..682ba4f --- /dev/null +++ b/darwinHosts/prometheus/configuration.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + imports = [ + ../../modules + ]; + + system.stateVersion = 6; + nixpkgs.hostPlatform = "x86_64-darwin"; +} diff --git a/flake.lock b/flake.lock index 8e1f852..7487f75 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1757256385, - "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", + "lastModified": 1757385184, + "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", "owner": "nix-community", "repo": "home-manager", - "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", + "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", "type": "github" }, "original": { @@ -250,6 +250,25 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1757130842, + "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -362,16 +381,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1747728033, + "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -409,6 +428,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1756787288, "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", @@ -424,7 +459,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1755829505, "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", @@ -440,7 +475,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1736061677, "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", @@ -459,7 +494,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nuschtosSearch": "nuschtosSearch", "systems": "systems_4" }, @@ -574,7 +609,7 @@ "osbm-nvim": { "inputs": { "nix-formatter-pack": "nix-formatter-pack_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim" }, "locked": { @@ -595,7 +630,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -624,10 +659,11 @@ "deploy-rs": "deploy-rs", "home-manager": "home-manager", "minegrub-theme": "minegrub-theme", + "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix" } diff --git a/flake.nix b/flake.nix index bd1943b..22e7d2d 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,10 @@ }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nix-darwin = { + url = "github:nix-darwin/nix-darwin/master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-on-droid = { url = "github:nix-community/nix-on-droid"; inputs.nixpkgs.follows = "nixpkgs"; @@ -46,6 +50,7 @@ self, nixpkgs, nix-on-droid, + nix-darwin, deploy-rs, ... }@inputs: @@ -74,7 +79,11 @@ pkgs = import nixpkgs { system = "aarch64-linux"; }; modules = [ ./nixOnDroidHosts/atreus/configuration.nix ]; }; - + darwinConfigurations.prometheus = nix-darwin.lib.darwinSystem { + system = "x86_64-darwin"; + modules = [ ./darwinHosts/prometheus/configuration.nix ]; + specialArgs = { inherit inputs outputs; }; + }; lib = import ./lib { inherit (nixpkgs) lib; }; formatter = forAllSystems (system: (makePkgs system).nixfmt-tree); deploy.nodes.harmonica = { From a19ecfbd3e32d60791c5ca9faad02c481a71c448 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:00:23 +0300 Subject: [PATCH 1279/1768] set users --- modules/users.nix | 61 +++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/modules/users.nix b/modules/users.nix index 3056e19..4339e46 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -1,29 +1,38 @@ -{ ... }: +{ lib, config, ... }: { - users.users = { - osbm = { - isNormalUser = true; - description = "osbm"; - initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; - extraGroups = [ - "networkmanager" - "wheel" - "docker" - ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" - ]; - packages = [ - ]; + options = { + myModules.setUsers = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable user management."; + }; + }; + + config = lib.mkIf config.myModules.setUsers { + users.users = { + osbm = { + isNormalUser = true; + description = "osbm"; + initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; + extraGroups = [ + "networkmanager" + "wheel" + "docker" + ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" + ]; + packages = [ + ]; + }; + bayram = { + isNormalUser = true; + description = "bayram"; + initialHashedPassword = "$6$IamAbigfailure$3BP231DVwbqUtZ.mq33nM/JitBrT2u26Y25VpsfBwhZbezMHz4XbySrOMnaMcCYdsb3wZFL3Ppcp0L.R8nonT."; + extraGroups = [ "networkmanager" ]; + packages = [ + ]; + }; + root.initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; }; - bayram = { - isNormalUser = true; - description = "bayram"; - initialHashedPassword = "$6$IamAbigfailure$3BP231DVwbqUtZ.mq33nM/JitBrT2u26Y25VpsfBwhZbezMHz4XbySrOMnaMcCYdsb3wZFL3Ppcp0L.R8nonT."; - extraGroups = [ "networkmanager" ]; - packages = [ - ]; - }; - root.initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; }; -} From e2056f1dac40d3580f0aa29d892a4513c3ba5d4b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:04:59 +0300 Subject: [PATCH 1280/1768] more things --- darwinHosts/prometheus/configuration.nix | 6 ++++++ modules/nix-settings.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 682ba4f..a73b218 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -2,6 +2,12 @@ imports = [ ../../modules ]; + myModules.setUsers = false; + users.users.mac = { + description = "mac"; + shell = pkgs.fish; + home = "/Users/mac"; + }; system.stateVersion = 6; nixpkgs.hostPlatform = "x86_64-darwin"; diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 878979d..cf4d505 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -66,6 +66,7 @@ nix.settings.trusted-users = [ "root" "osbm" + "mac" # TODO change mac user to osbm ]; nix.gc = { From 09320fb298823049596a45e6aacbd7b2d835edf9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:08:01 +0300 Subject: [PATCH 1281/1768] hotfix --- modules/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/users.nix b/modules/users.nix index 4339e46..1858987 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -36,3 +36,4 @@ root.initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; }; }; +} From e6911401c7f6e54c65027efea0272bd1a67c5b36 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:21:01 +0300 Subject: [PATCH 1282/1768] how about this --- modules/minegrub.nix | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/modules/minegrub.nix b/modules/minegrub.nix index ce1fe94..b3812ec 100644 --- a/modules/minegrub.nix +++ b/modules/minegrub.nix @@ -16,22 +16,20 @@ description = "Enable Minecraft theme for grub."; }; }; - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableMinegrubTheme { - boot.loader.grub = { - # minegrub-theme = { - # enable = true; - # splash = "100% Flakes!"; - # background = "background_options/1.8 - [Classic Minecraft].png"; - # boot-options-count = 4; - # }; - theme = pkgs.fetchFromGitHub { - owner = "Lxtharia"; - repo = "minegrub-theme"; - rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; - sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; - }; + config = lib.mkIf config.myModules.enableMinegrubTheme { + boot.loader.grub = { + # minegrub-theme = { + # enable = true; + # splash = "100% Flakes!"; + # background = "background_options/1.8 - [Classic Minecraft].png"; + # boot-options-count = 4; + # }; + theme = pkgs.fetchFromGitHub { + owner = "Lxtharia"; + repo = "minegrub-theme"; + rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; + sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; }; - }) - ]; + }; + }; } From 9305e0d08a1de295bb03ddd4be3563720db702ce Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:21:30 +0300 Subject: [PATCH 1283/1768] update flake.lock --- flake.lock | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 7487f75..fbc5397 100644 --- a/flake.lock +++ b/flake.lock @@ -252,7 +252,9 @@ }, "nix-darwin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1757130842, @@ -381,16 +383,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747728033, - "narHash": "sha256-NnXFQu7g4LnvPIPfJmBuZF7LFy/fey2g2+LCzjQhTUk=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9173bde1d3fbf1ad26ff6d52f952f9e9da52ea", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -428,22 +430,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1756787288, "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", @@ -459,7 +445,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1755829505, "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", @@ -475,7 +461,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1736061677, "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", @@ -494,7 +480,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch", "systems": "systems_4" }, @@ -609,7 +595,7 @@ "osbm-nvim": { "inputs": { "nix-formatter-pack": "nix-formatter-pack_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" }, "locked": { @@ -630,7 +616,7 @@ "inputs": { "libcamera-src": "libcamera-src", "libpisp-src": "libpisp-src", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-src": "rpi-firmware-src", @@ -663,7 +649,7 @@ "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix" } From 394664b51727d49ce8697668d59f9baea439ec88 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:21:44 +0300 Subject: [PATCH 1284/1768] ignore apple vomit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b2be92b..87c96ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ result +.DS_Store +.direnv \ No newline at end of file From bef248baccf24f0cac96d9a2e7f64dae935145b3 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:25:42 +0300 Subject: [PATCH 1285/1768] no minegrub --- modules/minegrub.nix | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 modules/minegrub.nix diff --git a/modules/minegrub.nix b/modules/minegrub.nix deleted file mode 100644 index b3812ec..0000000 --- a/modules/minegrub.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - config, - inputs, - lib, - pkgs, - ... -}: -{ - # imports = [ - # inputs.minegrub-theme.nixosModules.default - # ]; - options = { - myModules.enableMinegrubTheme = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Minecraft theme for grub."; - }; - }; - config = lib.mkIf config.myModules.enableMinegrubTheme { - boot.loader.grub = { - # minegrub-theme = { - # enable = true; - # splash = "100% Flakes!"; - # background = "background_options/1.8 - [Classic Minecraft].png"; - # boot-options-count = 4; - # }; - theme = pkgs.fetchFromGitHub { - owner = "Lxtharia"; - repo = "minegrub-theme"; - rev = "193b3a7c3d432f8c6af10adfb465b781091f56b3"; - sha256 = "1bvkfmjzbk7pfisvmyw5gjmcqj9dab7gwd5nmvi8gs4vk72bl2ap"; - }; - }; - }; -} From a9510fba29fe15dac3d330654c532f9585d5c7dc Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:26:40 +0300 Subject: [PATCH 1286/1768] dont mention --- modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default.nix b/modules/default.nix index 12cfa8e..a979efd 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -11,7 +11,7 @@ ./graphical-interface.nix ./home.nix ./i18n.nix - ./minegrub.nix + # ./minegrub.nix ./nix-settings.nix ./remote-builds.nix ./secrets.nix From f1aa15495daf114b336c8f5c35585db43c41b58a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:32:33 +0300 Subject: [PATCH 1287/1768] try --- darwinHosts/prometheus/configuration.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index a73b218..9d8c904 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -1,14 +1,29 @@ {pkgs, ...}: { imports = [ - ../../modules + # ../../modules + ../../modules/common-packages.nix + ../../modules/home.nix + ../../modules/nix-settings.nix + ../../modules/secrets.nix + ../../modules/i18n.nix ]; + myModules.setUsers = false; users.users.mac = { description = "mac"; shell = pkgs.fish; home = "/Users/mac"; }; - + environment.systemPackages = with pkgs; [ + alacritty + ghostty + kitty + vscode + blender + libreoffice + code-cursor + ungoogled-chromium + ]; system.stateVersion = 6; nixpkgs.hostPlatform = "x86_64-darwin"; } From ffee7198865fc6f1854479d6539fc3012a28323e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:33:18 +0300 Subject: [PATCH 1288/1768] no i18n --- darwinHosts/prometheus/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 9d8c904..c333ef8 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -5,7 +5,6 @@ ../../modules/home.nix ../../modules/nix-settings.nix ../../modules/secrets.nix - ../../modules/i18n.nix ]; myModules.setUsers = false; From e191248f3ddbf8488746b3b8a37c6c7ff8e5822a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:33:50 +0300 Subject: [PATCH 1289/1768] no user definitions --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index c333ef8..22b096c 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -7,7 +7,7 @@ ../../modules/secrets.nix ]; - myModules.setUsers = false; + # myModules.setUsers = false; users.users.mac = { description = "mac"; shell = pkgs.fish; From 7aee282c362fd7c00c5f31079fbfa91603964edd Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:36:47 +0300 Subject: [PATCH 1290/1768] i hate mac --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index cf4d505..8ab6bd1 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -78,7 +78,7 @@ # nix.nixPath = ["nixpkgs=${pkgs.path}"]; # disable the database error TODO add nix-index search - programs.command-not-found.enable = false; + # programs.command-not-found.enable = false; # TODO fix ts system.configurationRevision = inputs.self.rev or "dirty"; } From 86c6c706a5be1b7171ae160f4a715a10eb9fb4ee Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:41:32 +0300 Subject: [PATCH 1291/1768] nix index things --- modules/default.nix | 1 + modules/nix-index.nix | 8 ++++++++ modules/nix-settings.nix | 7 ------- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 modules/nix-index.nix diff --git a/modules/default.nix b/modules/default.nix index a979efd..e559070 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -12,6 +12,7 @@ ./home.nix ./i18n.nix # ./minegrub.nix + ./nix-index.nix ./nix-settings.nix ./remote-builds.nix ./secrets.nix diff --git a/modules/nix-index.nix b/modules/nix-index.nix new file mode 100644 index 0000000..f8d1a19 --- /dev/null +++ b/modules/nix-index.nix @@ -0,0 +1,8 @@ +{}: { + imports = [ + inputs.nix-index-database.nixosModules.nix-index + ]; + programs.nix-index-database.comma.enable = true; + programs.command-not-found.enable = false; # TODO fix ts + +} \ No newline at end of file diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 8ab6bd1..f993436 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -4,10 +4,6 @@ ... }: { - imports = [ - inputs.nix-index-database.nixosModules.nix-index - ]; - programs.nix-index-database.comma.enable = true; # Allow unfree packages nixpkgs.config.allowUnfreePredicate = pkg: @@ -77,8 +73,5 @@ # nix.nixPath = ["nixpkgs=${pkgs.path}"]; - # disable the database error TODO add nix-index search - # programs.command-not-found.enable = false; # TODO fix ts - system.configurationRevision = inputs.self.rev or "dirty"; } From b6341d79433e73d757cdbad494c1f58a164076eb Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:48:59 +0300 Subject: [PATCH 1292/1768] move openssh --- modules/common-packages.nix | 19 ------------------ modules/services/openssh.nix | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 19 deletions(-) create mode 100644 modules/services/openssh.nix diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 9e50b7a..fb33630 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -60,23 +60,4 @@ virtualisation.docker.enable = true; # Enable the OpenSSH daemon. - services.openssh = { - enable = true; - startWhenNeeded = true; - settings = { - PermitRootLogin = "no"; - - # only allow key based logins and not password - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - AuthenticationMethods = "publickey"; - PubkeyAuthentication = "yes"; - ChallengeResponseAuthentication = "no"; - UsePAM = false; - - # kick out inactive sessions - ClientAliveCountMax = 5; - ClientAliveInterval = 60; - }; - }; } diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix new file mode 100644 index 0000000..1f530f0 --- /dev/null +++ b/modules/services/openssh.nix @@ -0,0 +1,39 @@ +{ + config, + lib, + ... +}: +{ + options = { + myModules.enableOpenssh = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable OpenSSH service"; + }; + }; + + config = lib.mkMerge [ + (lib.mkIf config.myModules.enableOpenssh { + services.openssh = { + enable = true; + startWhenNeeded = true; + settings = { + PermitRootLogin = "no"; + + # only allow key based logins and not password + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + AuthenticationMethods = "publickey"; + PubkeyAuthentication = "yes"; + ChallengeResponseAuthentication = "no"; + UsePAM = false; + + # kick out inactive sessions + ClientAliveCountMax = 5; + ClientAliveInterval = 60; + }; + }; + + }) + ]; +} From fd9cc6fbbb3445c4478e360c3bf314784cc9578d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:49:15 +0300 Subject: [PATCH 1293/1768] mention --- modules/services/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/default.nix b/modules/services/default.nix index 440cfbd..f95d154 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -6,6 +6,7 @@ ./cloudflared.nix ./nextcloud.nix ./ollama.nix + ./openssh.nix ./forgejo.nix ./glance.nix ./hydra.nix From cb69251e9d897456a4b594d028d37f8661fb96ac Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:57:14 +0300 Subject: [PATCH 1294/1768] it should work --- darwinHosts/prometheus/configuration.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 22b096c..3f81a84 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -1,11 +1,19 @@ -{pkgs, ...}: { +{pkgs, inputs, ...}: { imports = [ # ../../modules ../../modules/common-packages.nix - ../../modules/home.nix ../../modules/nix-settings.nix - ../../modules/secrets.nix + inputs.home-manager.darwinModules.home-manager ]; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + verbose = true; + backupFileExtension = "hmbak"; + users.osbm = import ../../home/home.nix { + inherit config pkgs; + }; + }; # myModules.setUsers = false; users.users.mac = { From b28022c7961f1baeac8e2e32a6d747040f18fb19 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 11:58:10 +0300 Subject: [PATCH 1295/1768] add config --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 3f81a84..deb27af 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -1,4 +1,4 @@ -{pkgs, inputs, ...}: { +{pkgs, inputs, config, ...}: { imports = [ # ../../modules ../../modules/common-packages.nix From 849bccd66ccb44c7fc782e15dd9634b5fd4d35f6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 12:00:34 +0300 Subject: [PATCH 1296/1768] add virtualisation --- modules/common-packages.nix | 4 ---- modules/default.nix | 1 + modules/virtualisation.nix | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 modules/virtualisation.nix diff --git a/modules/common-packages.nix b/modules/common-packages.nix index fb33630..12114f3 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -56,8 +56,4 @@ EDITOR = "nvim"; VISUAL = "nvim"; }; - - virtualisation.docker.enable = true; - - # Enable the OpenSSH daemon. } diff --git a/modules/default.nix b/modules/default.nix index e559070..cfabab4 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -19,6 +19,7 @@ ./security.nix ./sound.nix ./users.nix + ./virtualisation.nix ./wake-on-lan.nix ./getty.nix ]; diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix new file mode 100644 index 0000000..08a1eb7 --- /dev/null +++ b/modules/virtualisation.nix @@ -0,0 +1,3 @@ +{ + virtualisation.docker.enable = true; +} \ No newline at end of file From 46cea4bf62b4a5e297fa0f299783c2e19e0baa27 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 12:02:14 +0300 Subject: [PATCH 1297/1768] how about this --- darwinHosts/prometheus/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index deb27af..d38c0c6 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -5,6 +5,8 @@ ../../modules/nix-settings.nix inputs.home-manager.darwinModules.home-manager ]; + + mymodules.enableKDE = lib.mkDefault true; home-manager = { useGlobalPkgs = true; useUserPackages = true; From 31bf7e0949b2c831996cca77dcc7c6be566e2db2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 12:03:11 +0300 Subject: [PATCH 1298/1768] mention lib --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index d38c0c6..f14e081 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -1,4 +1,4 @@ -{pkgs, inputs, config, ...}: { +{pkgs, inputs, lib, config, ...}: { imports = [ # ../../modules ../../modules/common-packages.nix From 2a0b5ffed2091983b670ad20f479689b868b3e55 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 12:04:36 +0300 Subject: [PATCH 1299/1768] how about this --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index f14e081..796b532 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -6,7 +6,7 @@ inputs.home-manager.darwinModules.home-manager ]; - mymodules.enableKDE = lib.mkDefault true; + config = [ mymodules.enableKDE = lib.mkDefault true;]; home-manager = { useGlobalPkgs = true; useUserPackages = true; From c21690ccbb92395f6892ede62b7181c73795d2bb Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 12:05:15 +0300 Subject: [PATCH 1300/1768] am i stupid --- darwinHosts/prometheus/configuration.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 796b532..c7fb3e7 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -6,7 +6,9 @@ inputs.home-manager.darwinModules.home-manager ]; - config = [ mymodules.enableKDE = lib.mkDefault true;]; + config = { + mymodules.enableKDE = lib.mkDefault true; + }; home-manager = { useGlobalPkgs = true; useUserPackages = true; From 412493fd381b9848cb81214180d97dfffcc91fc4 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:08:34 +0300 Subject: [PATCH 1301/1768] dummy module i am gonna lose it --- darwinHosts/prometheus/configuration.nix | 4 +--- darwinHosts/prometheus/dummy-module.nix | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 darwinHosts/prometheus/dummy-module.nix diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index c7fb3e7..7df4225 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -4,11 +4,9 @@ ../../modules/common-packages.nix ../../modules/nix-settings.nix inputs.home-manager.darwinModules.home-manager + ./dummy-module.nix ]; - config = { - mymodules.enableKDE = lib.mkDefault true; - }; home-manager = { useGlobalPkgs = true; useUserPackages = true; diff --git a/darwinHosts/prometheus/dummy-module.nix b/darwinHosts/prometheus/dummy-module.nix new file mode 100644 index 0000000..5f61178 --- /dev/null +++ b/darwinHosts/prometheus/dummy-module.nix @@ -0,0 +1,5 @@ +{ + config = { + mymodules.enableKDE = lib.mkDefault true; + }; +} \ No newline at end of file From 0c4e775678877486877ce03888931347bb7d8529 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:09:25 +0300 Subject: [PATCH 1302/1768] fuck it --- darwinHosts/prometheus/dummy-module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/dummy-module.nix b/darwinHosts/prometheus/dummy-module.nix index 5f61178..b4c7e4e 100644 --- a/darwinHosts/prometheus/dummy-module.nix +++ b/darwinHosts/prometheus/dummy-module.nix @@ -1,5 +1,5 @@ { config = { - mymodules.enableKDE = lib.mkDefault true; + mymodules.enableKDE = true; }; } \ No newline at end of file From 55b538330852579a001e15db65b0bafc59a3161b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:10:44 +0300 Subject: [PATCH 1303/1768] insane --- darwinHosts/prometheus/dummy-module.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/darwinHosts/prometheus/dummy-module.nix b/darwinHosts/prometheus/dummy-module.nix index b4c7e4e..34c6855 100644 --- a/darwinHosts/prometheus/dummy-module.nix +++ b/darwinHosts/prometheus/dummy-module.nix @@ -1,5 +1,5 @@ { - config = { - mymodules.enableKDE = true; + options = { + myModules.enableKDE = true; }; } \ No newline at end of file From 2309315a00f1657717fc54345ce0fb41a6751907 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:11:54 +0300 Subject: [PATCH 1304/1768] please i beg you --- darwinHosts/prometheus/dummy-module.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/dummy-module.nix b/darwinHosts/prometheus/dummy-module.nix index 34c6855..7058a17 100644 --- a/darwinHosts/prometheus/dummy-module.nix +++ b/darwinHosts/prometheus/dummy-module.nix @@ -1,5 +1,10 @@ +{lib, ...}: { options = { - myModules.enableKDE = true; + myModules.enableKDE = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable KDE Plasma"; + }; }; } \ No newline at end of file From 6e073687a5a72f915c2f55e2fd5cd2eabd99fcf2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:20:23 +0300 Subject: [PATCH 1305/1768] home configuration shenanigans --- darwinHosts/prometheus/configuration.nix | 3 +++ home/home.nix | 9 ++++++--- modules/home.nix | 4 ++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 7df4225..d4752ba 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -14,6 +14,9 @@ backupFileExtension = "hmbak"; users.osbm = import ../../home/home.nix { inherit config pkgs; + username = "mac"; + homeDirectory = "/Users/mac"; + stateVersion = "24.11"; }; }; diff --git a/home/home.nix b/home/home.nix index 103f3dd..300ce30 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,7 @@ { + username, + homeDirectory, + stateVersion, config, pkgs, ... @@ -22,14 +25,14 @@ ./zoxide.nix ]; - home.username = "osbm"; - home.homeDirectory = "/home/osbm"; + home.username = username; + home.homeDirectory = homeDirectory; home.packages = [ pkgs.lazygit ]; - home.stateVersion = config.system.stateVersion; + home.stateVersion = stateVersion; enableGTK = config.myModules.enableKDE; enableFirefox = config.myModules.enableKDE; diff --git a/modules/home.nix b/modules/home.nix index 3450737..5fbf391 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -15,6 +15,10 @@ backupFileExtension = "hmbak"; users.osbm = import ../home/home.nix { inherit config pkgs; + # fuck you macos + username = "osbm"; + homeDirectory = "/home/osbm"; + inherit (config.system) stateVersion; }; }; } From 7812b3ea0795a6107335f8c60a48011f6a4f8ed3 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:36:36 +0300 Subject: [PATCH 1306/1768] mention inputs --- modules/nix-index.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-index.nix b/modules/nix-index.nix index f8d1a19..e402d2f 100644 --- a/modules/nix-index.nix +++ b/modules/nix-index.nix @@ -1,4 +1,4 @@ -{}: { +{inputs, ...}: { imports = [ inputs.nix-index-database.nixosModules.nix-index ]; From 88846226289c8e3b51731cde93ca020c3ce33cb8 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:36:41 +0300 Subject: [PATCH 1307/1768] fix the username --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index d4752ba..996fb7d 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -12,7 +12,7 @@ useUserPackages = true; verbose = true; backupFileExtension = "hmbak"; - users.osbm = import ../../home/home.nix { + users.mac = import ../../home/home.nix { inherit config pkgs; username = "mac"; homeDirectory = "/Users/mac"; From 3d41974731af07cf31c0465ad178a3dcdccd0a57 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:37:49 +0300 Subject: [PATCH 1308/1768] add fish --- darwinHosts/prometheus/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 996fb7d..d7f5b57 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -20,6 +20,8 @@ }; }; + programs.fish.enable = true; + # myModules.setUsers = false; users.users.mac = { description = "mac"; From d11ceedf31e49c942f7eaa30229ae7676b8a7061 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:43:44 +0300 Subject: [PATCH 1309/1768] gtk --- darwinHosts/prometheus/configuration.nix | 1 + home/home.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index d7f5b57..a0d3ffa 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -17,6 +17,7 @@ username = "mac"; homeDirectory = "/Users/mac"; stateVersion = "24.11"; + enableGTK = false; }; }; diff --git a/home/home.nix b/home/home.nix index 300ce30..2494a68 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,6 +3,7 @@ homeDirectory, stateVersion, config, + enableGTK ? config.myModules.enableKDE, pkgs, ... }: @@ -34,7 +35,7 @@ home.stateVersion = stateVersion; - enableGTK = config.myModules.enableKDE; + enableGTK = enableKDE; enableFirefox = config.myModules.enableKDE; enableAlacritty = config.myModules.enableKDE; enableGhostty = config.myModules.enableKDE; From 1851a3265aa3c4e33f98ff1dbe94eafbcf8b49a5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:44:32 +0300 Subject: [PATCH 1310/1768] fix --- home/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 2494a68..20b5d62 100644 --- a/home/home.nix +++ b/home/home.nix @@ -35,7 +35,7 @@ home.stateVersion = stateVersion; - enableGTK = enableKDE; + enableGTK = enableGTK; enableFirefox = config.myModules.enableKDE; enableAlacritty = config.myModules.enableKDE; enableGhostty = config.myModules.enableKDE; From 0a2c94924d6916a9de05f8e787cd7b0719003a7e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:48:39 +0300 Subject: [PATCH 1311/1768] fuck --- darwinHosts/prometheus/configuration.nix | 66 +++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index a0d3ffa..4d0b0b7 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -2,7 +2,6 @@ imports = [ # ../../modules ../../modules/common-packages.nix - ../../modules/nix-settings.nix inputs.home-manager.darwinModules.home-manager ./dummy-module.nix ]; @@ -20,6 +19,71 @@ enableGTK = false; }; }; + # Allow unfree packages + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "vscode" # TODO: remove this + "discord" + "obsidian" + "steam" + "steam-unwrapped" + "open-webui" + "vscode-extension-github-copilot" + "spotify" + "cursor" + # nvidia related (i have to) + "nvidia-x11" + "cuda_cudart" + "libcublas" + "cuda_cccl" + "cuda_nvcc" + "nvidia-settings" + "cuda-merged" + ]; + nixpkgs.config.allowAliases = false; + + # enable nix flakes + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + + # nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; + + nix.channel.enable = false; + + nix.registry = { + self.flake = inputs.self; + nixpkgs.flake = inputs.nixpkgs; + osbm-nvim.flake = inputs.osbm-nvim; + my-nixpkgs.to = { + owner = "osbm"; + repo = "nixpkgs"; + type = "github"; + }; + osbm-dev.to = { + owner = "osbm"; + repo = "osbm.dev"; + type = "github"; + }; + devshells.to = { + owner = "osbm"; + repo = "devshells"; + type = "github"; + }; + }; + + nix.settings.trusted-users = [ + "root" + "osbm" + "mac" # TODO change mac user to osbm + ]; + + + # nix.nixPath = ["nixpkgs=${pkgs.path}"]; + + system.configurationRevision = inputs.self.rev or "dirty"; programs.fish.enable = true; From 5c7171540df1649183c98158d71811f07d6600e1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:51:42 +0300 Subject: [PATCH 1312/1768] gtk config --- home/gtk.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/gtk.nix b/home/gtk.nix index 5e171fa..d0bebe1 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -10,14 +10,14 @@ enableGTK = lib.mkEnableOption "enableGTK"; }; - config = { + config = lib.mkIf config.enableGTK { home.pointerCursor = { name = "Dracula"; package = pkgs.dracula-theme; - gtk.enable = config.enableGTK; + gtk.enable = true; }; gtk = { - enable = config.enableGTK; + enable = true; theme = { name = "Dracula"; package = pkgs.dracula-theme; From 9be9b3f69b9d2da460536ad2dc88bfe999274029 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 14:58:12 +0300 Subject: [PATCH 1313/1768] not available on darwin --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 12114f3..0d6e453 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -24,7 +24,7 @@ '') btop pciutils - lm_sensors + # lm_sensors cloc neofetch pfetch From 66e52b0d01ea59d54b08fd927569d409509da76f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 15:03:15 +0300 Subject: [PATCH 1314/1768] nothing fucking works --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 0d6e453..c74eb5c 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -47,7 +47,7 @@ bat fd dust - dysk + # dysk gnupg attic-client ]; From 91b4862c59a3bf3bf7e30b2e85f22b4d7a6882f1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 15:06:55 +0300 Subject: [PATCH 1315/1768] no ghostty --- darwinHosts/prometheus/configuration.nix | 3 ++- home/home.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 4d0b0b7..65690cd 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -17,6 +17,7 @@ homeDirectory = "/Users/mac"; stateVersion = "24.11"; enableGTK = false; + enableGhostty = false; }; }; # Allow unfree packages @@ -95,7 +96,7 @@ }; environment.systemPackages = with pkgs; [ alacritty - ghostty + # ghostty kitty vscode blender diff --git a/home/home.nix b/home/home.nix index 20b5d62..c433f51 100644 --- a/home/home.nix +++ b/home/home.nix @@ -4,6 +4,7 @@ stateVersion, config, enableGTK ? config.myModules.enableKDE, + enableGhostty ? config.myModules.enableKDE, pkgs, ... }: @@ -38,6 +39,6 @@ enableGTK = enableGTK; enableFirefox = config.myModules.enableKDE; enableAlacritty = config.myModules.enableKDE; - enableGhostty = config.myModules.enableKDE; + enableGhostty = enableGhostty; enableWezterm = config.myModules.enableKDE; } From 5cd87bd6dde49ebe61489234f9cfbeee33e85308 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 15:07:42 +0300 Subject: [PATCH 1316/1768] really? --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 65690cd..3e0ed95 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -99,7 +99,7 @@ # ghostty kitty vscode - blender + # blender libreoffice code-cursor ungoogled-chromium From 3af826016787b275cee2173fa354a1111a77b944 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 15:08:32 +0300 Subject: [PATCH 1317/1768] nothing is working --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 3e0ed95..5e7643a 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -100,7 +100,7 @@ kitty vscode # blender - libreoffice + # libreoffice code-cursor ungoogled-chromium ]; From 02ad52f6c29811dda5168a64c226a486ec0b9440 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 9 Sep 2025 15:09:29 +0300 Subject: [PATCH 1318/1768] ugh --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 5e7643a..dbe4c05 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -102,7 +102,7 @@ # blender # libreoffice code-cursor - ungoogled-chromium + # ungoogled-chromium ]; system.stateVersion = 6; nixpkgs.hostPlatform = "x86_64-darwin"; From 50b38ef33c9085144625af88856b3a2de5afd97b Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 13 Sep 2025 14:36:52 +0300 Subject: [PATCH 1319/1768] no minegrub --- hosts/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index eb412f2..91adf50 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -21,7 +21,7 @@ enableSound = true; enableADB = true; enableOllama = true; - enableMinegrubTheme = true; + # enableMinegrubTheme = true; enableNextcloud = true; }; From d392e22b7f5931c13ae817430132e2bcd8501755 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 13 Sep 2025 14:48:51 +0300 Subject: [PATCH 1320/1768] why did i do this --- hosts/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix index 91adf50..5fea0d7 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/ymir/configuration.nix @@ -22,7 +22,6 @@ enableADB = true; enableOllama = true; # enableMinegrubTheme = true; - enableNextcloud = true; }; # Bootloader. From 7e276e489be7a228e0209f6cca555eeeaeecdf96 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 13 Sep 2025 14:50:04 +0300 Subject: [PATCH 1321/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index fbc5397..b3b4af7 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1757385184, - "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", + "lastModified": 1757698511, + "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", + "rev": "a3fcc92180c7462082cd849498369591dfb20855", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1757130842, - "narHash": "sha256-4i7KKuXesSZGUv0cLPLfxbmF1S72Gf/3aSypgvVkwuA=", + "lastModified": 1757430124, + "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "15f067638e2887c58c4b6ba1bdb65a0b61dc58c5", + "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { From 4756c73e197fd04ceb39571b94e8f38bdafe9d52 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 14 Sep 2025 22:35:43 +0300 Subject: [PATCH 1322/1768] add prometheus --- home/ssh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/ssh.nix b/home/ssh.nix index b793406..0a52123 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -41,6 +41,8 @@ in harmonica-ts = sshBlock "harmonica.curl-boga.ts.net"; wallfacer = sshBlock "192.168.0.5"; wallfacer-ts = sshBlock "wallfacer.curl-boga.ts.net"; + prometheus = sshBlock "192.168.0.12"; + prometheus-ts = sshBlock "prometheus.curl-boga.ts.net"; }; }; } From 107b2cfe4b8974d7dcca3871e4dc1d02970cf02d Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 12:58:31 +0300 Subject: [PATCH 1323/1768] add nixpkgs path correctly --- modules/nix-settings.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index f993436..1e691d2 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -1,6 +1,7 @@ { inputs, lib, + pkgs, ... }: { @@ -40,7 +41,7 @@ nix.registry = { self.flake = inputs.self; - nixpkgs.flake = inputs.nixpkgs; + nixpkgs.to.path = pkgs.path; osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs.to = { owner = "osbm"; From e137e787b59ce472843c2328dfe71bc14b8dd7c0 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 12:59:09 +0300 Subject: [PATCH 1324/1768] updated the username --- darwinHosts/prometheus/configuration.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index dbe4c05..12d4a2d 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -11,10 +11,10 @@ useUserPackages = true; verbose = true; backupFileExtension = "hmbak"; - users.mac = import ../../home/home.nix { + users.osbm = import ../../home/home.nix { inherit config pkgs; - username = "mac"; - homeDirectory = "/Users/mac"; + username = "osbm"; + homeDirectory = "/Users/osbm"; stateVersion = "24.11"; enableGTK = false; enableGhostty = false; @@ -89,10 +89,10 @@ programs.fish.enable = true; # myModules.setUsers = false; - users.users.mac = { - description = "mac"; + users.users.osbm = { + description = "osbm"; shell = pkgs.fish; - home = "/Users/mac"; + home = "/Users/osbm"; }; environment.systemPackages = with pkgs; [ alacritty From 930ae6b5b003c99708d48365f37e428d50ebd5a7 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 12:59:24 +0300 Subject: [PATCH 1325/1768] no mac username --- modules/nix-settings.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 1e691d2..150d7ab 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -63,7 +63,6 @@ nix.settings.trusted-users = [ "root" "osbm" - "mac" # TODO change mac user to osbm ]; nix.gc = { From 98f4d6d162fa816f7f3a0328bf3305e1e1c18195 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 13:02:22 +0300 Subject: [PATCH 1326/1768] update atticd --- modules/services/attic.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index d1b3ffb..2e88cbf 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -18,14 +18,12 @@ enable = true; environmentFile = "/persist/attic.env"; settings = { - listen = "[::]:5000"; - allowed-hosts = [ - "cache.osbm.dev" - "wallfacer.curl-boga.ts.net" - "localhost" - "wallfacer" - ]; - jwt = { }; + listen = "[::]:7080"; + compression = { + type = "zstd"; + level = 9; + }; + # jwt = { }; # storage = { # type = "local"; # # path = "/data/atreus/attic"; From fe652c74a9d0b12355d901983a532b4800a5ed08 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 13:03:01 +0300 Subject: [PATCH 1327/1768] use relative path --- home/ssh.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/ssh.nix b/home/ssh.nix index 0a52123..c693e62 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -4,7 +4,7 @@ let sshBlock = hostname: { hostname = hostname; user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; + identityFile = "~/.ssh/id_ed25519"; extraOptions = { # [ERROR] - (starship::print): Under a 'dumb' terminal (TERM=dumb). "RemoteCommand" = "fish"; @@ -17,7 +17,7 @@ let sshBlockAtreus = hostname: { hostname = hostname; user = "osbm"; - identityFile = "/home/osbm/.ssh/id_ed25519"; + identityFile = "~/.ssh/id_ed25519"; port = 8022; hashKnownHosts = true; compression = true; From 77a72d002732a347c34e68b4825257e145ea1fd7 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 13:05:10 +0300 Subject: [PATCH 1328/1768] update prometheus --- darwinHosts/prometheus/configuration.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 12d4a2d..9be1467 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -2,6 +2,7 @@ imports = [ # ../../modules ../../modules/common-packages.nix + # inputs.home-manager-darwin.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager ./dummy-module.nix ]; @@ -20,6 +21,13 @@ enableGhostty = false; }; }; + nix.registry = { + nixpkgs.to.path = lib.mkForce inputs.nixpkgs; + }; + services.tailscale = { + enable = true; + }; + # Allow unfree packages nixpkgs.config.allowUnfreePredicate = pkg: @@ -98,7 +106,7 @@ alacritty # ghostty kitty - vscode + vscode git lazygit # blender # libreoffice code-cursor From f8d835fddc75393f21680674043297a937fc9d1f Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 13:05:40 +0300 Subject: [PATCH 1329/1768] what if --- flake.nix | 16 ++++++++++++++++ modules/common-packages.nix | 15 ++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 22e7d2d..d0a1cd7 100644 --- a/flake.nix +++ b/flake.nix @@ -19,21 +19,37 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + # home-manager-darwin = { + # url = "github:nix-community/home-manager/release-25.05"; + # inputs.nixpkgs.follows = "nixpkgs-darwin"; + # }; minegrub-theme = { url = "github:Lxtharia/minegrub-theme"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-25.05-darwin"; nix-darwin = { + # url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; url = "github:nix-darwin/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs-darwin"; }; + # nixvim-darwin = { + # url = "github:nix-community/nixvim/nixos-25.05"; + # inputs.nixpkgs.follows = "nixpkgs-darwin"; + # }; nix-on-droid = { url = "github:nix-community/nix-on-droid"; inputs.nixpkgs.follows = "nixpkgs"; }; osbm-nvim.url = "github:osbm/osbm-nvim"; + # osbm-nvim-darwin = { + # url = "github:osbm/osbm-nvim"; + # inputs.nixpkgs.follows = "nixpkgs-darwin"; + # inputs.nixvim.follows = "nixvim-darwin"; + # }; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index c74eb5c..76780fe 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -3,11 +3,24 @@ inputs, ... }: +let + + # if the system is darwin use osbm-nvim-darwin otherwise use osbm-nvim + osbm-nvim = if + pkgs.stdenv.hostPlatform.isDarwin + then + # inputs.osbm-nvim-darwin.packages."${pkgs.stdenv.hostPlatform.system}".default + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default + else + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default; + + in { environment.systemPackages = with pkgs; [ - inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default + osbm-nvim wget git + lazygit git-lfs gnumake zip From 11bc022d97b4371bbaddf922957d0d9707871071 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Sep 2025 13:21:23 +0300 Subject: [PATCH 1330/1768] update attic port --- modules/services/attic.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/services/attic.nix b/modules/services/attic.nix index 2e88cbf..770b0eb 100644 --- a/modules/services/attic.nix +++ b/modules/services/attic.nix @@ -3,6 +3,9 @@ lib, ... }: +let + atticPort = 7080; +in { options = { myModules.enableAttic = lib.mkOption { @@ -18,7 +21,7 @@ enable = true; environmentFile = "/persist/attic.env"; settings = { - listen = "[::]:7080"; + listen = "[::]:${toString atticPort}"; compression = { type = "zstd"; level = 9; @@ -31,14 +34,14 @@ # }; }; }; - networking.firewall.allowedTCPPorts = [ 5000 ]; + networking.firewall.allowedTCPPorts = [ atticPort ]; services.cloudflared.tunnels = { "fa301a21-b259-4149-b3d0-b1438c7c81f8" = { default = "http_status:404"; credentialsFile = "/home/osbm/.cloudflared/fa301a21-b259-4149-b3d0-b1438c7c81f8.json"; ingress = { "cache.osbm.dev" = { - service = "http://localhost:5000"; + service = "http://localhost:${toString atticPort}"; }; }; }; From f346fefe02ce72b2dc3398c6745ba9f10f473f93 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:01:39 +0300 Subject: [PATCH 1331/1768] add nix --- modules/nix-settings.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 150d7ab..914f25b 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -65,6 +65,18 @@ "osbm" ]; + nix = { + substituters = [ + "https://nix-community.cachix.org" # nix-community cache + "http://wallfacer.curl-boga.ts.net:7080/main" # personal attic cache + ]; + + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" + ]; + } + nix.gc = { automatic = true; dates = "01:37"; From aae4bf7da7e2a0d42a77979d7f774ed290c6baef Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:16:10 +0300 Subject: [PATCH 1332/1768] add ollama --- darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 9be1467..e32e6bc 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -109,8 +109,8 @@ vscode git lazygit # blender # libreoffice - code-cursor # ungoogled-chromium + code-cursor ollama ]; system.stateVersion = 6; nixpkgs.hostPlatform = "x86_64-darwin"; From bd6a1fa46de6f63b1dfffb203ac4a78dbc68928d Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:21:00 +0300 Subject: [PATCH 1333/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b3b4af7..a7f18f0 100644 --- a/flake.lock +++ b/flake.lock @@ -383,11 +383,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { From 7197a864ccfcbd63e2f962b46b072a80b5cd26af Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:21:21 +0300 Subject: [PATCH 1334/1768] new just recipe --- justfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index ce6c452..f7e9f68 100644 --- a/justfile +++ b/justfile @@ -14,11 +14,15 @@ build *args: check-git switch *args: check-git remove-hm-backup-files #!/usr/bin/env sh if [[ "$(hostname)" == "localhost" ]]; then - nix-on-droid switch --flake . + nix-on-droid switch --flake . {{args}} else - nh os switch . + nh os switch . {{args}} fi +[macos] +switch *args: check-git + nh darwin switch . -- --accept-flake-config {{args}} + remove-hm-backup-files: #!/usr/bin/env sh From 49931bb6e594bac820dabe4cff7d4574de7089cf Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:24:55 +0300 Subject: [PATCH 1335/1768] hope i can compile this pos sometime --- modules/common-packages.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 76780fe..73ff1fc 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -3,21 +3,13 @@ inputs, ... }: -let - - # if the system is darwin use osbm-nvim-darwin otherwise use osbm-nvim - osbm-nvim = if - pkgs.stdenv.hostPlatform.isDarwin - then - # inputs.osbm-nvim-darwin.packages."${pkgs.stdenv.hostPlatform.system}".default - inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default - else - inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default; - - in -{ - environment.systemPackages = with pkgs; [ - osbm-nvim + { + environment.systemPackages = with pkgs; [ + (if !pkgs.stdenv.hostPlatform.isDarwin + then + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default + else null + ) wget git lazygit From 3cd00b879107f2ebbe68b020463c2681fa79fa25 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:30:46 +0300 Subject: [PATCH 1336/1768] nano come save me --- modules/common-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 73ff1fc..ce297d6 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -8,7 +8,7 @@ (if !pkgs.stdenv.hostPlatform.isDarwin then inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default - else null + else nano ) wget git From b0317d7d4a2b427de693972928d98fc3e60285d3 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:41:38 +0300 Subject: [PATCH 1337/1768] try this --- home/tmux/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/tmux/default.nix b/home/tmux/default.nix index 93895a9..d4fcf08 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -10,7 +10,7 @@ baseIndex = 1; shortcut = "s"; mouse = true; - shell = lib.getExe pkgs.fish; + shell = "${lib.getExe pkgs.fish} -l"; plugins = with pkgs; [ tmuxPlugins.sensible tmuxPlugins.better-mouse-mode From afbaee8e3d9b238254ecd04c5d74cf6d9f5426f9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 10:59:10 +0300 Subject: [PATCH 1338/1768] my god --- home/tmux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/tmux/default.nix b/home/tmux/default.nix index d4fcf08..4b6262e 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -10,7 +10,7 @@ baseIndex = 1; shortcut = "s"; mouse = true; - shell = "${lib.getExe pkgs.fish} -l"; + shell = lib.getExe pkgs.fish; plugins = with pkgs; [ tmuxPlugins.sensible tmuxPlugins.better-mouse-mode @@ -32,6 +32,7 @@ set -g allow-passthrough on set -ga update-environment TERM set -ga update-environment TERM_PROGRAM + set-option -g default-command "${lib.getExe pkgs.fish} -l" ''; }; } From 66a890bab51aa410156db245f2e2906ae9e3c15f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 11:08:21 +0300 Subject: [PATCH 1339/1768] formatting --- darwinHosts/prometheus/configuration.nix | 17 ++++++--- darwinHosts/prometheus/dummy-module.nix | 4 +-- hosts/tartarus/configuration.nix | 1 - modules/common-packages.nix | 13 +++---- modules/nix-index.nix | 5 +-- modules/remote-builds.nix | 13 ++++--- modules/services/openssh.nix | 24 ++++++------- modules/services/wanikani-stats/default.nix | 38 ++++++++++++--------- modules/virtualisation.nix | 4 +-- 9 files changed, 68 insertions(+), 51 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index e32e6bc..49045c9 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -1,4 +1,11 @@ -{pkgs, inputs, lib, config, ...}: { +{ + pkgs, + inputs, + lib, + config, + ... +}: +{ imports = [ # ../../modules ../../modules/common-packages.nix @@ -89,7 +96,6 @@ "mac" # TODO change mac user to osbm ]; - # nix.nixPath = ["nixpkgs=${pkgs.path}"]; system.configurationRevision = inputs.self.rev or "dirty"; @@ -106,11 +112,14 @@ alacritty # ghostty kitty - vscode git lazygit + vscode + git + lazygit # blender # libreoffice # ungoogled-chromium - code-cursor ollama + code-cursor + ollama ]; system.stateVersion = 6; nixpkgs.hostPlatform = "x86_64-darwin"; diff --git a/darwinHosts/prometheus/dummy-module.nix b/darwinHosts/prometheus/dummy-module.nix index 7058a17..aebd406 100644 --- a/darwinHosts/prometheus/dummy-module.nix +++ b/darwinHosts/prometheus/dummy-module.nix @@ -1,4 +1,4 @@ -{lib, ...}: +{ lib, ... }: { options = { myModules.enableKDE = lib.mkOption { @@ -7,4 +7,4 @@ description = "Enable KDE Plasma"; }; }; -} \ No newline at end of file +} diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix index 78019b2..c3dad62 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/tartarus/configuration.nix @@ -19,7 +19,6 @@ enableSound = true; }; - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/common-packages.nix b/modules/common-packages.nix index ce297d6..3c69a78 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -3,12 +3,13 @@ inputs, ... }: - { - environment.systemPackages = with pkgs; [ - (if !pkgs.stdenv.hostPlatform.isDarwin - then - inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default - else nano +{ + environment.systemPackages = with pkgs; [ + ( + if !pkgs.stdenv.hostPlatform.isDarwin then + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default + else + nano ) wget git diff --git a/modules/nix-index.nix b/modules/nix-index.nix index e402d2f..4970c07 100644 --- a/modules/nix-index.nix +++ b/modules/nix-index.nix @@ -1,8 +1,9 @@ -{inputs, ...}: { +{ inputs, ... }: +{ imports = [ inputs.nix-index-database.nixosModules.nix-index ]; programs.nix-index-database.comma.enable = true; programs.command-not-found.enable = false; # TODO fix ts -} \ No newline at end of file +} diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix index 0f8917d..901d928 100644 --- a/modules/remote-builds.nix +++ b/modules/remote-builds.nix @@ -1,7 +1,7 @@ { - config, - outputs, - lib, + config, + outputs, + lib, ... }: { @@ -12,7 +12,10 @@ nix.buildMachines = [ { hostName = "ymir"; - systems = ["x86_64-linux" "aarch64-linux"]; + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; sshKey = config.age.secrets.ssh-key-private.path; sshUser = "osbm"; @@ -20,7 +23,7 @@ } { hostName = "wallfacer"; - systems = ["x86_64-linux"]; + systems = [ "x86_64-linux" ]; supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features; sshKey = config.age.secrets.ssh-key-private.path; sshUser = "osbm"; diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index 1f530f0..842db16 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -18,21 +18,21 @@ enable = true; startWhenNeeded = true; settings = { - PermitRootLogin = "no"; + PermitRootLogin = "no"; - # only allow key based logins and not password - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - AuthenticationMethods = "publickey"; - PubkeyAuthentication = "yes"; - ChallengeResponseAuthentication = "no"; - UsePAM = false; + # only allow key based logins and not password + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + AuthenticationMethods = "publickey"; + PubkeyAuthentication = "yes"; + ChallengeResponseAuthentication = "no"; + UsePAM = false; - # kick out inactive sessions - ClientAliveCountMax = 5; - ClientAliveInterval = 60; + # kick out inactive sessions + ClientAliveCountMax = 5; + ClientAliveInterval = 60; }; - }; + }; }) ]; diff --git a/modules/services/wanikani-stats/default.nix b/modules/services/wanikani-stats/default.nix index 1a6ba51..1c0e974 100644 --- a/modules/services/wanikani-stats/default.nix +++ b/modules/services/wanikani-stats/default.nix @@ -5,24 +5,28 @@ ... }: let - python = let - packageOverrides = self: super: { - imageio = super.imageio.overridePythonAttrs (old: { - disabledTests = [ - "test_read_stream" - "test_uri_reading" - "test_trim_filter" - "test_process_termination" - ]; - }); - plotly = super.plotly.overridePythonAttrs (old: { - disabledTestPaths = (old.disabledTestPaths or []) ++ [ - "tests/test_optional/test_kaleido/test_kaleido.py" - ]; - }); + python = + let + packageOverrides = self: super: { + imageio = super.imageio.overridePythonAttrs (old: { + disabledTests = [ + "test_read_stream" + "test_uri_reading" + "test_trim_filter" + "test_process_termination" + ]; + }); + plotly = super.plotly.overridePythonAttrs (old: { + disabledTestPaths = (old.disabledTestPaths or [ ]) ++ [ + "tests/test_optional/test_kaleido/test_kaleido.py" + ]; + }); + }; + in + pkgs.python313.override { + inherit packageOverrides; + self = python; }; - in - pkgs.python313.override { inherit packageOverrides; self = python; }; wanikani-stats-flask = pkgs.writeShellApplication { name = "wanikani-stats-flask"; runtimeInputs = [ diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix index 08a1eb7..a878015 100644 --- a/modules/virtualisation.nix +++ b/modules/virtualisation.nix @@ -1,3 +1,3 @@ { - virtualisation.docker.enable = true; -} \ No newline at end of file + virtualisation.docker.enable = true; +} From 8c91fce94260ef727458e57cbcbd2f854d4cfd84 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 16 Sep 2025 13:36:06 +0300 Subject: [PATCH 1340/1768] add nixConfig --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index d0a1cd7..fc06de6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,11 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" + "http://wallfacer.curl-boga.ts.net:7080/main" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" ]; }; From d770dc53653c5c0fb2da8461ab218766e912e5a5 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 10:09:53 +0300 Subject: [PATCH 1341/1768] fix syntax error --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 914f25b..92c01f9 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -75,7 +75,7 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" ]; - } + }; nix.gc = { automatic = true; From 291dba3854e1045c52f0b8d969f21c7291e54830 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 10:22:58 +0300 Subject: [PATCH 1342/1768] fix --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 92c01f9..7c7bf10 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -65,7 +65,7 @@ "osbm" ]; - nix = { + nix.settings = { substituters = [ "https://nix-community.cachix.org" # nix-community cache "http://wallfacer.curl-boga.ts.net:7080/main" # personal attic cache From 5eae31ff8ea0bcea6ffc2f3443fc6103d854d536 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 10:24:17 +0300 Subject: [PATCH 1343/1768] accept --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index f7e9f68..7820095 100644 --- a/justfile +++ b/justfile @@ -16,7 +16,7 @@ switch *args: check-git remove-hm-backup-files if [[ "$(hostname)" == "localhost" ]]; then nix-on-droid switch --flake . {{args}} else - nh os switch . {{args}} + nh os switch . -- --accept-flake-config {{args}} fi [macos] From 9fa9b6b8b10c4506c2fe333e8b9499aa7cf0a29b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 10:43:29 +0300 Subject: [PATCH 1344/1768] Revert "accept" This reverts commit 5eae31ff8ea0bcea6ffc2f3443fc6103d854d536. --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 7820095..f7e9f68 100644 --- a/justfile +++ b/justfile @@ -16,7 +16,7 @@ switch *args: check-git remove-hm-backup-files if [[ "$(hostname)" == "localhost" ]]; then nix-on-droid switch --flake . {{args}} else - nh os switch . -- --accept-flake-config {{args}} + nh os switch . {{args}} fi [macos] From ba87d72dd006cf1445177528978549bd9809295c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 11:19:55 +0300 Subject: [PATCH 1345/1768] was this the issue? --- flake.nix | 4 ++-- modules/nix-settings.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index fc06de6..15ac371 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,11 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "http://wallfacer.curl-boga.ts.net:7080/main" + # "http://wallfacer.curl-boga.ts.net:7080/main" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" + # "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" ]; }; diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 7c7bf10..c02a396 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -68,12 +68,12 @@ nix.settings = { substituters = [ "https://nix-community.cachix.org" # nix-community cache - "http://wallfacer.curl-boga.ts.net:7080/main" # personal attic cache + # "http://wallfacer.curl-boga.ts.net:7080/main" # personal attic cache ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" + # "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" ]; }; From 5dba867c4ff31472cbc7ed4e26d02a930f07a1de Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 14:43:46 +0300 Subject: [PATCH 1346/1768] this should fix --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index c02a396..c0d92ec 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -41,7 +41,7 @@ nix.registry = { self.flake = inputs.self; - nixpkgs.to.path = pkgs.path; + nixpkgs.to.flake = pkgs.path; osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs.to = { owner = "osbm"; From 246eb461a3fe8287d8973ef609e437f215e082d2 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 17 Sep 2025 14:47:32 +0300 Subject: [PATCH 1347/1768] i love these tools --- modules/common-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 3c69a78..6a539dc 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -14,6 +14,7 @@ wget git lazygit + lazysql git-lfs gnumake zip From d5dbfbff23bbf19aa1bc9de2dfd43ad441b307e7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Sep 2025 19:45:44 +0300 Subject: [PATCH 1348/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index a7f18f0..646e55c 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1757698511, - "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", + "lastModified": 1758375677, + "narHash": "sha256-BLtD+6qWz7fQjPk2wpwyXQLGI0E30Ikgf2ppn2nVadI=", "owner": "nix-community", "repo": "home-manager", - "rev": "a3fcc92180c7462082cd849498369591dfb20855", + "rev": "edc7468e12be92e926847cb02418e649b02b59dd", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1757430124, - "narHash": "sha256-MhDltfXesGH8VkGv3hmJ1QEKl1ChTIj9wmGAFfWj/Wk=", + "lastModified": 1758102940, + "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "830b3f0b50045cf0bcfd4dab65fad05bf882e196", + "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1757218147, - "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1758277210, + "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1757147921, - "narHash": "sha256-U3RAVmKNdah9ZQgxUrhsnPOONTXw4/E4hle1Rt99fKs=", + "lastModified": 1757945036, + "narHash": "sha256-TeiKVX2Itd7Hhd9Ccwocp/202vVtAjybRRaum4+tuLg=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "db9189edfc9007f339e766c176a741f598651e61", + "rev": "05af1a15f1046507459e6c36a2ac66d490887d6a", "type": "github" }, "original": { From 8fd83a60c42a036974306a4af8741baa535212e8 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 09:50:09 +0300 Subject: [PATCH 1349/1768] update flake.lock --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 646e55c..acdfd7e 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1758375677, - "narHash": "sha256-BLtD+6qWz7fQjPk2wpwyXQLGI0E30Ikgf2ppn2nVadI=", + "lastModified": 1758692005, + "narHash": "sha256-bNRMXWSLM4K9cF1YaHYjLol60KIAWW4GzAoJDp5tA0w=", "owner": "nix-community", "repo": "home-manager", - "rev": "edc7468e12be92e926847cb02418e649b02b59dd", + "rev": "6ce2e18007ff022db41d9cc042f8838e8c51ed66", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1758102940, - "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", + "lastModified": 1758447883, + "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", + "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1757822619, - "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", + "lastModified": 1758427679, + "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", + "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758277210, - "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -431,11 +431,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1758427187, + "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", "type": "github" }, "original": { @@ -447,11 +447,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755829505, - "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", + "lastModified": 1758446476, + "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1757145319, - "narHash": "sha256-F5islzaJ5zGXomXAGM7Kqi5skyGaNXOLD77atgmReZw=", + "lastModified": 1758665797, + "narHash": "sha256-RIN05AhWIFCXL2OOXGoFdF/k8Q6OBhi/WcRtsYuTF5Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "a04b93fa7bf4160a9dc60d0713fff44c0fff9af6", + "rev": "0c15f88f1fc01c8799c5ce2a432fadc47f20e307", "type": "github" }, "original": { @@ -579,11 +579,11 @@ ] }, "locked": { - "lastModified": 1755555503, - "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=", + "lastModified": 1758272005, + "narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=", "owner": "NuschtOS", "repo": "search", - "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea", + "rev": "aa975a3757f28ce862812466c5848787b868e116", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1757945036, - "narHash": "sha256-TeiKVX2Itd7Hhd9Ccwocp/202vVtAjybRRaum4+tuLg=", + "lastModified": 1758696474, + "narHash": "sha256-m1su+HZWP116FWQPl4pf1EqPYmHBaGNqdod0+IWtZGU=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "05af1a15f1046507459e6c36a2ac66d490887d6a", + "rev": "8efd247c60207bde38a29d6bebb60102aeb9ce17", "type": "github" }, "original": { From 49e871345c6b758644f981bbf9c61830b67179bd Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 10:34:15 +0300 Subject: [PATCH 1350/1768] add nvim --- modules/common-packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/common-packages.nix b/modules/common-packages.nix index 6a539dc..cc5599f 100644 --- a/modules/common-packages.nix +++ b/modules/common-packages.nix @@ -5,13 +5,9 @@ }: { environment.systemPackages = with pkgs; [ - ( - if !pkgs.stdenv.hostPlatform.isDarwin then - inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default - else - nano - ) + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default wget + nano git lazygit lazysql From f2a1a1b9f6a4cc7efd7f33c5b942d377b8f2df2d Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 11:11:39 +0300 Subject: [PATCH 1351/1768] fix registry --- modules/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index c0d92ec..17e51d2 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -41,7 +41,7 @@ nix.registry = { self.flake = inputs.self; - nixpkgs.to.flake = pkgs.path; + nixpkgs.flake = pkgs.path; osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs.to = { owner = "osbm"; From 715727116336758a464c5d757f1461ed55f359de Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 11:28:45 +0300 Subject: [PATCH 1352/1768] try --- modules/nix-settings.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 17e51d2..3c1d774 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -41,7 +41,19 @@ nix.registry = { self.flake = inputs.self; - nixpkgs.flake = pkgs.path; + + # Commented out because it doesnt match if i switch a system + # to another nixpkgs with a different flake input name + # nixpkgs.flake = inputs.nixpkgs; + + nixpkgs = { + from = { type = "indirect"; id = "nixpkgs"; }; + to = { + path = pkgs.path; + type = "path"; + }; + }; + osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs.to = { owner = "osbm"; From 9d5acd1b87453778a6dba126e47ff42f3c59a317 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 11:48:01 +0300 Subject: [PATCH 1353/1768] fuck it --- modules/nix-settings.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 3c1d774..f297ed5 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -44,15 +44,15 @@ # Commented out because it doesnt match if i switch a system # to another nixpkgs with a different flake input name - # nixpkgs.flake = inputs.nixpkgs; + nixpkgs.flake = inputs.nixpkgs; - nixpkgs = { - from = { type = "indirect"; id = "nixpkgs"; }; - to = { - path = pkgs.path; - type = "path"; - }; - }; + # nixpkgs = { + # from = { type = "indirect"; id = "nixpkgs"; }; + # to = { + # path = pkgs.path; + # type = "path"; + # }; + # }; osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs.to = { From f2fb81a286c7653ebb155f6ff73ca6f092866a49 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Sep 2025 11:49:15 +0300 Subject: [PATCH 1354/1768] enable --- modules/nix-settings.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index f297ed5..2df7ba8 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -41,11 +41,10 @@ nix.registry = { self.flake = inputs.self; - - # Commented out because it doesnt match if i switch a system - # to another nixpkgs with a different flake input name nixpkgs.flake = inputs.nixpkgs; - + + # Commented out because i want to make sure it works if i switch a system + # to another nixpkgs with a different flake input name # nixpkgs = { # from = { type = "indirect"; id = "nixpkgs"; }; # to = { From 80cc1969f6b9b6f2abfee9e8ce7e145d204c26ef Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 25 Sep 2025 11:12:43 +0300 Subject: [PATCH 1355/1768] fix ts --- modules/nix-settings.nix | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 2df7ba8..311f04c 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -54,21 +54,29 @@ # }; osbm-nvim.flake = inputs.osbm-nvim; - my-nixpkgs.to = { - owner = "osbm"; - repo = "nixpkgs"; - type = "github"; + my-nixpkgs = { + from = { type = "indirect"; id = "my-nixpkgs"; }; + to = { + owner = "osbm"; + repo = "nixpkgs"; + type = "github"; + }; }; - osbm-dev.to = { - owner = "osbm"; - repo = "osbm.dev"; - type = "github"; - }; - devshells.to = { - owner = "osbm"; - repo = "devshells"; - type = "github"; + osbm-dev = { + from = { type = "indirect"; id = "osbm-dev"; }; + to = { + owner = "osbm"; + repo = "osbm.dev"; + type = "github"; + }; }; + devshells = { + from = { type = "indirect"; id = "devshells"; }; + to = { + owner = "osbm"; + repo = "devshells"; + type = "github"; + }; }; nix.settings.trusted-users = [ From b703bd4fe70d4bced292fc75fd6a7575996946ab Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 25 Sep 2025 11:22:16 +0300 Subject: [PATCH 1356/1768] my entire config is in shambles --- darwinHosts/prometheus/configuration.nix | 45 +++++++++++++++++------- modules/nix-settings.nix | 1 + 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 49045c9..3c3539b 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -69,24 +69,45 @@ nix.channel.enable = false; + nix.registry = { self.flake = inputs.self; nixpkgs.flake = inputs.nixpkgs; + + # Commented out because i want to make sure it works if i switch a system + # to another nixpkgs with a different flake input name + # nixpkgs = { + # from = { type = "indirect"; id = "nixpkgs"; }; + # to = { + # path = pkgs.path; + # type = "path"; + # }; + # }; + osbm-nvim.flake = inputs.osbm-nvim; - my-nixpkgs.to = { - owner = "osbm"; - repo = "nixpkgs"; - type = "github"; + my-nixpkgs = { + from = { type = "indirect"; id = "my-nixpkgs"; }; + to = { + owner = "osbm"; + repo = "nixpkgs"; + type = "github"; + }; }; - osbm-dev.to = { - owner = "osbm"; - repo = "osbm.dev"; - type = "github"; + osbm-dev = { + from = { type = "indirect"; id = "osbm-dev"; }; + to = { + owner = "osbm"; + repo = "osbm.dev"; + type = "github"; + }; }; - devshells.to = { - owner = "osbm"; - repo = "devshells"; - type = "github"; + devshells = { + from = { type = "indirect"; id = "devshells"; }; + to = { + owner = "osbm"; + repo = "devshells"; + type = "github"; + }; }; }; diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix index 311f04c..c848ff0 100644 --- a/modules/nix-settings.nix +++ b/modules/nix-settings.nix @@ -77,6 +77,7 @@ repo = "devshells"; type = "github"; }; + }; }; nix.settings.trusted-users = [ From c7fb4080d030335f84cff04c2b1442d5aaf43e43 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 25 Sep 2025 20:56:35 +0300 Subject: [PATCH 1357/1768] will this fix awful ui --- modules/fonts.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/fonts.nix b/modules/fonts.nix index 07b27b2..54c8d20 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -40,6 +40,8 @@ iosevka dejavu_fonts ]; + # to fix firefox + fonts.fontconfig.useEmbeddedBitmaps = true; # fonts.fontconfig = { # defaultFonts.emoji = ["Noto Color Emoji"]; # }; From 8305867683b938aa783165f789b43b5d7c4606e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 5 Oct 2025 13:02:05 +0300 Subject: [PATCH 1358/1768] update flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index acdfd7e..ed8e627 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1758692005, - "narHash": "sha256-bNRMXWSLM4K9cF1YaHYjLol60KIAWW4GzAoJDp5tA0w=", + "lastModified": 1759573136, + "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ce2e18007ff022db41d9cc042f8838e8c51ed66", + "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1758447883, - "narHash": "sha256-yGA6MV0E4JSEXqLTb4ZZkmdJZcoQ8HUzihRRX12Bvpg=", + "lastModified": 1758805352, + "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "25381509d5c91bbf3c30e23abc6d8476d2143cd1", + "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1758427679, - "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", + "lastModified": 1759637156, + "narHash": "sha256-8NI1SqntLfKl6Q0Luemc3aIboezSJElofUrqipF5g78=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", + "rev": "0ca69684091aa3a6b1fe994c4afeff305b15e915", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { From a4fad917e8bd812cf4866d6b4247573f9fca30bc Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 6 Oct 2025 20:37:17 +0300 Subject: [PATCH 1359/1768] clean --- flake.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/flake.nix b/flake.nix index 15ac371..8f0f062 100644 --- a/flake.nix +++ b/flake.nix @@ -21,37 +21,21 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - # home-manager-darwin = { - # url = "github:nix-community/home-manager/release-25.05"; - # inputs.nixpkgs.follows = "nixpkgs-darwin"; - # }; minegrub-theme = { url = "github:Lxtharia/minegrub-theme"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-25.05-darwin"; nix-darwin = { - # url = "github:nix-darwin/nix-darwin/nix-darwin-25.05"; url = "github:nix-darwin/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; - # inputs.nixpkgs.follows = "nixpkgs-darwin"; }; - # nixvim-darwin = { - # url = "github:nix-community/nixvim/nixos-25.05"; - # inputs.nixpkgs.follows = "nixpkgs-darwin"; - # }; nix-on-droid = { url = "github:nix-community/nix-on-droid"; inputs.nixpkgs.follows = "nixpkgs"; }; osbm-nvim.url = "github:osbm/osbm-nvim"; - # osbm-nvim-darwin = { - # url = "github:osbm/osbm-nvim"; - # inputs.nixpkgs.follows = "nixpkgs-darwin"; - # inputs.nixvim.follows = "nixvim-darwin"; - # }; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; From b6cbc17a3f7e47fa2a28b31789204570cee4c644 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 6 Oct 2025 20:37:27 +0300 Subject: [PATCH 1360/1768] clean --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 8f0f062..1f45589 100644 --- a/flake.nix +++ b/flake.nix @@ -43,8 +43,10 @@ url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-index-database.url = "github:nix-community/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + nix-index-database = { + url = "github:nix-community/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = From a0aed7402071ea1218a7086d30294c23398f2a59 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 6 Oct 2025 20:37:39 +0300 Subject: [PATCH 1361/1768] add disko --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/flake.lock b/flake.lock index ed8e627..aad4f4c 100644 --- a/flake.lock +++ b/flake.lock @@ -69,6 +69,26 @@ "type": "github" } }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "owner": "nix-community", + "repo": "disko", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -643,6 +663,7 @@ "inputs": { "agenix": "agenix", "deploy-rs": "deploy-rs", + "disko": "disko", "home-manager": "home-manager", "minegrub-theme": "minegrub-theme", "nix-darwin": "nix-darwin", diff --git a/flake.nix b/flake.nix index 1f45589..f6eb2b1 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,10 @@ url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = From f3707e6f99e759269ee8a23e5d1d37b73ad45314 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 8 Oct 2025 09:30:02 +0300 Subject: [PATCH 1362/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index aad4f4c..b1657be 100644 --- a/flake.lock +++ b/flake.lock @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1759573136, - "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", + "lastModified": 1759853171, + "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", + "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", "type": "github" }, "original": { @@ -403,11 +403,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1759733170, + "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "8913c168d1c56dc49a7718685968f38752171c3b", "type": "github" }, "original": { From beb67f3b2929e6edb598eb9bc7b27ea20731c898 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 9 Oct 2025 13:50:44 +0300 Subject: [PATCH 1363/1768] add apollo --- hosts/apollo/configuration.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 hosts/apollo/configuration.nix diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix new file mode 100644 index 0000000..3465bb9 --- /dev/null +++ b/hosts/apollo/configuration.nix @@ -0,0 +1,22 @@ +{ + lib, + inputs, + ... +}: +{ + imports = [ + ./hardware-configuration.nix + ../../modules + ]; + + myModules = { + enableKDE = false; + enableFonts = false; + blockYoutube = false; + blockTwitter = false; + }; + + i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method + system.stateVersion = "25.05"; + networking.hostName = "apollo"; +} From 12ba1f1f752087a48de4926b27f312c1f730e835 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Oct 2025 14:07:00 +0300 Subject: [PATCH 1364/1768] how about this --- darwinHosts/prometheus/configuration.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 3c3539b..7130349 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -72,7 +72,14 @@ nix.registry = { self.flake = inputs.self; - nixpkgs.flake = inputs.nixpkgs; + # nixpkgs.flake = inputs.nixpkgs; + nixpkgs = { + from = { type = "indirect"; id = "nixpkgs"; }; + to = { + path = inputs.nixpkgs.outPath; + type = "path"; + }; + }; # Commented out because i want to make sure it works if i switch a system # to another nixpkgs with a different flake input name From eb4407ae57fdec5e046a818e4d230f3031cd32b8 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Oct 2025 14:24:55 +0300 Subject: [PATCH 1365/1768] i am a stupid fuck --- darwinHosts/prometheus/configuration.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 7130349..6722618 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -28,9 +28,7 @@ enableGhostty = false; }; }; - nix.registry = { - nixpkgs.to.path = lib.mkForce inputs.nixpkgs; - }; + services.tailscale = { enable = true; }; From 1f30fc968be820bcd1425aedf8614b1166d9dad1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 14 Oct 2025 14:25:11 +0300 Subject: [PATCH 1366/1768] lets see ts --- darwinHosts/prometheus/configuration.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/darwinHosts/prometheus/configuration.nix b/darwinHosts/prometheus/configuration.nix index 6722618..3261001 100644 --- a/darwinHosts/prometheus/configuration.nix +++ b/darwinHosts/prometheus/configuration.nix @@ -28,7 +28,7 @@ enableGhostty = false; }; }; - + services.tailscale = { enable = true; }; @@ -70,14 +70,14 @@ nix.registry = { self.flake = inputs.self; - # nixpkgs.flake = inputs.nixpkgs; - nixpkgs = { - from = { type = "indirect"; id = "nixpkgs"; }; - to = { - path = inputs.nixpkgs.outPath; - type = "path"; - }; - }; + nixpkgs.flake = inputs.nixpkgs; + # nixpkgs = { + # from = { type = "indirect"; id = "nixpkgs"; }; + # to = { + # path = inputs.nixpkgs.outPath; + # type = "path"; + # }; + # }; # Commented out because i want to make sure it works if i switch a system # to another nixpkgs with a different flake input name From 7a13d344d9572d34d2493c61cca097dc40080543 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Oct 2025 15:54:54 +0300 Subject: [PATCH 1367/1768] update flake lock --- flake.lock | 67 +++++++++++++++++++++++++----------------------------- flake.nix | 7 +++--- 2 files changed, 34 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index b1657be..68b1521 100644 --- a/flake.lock +++ b/flake.lock @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1759853171, - "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=", + "lastModified": 1760500983, + "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d", + "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", "type": "github" }, "original": { @@ -186,6 +186,21 @@ "type": "github" } }, + "impermanence": { + "locked": { + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "owner": "nix-community", + "repo": "impermanence", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "impermanence", + "type": "github" + } + }, "ixx": { "inputs": { "flake-utils": [ @@ -250,26 +265,6 @@ "type": "github" } }, - "minegrub-theme": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752413064, - "narHash": "sha256-bcWxBAAvf5hp0TmMbYrwU4SlBxc5sB/T2VsIBdX1gDk=", - "owner": "Lxtharia", - "repo": "minegrub-theme", - "rev": "040b163268be6e7cf743ba990177525dc47ed944", - "type": "github" - }, - "original": { - "owner": "Lxtharia", - "repo": "minegrub-theme", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -277,11 +272,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1760338583, + "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf", "type": "github" }, "original": { @@ -347,11 +342,11 @@ ] }, "locked": { - "lastModified": 1759637156, - "narHash": "sha256-8NI1SqntLfKl6Q0Luemc3aIboezSJElofUrqipF5g78=", + "lastModified": 1760241904, + "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "0ca69684091aa3a6b1fe994c4afeff305b15e915", + "rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", "type": "github" }, "original": { @@ -387,11 +382,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -403,11 +398,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "lastModified": 1760524057, + "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "type": "github" }, "original": { @@ -665,7 +660,7 @@ "deploy-rs": "deploy-rs", "disko": "disko", "home-manager": "home-manager", - "minegrub-theme": "minegrub-theme", + "impermanence": "impermanence", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", diff --git a/flake.nix b/flake.nix index f6eb2b1..a639fc2 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - minegrub-theme = { - url = "github:Lxtharia/minegrub-theme"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nix-darwin = { @@ -51,6 +47,9 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; + impermanence = { + url = "github:nix-community/impermanence"; + }; }; outputs = From 89ebb0eb01b017068855e5bc474b4576ce42922d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Oct 2025 15:55:10 +0300 Subject: [PATCH 1368/1768] fuck off --- hosts/tartarus/hardware-configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/tartarus/hardware-configuration.nix b/hosts/tartarus/hardware-configuration.nix index 9d9879a..25d54ac 100644 --- a/hosts/tartarus/hardware-configuration.nix +++ b/hosts/tartarus/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, From ac0fd85d8dcb746577a815b2d8bd3583420cc856 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Oct 2025 16:42:37 +0300 Subject: [PATCH 1369/1768] fuckass ssh error --- home/ssh.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home/ssh.nix b/home/ssh.nix index c693e62..12a937d 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -27,7 +27,8 @@ in { programs.ssh = { enable = true; - + enableDefaultConfig = false; + matchBlocks = { ymir = sshBlock "192.168.0.2"; ymir-ts = sshBlock "ymir.curl-boga.ts.net"; From 9d132640fcb6164d79dc4777314547d5c8532859 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 16 Oct 2025 16:42:46 +0300 Subject: [PATCH 1370/1768] apollo is coming --- hosts/apollo/configuration.nix | 98 +++++++++++++++++++++- hosts/apollo/hardware-configuration.nix | 105 ++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 hosts/apollo/hardware-configuration.nix diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix index 3465bb9..2f6118a 100644 --- a/hosts/apollo/configuration.nix +++ b/hosts/apollo/configuration.nix @@ -7,6 +7,8 @@ imports = [ ./hardware-configuration.nix ../../modules + inputs.disko.nixosModules.disko + inputs.impermanence.nixosModules.impermanence ]; myModules = { @@ -17,6 +19,100 @@ }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; networking.hostName = "apollo"; + + # Enable zram swap + zramSwap.enable = true; + + # Persistence configuration + environment.persistence."/persist" = { + hideMounts = true; + files = [ + "/etc/machine-id" + ]; + directories = [ + "/var/log" + "/var/lib/tailscale" + "/var/lib/borg" + "/var/lib/nixos" + ]; + }; + + # Remote ZFS unlocking in initrd + boot = { + # Static IP in initrd - adjust these values for your network + # kernelParams = [ "ip=::::::none" ]; + + initrd = { + # Network driver for initrd - change to match your hardware + # Common options: "virtio_pci" (VMs), "e1000e", "igb", "r8169" + availableKernelModules = [ "virtio_pci" ]; + + network = { + enable = true; + ssh = { + enable = true; + port = 2222; + # Generate with: ssh-keygen -t ed25519 -N "" -f /persist/etc/ssh/ssh_host_ed25519_key_initrd + hostKeys = [ "/persist/etc/ssh/ssh_host_ed25519_key_initrd" ]; + # Add your SSH public key here + authorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" + ]; + }; + # Auto-prompt for ZFS password on SSH login + postCommands = '' + cat < /root/.profile + if pgrep -x "zfs" > /dev/null + then + zfs load-key -a + killall zfs + else + echo "zfs not running -- maybe the pool is taking some time to load for some unforseen reason." + fi + EOF + ''; + }; + }; + }; + + # SSH host keys on persistent storage + services.openssh = { + enable = true; + openFirewall = true; + settings = { + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; + hostKeys = [ + { + bits = 4096; + path = "/persist/etc/ssh/ssh_host_rsa_key"; + type = "rsa"; + } + { + path = "/persist/etc/ssh/ssh_host_ed25519_key"; + type = "ed25519"; + } + ]; + }; + + # Static networking (if needed for VPS) + # networking = { + # useDHCP = false; + # interfaces.ens3 = { + # useDHCP = false; + # ipv4.addresses = [{ + # address = ""; + # prefixLength = ; + # }]; + # ipv6.addresses = [{ + # address = ""; + # prefixLength = ; + # }]; + # }; + # defaultGateway = ""; + # defaultGateway6 = { address = ""; interface = "ens3"; }; + # }; } diff --git a/hosts/apollo/hardware-configuration.nix b/hosts/apollo/hardware-configuration.nix new file mode 100644 index 0000000..a558c5e --- /dev/null +++ b/hosts/apollo/hardware-configuration.nix @@ -0,0 +1,105 @@ +{ config, lib, ... }: +{ + disko.devices = { + disk = { + main = { + device = "/dev/vda"; # Change this to match your actual disk + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + priority = 1; + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "umask=0077" ]; + }; + }; + zfs = { + size = "100%"; + content = { + type = "zfs"; + pool = "rpool"; + }; + }; + }; + }; + }; + }; + zpool = { + rpool = { + type = "zpool"; + options = { + ashift = "12"; + autotrim = "on"; + }; + rootFsOptions = { + acltype = "posixacl"; + atime = "off"; + canmount = "off"; + compression = "zstd"; + dnodesize = "auto"; + normalization = "formD"; + xattr = "sa"; + mountpoint = "none"; + encryption = "on"; + keylocation = "prompt"; + keyformat = "passphrase"; + }; + datasets = { + # Reserved space to prevent pool from becoming full + "local/reserved" = { + type = "zfs_fs"; + options = { + refreservation = "1G"; + mountpoint = "none"; + }; + }; + # Nix store + "local/nix" = { + type = "zfs_fs"; + mountpoint = "/nix"; + options.mountpoint = "/nix"; + }; + # Persistent data + "safe/persist" = { + type = "zfs_fs"; + mountpoint = "/persist"; + options = { + mountpoint = "/persist"; + }; + postCreateHook = "zfs snapshot rpool/safe/persist@empty"; + }; + }; + }; + }; + nodev = { + "/" = { + fsType = "tmpfs"; + mountOptions = [ + "defaults" + "size=2G" + "mode=755" + ]; + }; + }; + }; + + # ZFS-specific boot configuration + boot.supportedFilesystems = [ "zfs" ]; + + # Bootloader configuration + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Required for ZFS + networking.hostId = "8425e349"; # Generate your own with: head -c 8 /etc/machine-id + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + # Mark /persist as needed for boot (required by impermanence) + fileSystems."/persist".neededForBoot = true; +} \ No newline at end of file From cd66c8888669ae54f11d7d8abed732cbbae5356f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 17 Oct 2025 11:38:59 +0300 Subject: [PATCH 1371/1768] networking issue --- hosts/apollo/configuration.nix | 37 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix index 2f6118a..0c1cc10 100644 --- a/hosts/apollo/configuration.nix +++ b/hosts/apollo/configuration.nix @@ -42,8 +42,8 @@ # Remote ZFS unlocking in initrd boot = { # Static IP in initrd - adjust these values for your network - # kernelParams = [ "ip=::::::none" ]; - + kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::ens3:none" ]; + initrd = { # Network driver for initrd - change to match your hardware # Common options: "virtio_pci" (VMs), "e1000e", "igb", "r8169" @@ -98,21 +98,20 @@ ]; }; - # Static networking (if needed for VPS) - # networking = { - # useDHCP = false; - # interfaces.ens3 = { - # useDHCP = false; - # ipv4.addresses = [{ - # address = ""; - # prefixLength = ; - # }]; - # ipv6.addresses = [{ - # address = ""; - # prefixLength = ; - # }]; - # }; - # defaultGateway = ""; - # defaultGateway6 = { address = ""; interface = "ens3"; }; - # }; + networking = { + useDHCP = false; + interfaces.ens3 = { + useDHCP = false; + ipv4.addresses = [{ + address = "152.53.152.129"; + prefixLength = 22; + }]; + ipv6.addresses = [{ + address = "2a00:11c0:47:3b2a::1"; + prefixLength = 64; + }]; + }; + defaultGateway = "152.53.152.1"; + defaultGateway6 = { address = "fe80::1"; interface = "ens3"; }; + }; } From d36d34c2df925112705de2a0c9134ae2097f2c59 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 17 Oct 2025 13:45:06 +0300 Subject: [PATCH 1372/1768] set hostid --- hosts/apollo/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix index 0c1cc10..725fff3 100644 --- a/hosts/apollo/configuration.nix +++ b/hosts/apollo/configuration.nix @@ -22,6 +22,8 @@ system.stateVersion = "25.11"; networking.hostName = "apollo"; + networking.hostId = "0f7de22e"; # Generate your own with: head -c 8 /etc/machine-id + # Enable zram swap zramSwap.enable = true; From 99ee97ac9dd1c3ed1500221daa2283a971224186 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 17 Oct 2025 13:47:55 +0300 Subject: [PATCH 1373/1768] more --- hosts/apollo/configuration.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix index 725fff3..c99cf60 100644 --- a/hosts/apollo/configuration.nix +++ b/hosts/apollo/configuration.nix @@ -6,7 +6,9 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../modules/common-packages.nix + ../../modules/services + ../../modules/nix-settings.nix inputs.disko.nixosModules.disko inputs.impermanence.nixosModules.impermanence ]; @@ -27,6 +29,9 @@ # Enable zram swap zramSwap.enable = true; + users.users.root.initialPassword = "changeme"; + users.mutableUsers = false; + # Persistence configuration environment.persistence."/persist" = { hideMounts = true; From 5f3df4e60b6abb6c4ac43ce17d264624ac23c327 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 17 Oct 2025 13:54:38 +0300 Subject: [PATCH 1374/1768] fix --- hosts/apollo/configuration.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix index c99cf60..9d2d8af 100644 --- a/hosts/apollo/configuration.nix +++ b/hosts/apollo/configuration.nix @@ -7,18 +7,19 @@ imports = [ ./hardware-configuration.nix ../../modules/common-packages.nix - ../../modules/services + # ../../modules/services/tailscale.nix + # ../../modules/services/openssh.nix ../../modules/nix-settings.nix inputs.disko.nixosModules.disko inputs.impermanence.nixosModules.impermanence ]; - myModules = { - enableKDE = false; - enableFonts = false; - blockYoutube = false; - blockTwitter = false; - }; + # myModules = { + # enableKDE = false; + # enableFonts = false; + # blockYoutube = false; + # blockTwitter = false; + # }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method system.stateVersion = "25.11"; From b0bac9ee923aa36ce249f933218f11eea3274142 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 17 Oct 2025 13:55:53 +0300 Subject: [PATCH 1375/1768] fix --- hosts/apollo/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/apollo/hardware-configuration.nix b/hosts/apollo/hardware-configuration.nix index a558c5e..3e08bea 100644 --- a/hosts/apollo/hardware-configuration.nix +++ b/hosts/apollo/hardware-configuration.nix @@ -97,7 +97,6 @@ boot.loader.efi.canTouchEfiVariables = true; # Required for ZFS - networking.hostId = "8425e349"; # Generate your own with: head -c 8 /etc/machine-id nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; # Mark /persist as needed for boot (required by impermanence) From 677c85e17127c4ffa919c9e2501ad1be9dbca022 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 17 Oct 2025 16:24:01 +0300 Subject: [PATCH 1376/1768] please god --- hosts/apollo/hardware-configuration.nix | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/hosts/apollo/hardware-configuration.nix b/hosts/apollo/hardware-configuration.nix index 3e08bea..9d1bb02 100644 --- a/hosts/apollo/hardware-configuration.nix +++ b/hosts/apollo/hardware-configuration.nix @@ -100,5 +100,28 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; # Mark /persist as needed for boot (required by impermanence) - fileSystems."/persist".neededForBoot = true; +fileSystems."/" = { + device = "none"; + fsType = "tmpfs"; + options = [ "defaults" "size=2G" "mode=755" ]; +}; + +fileSystems."/boot" = { + device = "/dev/disk/by-partlabel/disk-main-ESP"; + fsType = "vfat"; +}; + +fileSystems."/nix" = { + device = "rpool/local/nix"; + fsType = "zfs"; + options = [ "zfsutil" ]; +}; + +fileSystems."/persist" = { + device = "rpool/safe/persist"; + fsType = "zfs"; + options = [ "zfsutil" ]; + neededForBoot = true; +}; + } \ No newline at end of file From d05e6e08638ba7c83e48c38447cb82740cf23b10 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 18 Oct 2025 19:11:34 +0300 Subject: [PATCH 1377/1768] beautifuru --- flake.nix | 12 ++++++------ .../darwinHosts}/prometheus/configuration.nix | 0 .../darwinHosts}/prometheus/dummy-module.nix | 0 .../nixOnDroidHosts}/atreus/configuration.nix | 0 hosts/{ => nixos}/apollo/configuration.nix | 8 ++++---- hosts/{ => nixos}/apollo/hardware-configuration.nix | 0 hosts/{ => nixos}/harmonica-sd/configuration.nix | 2 +- .../harmonica-sd/hardware-configuration.nix | 0 hosts/{ => nixos}/harmonica-sd/sd-image.nix | 0 hosts/{ => nixos}/harmonica/configuration.nix | 2 +- .../{ => nixos}/harmonica/hardware-configuration.nix | 0 hosts/{ => nixos}/iso/configuration.nix | 0 hosts/{ => nixos}/pochita-sd/configuration.nix | 0 hosts/{ => nixos}/pochita/configuration.nix | 2 +- hosts/{ => nixos}/pochita/hardware-configuration.nix | 0 hosts/{ => nixos}/tartarus/configuration.nix | 2 +- .../{ => nixos}/tartarus/hardware-configuration.nix | 0 hosts/{ => nixos}/wallfacer/configuration.nix | 2 +- .../{ => nixos}/wallfacer/hardware-configuration.nix | 0 hosts/{ => nixos}/ymir/configuration.nix | 2 +- hosts/{ => nixos}/ymir/hardware-configuration.nix | 0 21 files changed, 16 insertions(+), 16 deletions(-) rename {darwinHosts => hosts/darwinHosts}/prometheus/configuration.nix (100%) rename {darwinHosts => hosts/darwinHosts}/prometheus/dummy-module.nix (100%) rename {nixOnDroidHosts => hosts/nixOnDroidHosts}/atreus/configuration.nix (100%) rename hosts/{ => nixos}/apollo/configuration.nix (96%) rename hosts/{ => nixos}/apollo/hardware-configuration.nix (100%) rename hosts/{ => nixos}/harmonica-sd/configuration.nix (97%) rename hosts/{ => nixos}/harmonica-sd/hardware-configuration.nix (100%) rename hosts/{ => nixos}/harmonica-sd/sd-image.nix (100%) rename hosts/{ => nixos}/harmonica/configuration.nix (96%) rename hosts/{ => nixos}/harmonica/hardware-configuration.nix (100%) rename hosts/{ => nixos}/iso/configuration.nix (100%) rename hosts/{ => nixos}/pochita-sd/configuration.nix (100%) rename hosts/{ => nixos}/pochita/configuration.nix (98%) rename hosts/{ => nixos}/pochita/hardware-configuration.nix (100%) rename hosts/{ => nixos}/tartarus/configuration.nix (96%) rename hosts/{ => nixos}/tartarus/hardware-configuration.nix (100%) rename hosts/{ => nixos}/wallfacer/configuration.nix (95%) rename hosts/{ => nixos}/wallfacer/hardware-configuration.nix (100%) rename hosts/{ => nixos}/ymir/configuration.nix (99%) rename hosts/{ => nixos}/ymir/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix index a639fc2..7947330 100644 --- a/flake.nix +++ b/flake.nix @@ -75,20 +75,20 @@ configName: nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; - modules = [ ./hosts/${configName}/configuration.nix ]; + modules = [ ./hosts/nixos/${configName}/configuration.nix ]; }; - configNames = builtins.attrNames (builtins.readDir ./hosts); + nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos); in { - nixosConfigurations = nixpkgs.lib.genAttrs configNames (name: makeNixosConfig name); + nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames (name: makeNixosConfig name); nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { extraSpecialArgs = { inherit inputs outputs; }; pkgs = import nixpkgs { system = "aarch64-linux"; }; - modules = [ ./nixOnDroidHosts/atreus/configuration.nix ]; + modules = [ ./hosts/nixOnDroidHosts/atreus/configuration.nix ]; }; darwinConfigurations.prometheus = nix-darwin.lib.darwinSystem { system = "x86_64-darwin"; - modules = [ ./darwinHosts/prometheus/configuration.nix ]; + modules = [ ./hosts/darwinHosts/prometheus/configuration.nix ]; specialArgs = { inherit inputs outputs; }; }; lib = import ./lib { inherit (nixpkgs) lib; }; @@ -108,7 +108,7 @@ nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; modules = [ - ./hosts/${configName}/configuration.nix + ./hosts/nixos/${configName}/configuration.nix { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; } ]; }; diff --git a/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix similarity index 100% rename from darwinHosts/prometheus/configuration.nix rename to hosts/darwinHosts/prometheus/configuration.nix diff --git a/darwinHosts/prometheus/dummy-module.nix b/hosts/darwinHosts/prometheus/dummy-module.nix similarity index 100% rename from darwinHosts/prometheus/dummy-module.nix rename to hosts/darwinHosts/prometheus/dummy-module.nix diff --git a/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix similarity index 100% rename from nixOnDroidHosts/atreus/configuration.nix rename to hosts/nixOnDroidHosts/atreus/configuration.nix diff --git a/hosts/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix similarity index 96% rename from hosts/apollo/configuration.nix rename to hosts/nixos/apollo/configuration.nix index 9d2d8af..aca6bc4 100644 --- a/hosts/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -6,10 +6,10 @@ { imports = [ ./hardware-configuration.nix - ../../modules/common-packages.nix + ../../../modules/common-packages.nix # ../../modules/services/tailscale.nix # ../../modules/services/openssh.nix - ../../modules/nix-settings.nix + ../../../modules/nix-settings.nix inputs.disko.nixosModules.disko inputs.impermanence.nixosModules.impermanence ]; @@ -56,7 +56,7 @@ # Network driver for initrd - change to match your hardware # Common options: "virtio_pci" (VMs), "e1000e", "igb", "r8169" availableKernelModules = [ "virtio_pci" ]; - + network = { enable = true; ssh = { @@ -65,7 +65,7 @@ # Generate with: ssh-keygen -t ed25519 -N "" -f /persist/etc/ssh/ssh_host_ed25519_key_initrd hostKeys = [ "/persist/etc/ssh/ssh_host_ed25519_key_initrd" ]; # Add your SSH public key here - authorizedKeys = [ + authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; }; diff --git a/hosts/apollo/hardware-configuration.nix b/hosts/nixos/apollo/hardware-configuration.nix similarity index 100% rename from hosts/apollo/hardware-configuration.nix rename to hosts/nixos/apollo/hardware-configuration.nix diff --git a/hosts/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix similarity index 97% rename from hosts/harmonica-sd/configuration.nix rename to hosts/nixos/harmonica-sd/configuration.nix index a8f9874..413cd46 100644 --- a/hosts/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -8,7 +8,7 @@ ./sd-image.nix "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/harmonica-sd/hardware-configuration.nix b/hosts/nixos/harmonica-sd/hardware-configuration.nix similarity index 100% rename from hosts/harmonica-sd/hardware-configuration.nix rename to hosts/nixos/harmonica-sd/hardware-configuration.nix diff --git a/hosts/harmonica-sd/sd-image.nix b/hosts/nixos/harmonica-sd/sd-image.nix similarity index 100% rename from hosts/harmonica-sd/sd-image.nix rename to hosts/nixos/harmonica-sd/sd-image.nix diff --git a/hosts/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix similarity index 96% rename from hosts/harmonica/configuration.nix rename to hosts/nixos/harmonica/configuration.nix index 928a786..78f2607 100644 --- a/hosts/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -6,7 +6,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/harmonica/hardware-configuration.nix b/hosts/nixos/harmonica/hardware-configuration.nix similarity index 100% rename from hosts/harmonica/hardware-configuration.nix rename to hosts/nixos/harmonica/hardware-configuration.nix diff --git a/hosts/iso/configuration.nix b/hosts/nixos/iso/configuration.nix similarity index 100% rename from hosts/iso/configuration.nix rename to hosts/nixos/iso/configuration.nix diff --git a/hosts/pochita-sd/configuration.nix b/hosts/nixos/pochita-sd/configuration.nix similarity index 100% rename from hosts/pochita-sd/configuration.nix rename to hosts/nixos/pochita-sd/configuration.nix diff --git a/hosts/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix similarity index 98% rename from hosts/pochita/configuration.nix rename to hosts/nixos/pochita/configuration.nix index 30149a6..0bc7a14 100644 --- a/hosts/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -7,7 +7,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.nixos-hardware.nixosModules.raspberry-pi-5 ]; diff --git a/hosts/pochita/hardware-configuration.nix b/hosts/nixos/pochita/hardware-configuration.nix similarity index 100% rename from hosts/pochita/hardware-configuration.nix rename to hosts/nixos/pochita/hardware-configuration.nix diff --git a/hosts/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix similarity index 96% rename from hosts/tartarus/configuration.nix rename to hosts/nixos/tartarus/configuration.nix index c3dad62..01c9c37 100644 --- a/hosts/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -7,7 +7,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/tartarus/hardware-configuration.nix b/hosts/nixos/tartarus/hardware-configuration.nix similarity index 100% rename from hosts/tartarus/hardware-configuration.nix rename to hosts/nixos/tartarus/hardware-configuration.nix diff --git a/hosts/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix similarity index 95% rename from hosts/wallfacer/configuration.nix rename to hosts/nixos/wallfacer/configuration.nix index 7ec82c1..47a2214 100644 --- a/hosts/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -2,7 +2,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { enableKDE = false; diff --git a/hosts/wallfacer/hardware-configuration.nix b/hosts/nixos/wallfacer/hardware-configuration.nix similarity index 100% rename from hosts/wallfacer/hardware-configuration.nix rename to hosts/nixos/wallfacer/hardware-configuration.nix diff --git a/hosts/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix similarity index 99% rename from hosts/ymir/configuration.nix rename to hosts/nixos/ymir/configuration.nix index 5fea0d7..f02eb90 100644 --- a/hosts/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -6,7 +6,7 @@ { imports = [ ./hardware-configuration.nix - ../../modules + ../../../modules ]; myModules = { diff --git a/hosts/ymir/hardware-configuration.nix b/hosts/nixos/ymir/hardware-configuration.nix similarity index 100% rename from hosts/ymir/hardware-configuration.nix rename to hosts/nixos/ymir/hardware-configuration.nix From 128005e3543eb5372491e54b53a2df5139806a97 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 14:42:00 +0300 Subject: [PATCH 1378/1768] move arduino --- modules/adb.nix | 21 ----------------- modules/arduino.nix | 30 ------------------------- modules/nixos/programs/adb-fastboot.nix | 9 ++++++++ modules/nixos/programs/arduino.nix | 15 +++++++++++++ 4 files changed, 24 insertions(+), 51 deletions(-) delete mode 100644 modules/adb.nix delete mode 100644 modules/arduino.nix create mode 100644 modules/nixos/programs/adb-fastboot.nix create mode 100644 modules/nixos/programs/arduino.nix diff --git a/modules/adb.nix b/modules/adb.nix deleted file mode 100644 index 44b8cdb..0000000 --- a/modules/adb.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - config, - ... -}: -{ - options = { - myModules.enableADB = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable ADB support"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableADB { - programs.adb.enable = true; - users.users.osbm.extraGroups = [ "adbusers" ]; - }) - ]; -} diff --git a/modules/arduino.nix b/modules/arduino.nix deleted file mode 100644 index 82f001e..0000000 --- a/modules/arduino.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - options = { - myModules.arduinoSetup = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Installs arduino-ide and adafruit-nrfutil and sets udev rules"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.arduinoSetup { - environment.systemPackages = with pkgs; [ - arduino-ide - adafruit-nrfutil - python3 # some arduino libraries require python3 - ]; - - services.udev.extraRules = '' - KERNEL=="ttyUSB[0-9]*",MODE="0666" - KERNEL=="ttyACM[0-9]*",MODE="0666" - ''; - }) - ]; -} diff --git a/modules/nixos/programs/adb-fastboot.nix b/modules/nixos/programs/adb-fastboot.nix new file mode 100644 index 0000000..bf36df3 --- /dev/null +++ b/modules/nixos/programs/adb-fastboot.nix @@ -0,0 +1,9 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.programs.adbFastboot.enable { + programs.adb.enable = true; + + # Add default user to adbusers group + users.users.${config.osbmModules.defaultUser}.extraGroups = [ "adbusers" ]; + }; +} diff --git a/modules/nixos/programs/arduino.nix b/modules/nixos/programs/arduino.nix new file mode 100644 index 0000000..719d170 --- /dev/null +++ b/modules/nixos/programs/arduino.nix @@ -0,0 +1,15 @@ +{ pkgs, lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.programs.arduino.enable { + environment.systemPackages = with pkgs; [ + arduino-ide + adafruit-nrfutil + python3 # some arduino libraries require python3 + ]; + + services.udev.extraRules = '' + KERNEL=="ttyUSB[0-9]*",MODE="0666" + KERNEL=="ttyACM[0-9]*",MODE="0666" + ''; + }; +} From feb53bc5fc709c4e8ac03583500a318a9397523c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 14:49:27 +0300 Subject: [PATCH 1379/1768] move services --- modules/{ => nixos}/services/attic.nix | 4 ++-- modules/{ => nixos}/services/caddy.nix | 4 ++-- modules/{ => nixos}/services/cloudflare-dyndns.nix | 4 ++-- modules/{ => nixos}/services/cloudflared.nix | 4 ++-- modules/{ => nixos}/services/default.nix | 0 modules/{ => nixos}/services/forgejo.nix | 4 ++-- modules/{ => nixos}/services/glance.nix | 4 ++-- modules/{ => nixos}/services/hydra.nix | 4 ++-- modules/{ => nixos}/services/jellyfin.nix | 4 ++-- modules/{ => nixos}/services/nextcloud.nix | 4 ++-- modules/{ => nixos}/services/ollama.nix | 4 ++-- modules/{ => nixos}/services/openssh.nix | 4 ++-- modules/{ => nixos}/services/syncthing.nix | 4 ++-- modules/{ => nixos}/services/system-logger/default.nix | 0 modules/{ => nixos}/services/system-logger/system-logger.sh | 0 modules/{ => nixos}/services/tailscale.nix | 4 ++-- modules/{ => nixos}/services/vaultwarden.nix | 4 ++-- modules/{ => nixos}/services/vscode-server.nix | 0 modules/{ => nixos}/services/wanikani-bypass-lessons.nix | 0 modules/{ => nixos}/services/wanikani-fetch-data/default.nix | 0 .../services/wanikani-fetch-data/wanikani-fetcher.sh | 0 modules/{ => nixos}/services/wanikani-stats/app.py | 0 modules/{ => nixos}/services/wanikani-stats/default.nix | 0 23 files changed, 28 insertions(+), 28 deletions(-) rename modules/{ => nixos}/services/attic.nix (92%) rename modules/{ => nixos}/services/caddy.nix (93%) rename modules/{ => nixos}/services/cloudflare-dyndns.nix (91%) rename modules/{ => nixos}/services/cloudflared.nix (75%) rename modules/{ => nixos}/services/default.nix (100%) rename modules/{ => nixos}/services/forgejo.nix (93%) rename modules/{ => nixos}/services/glance.nix (98%) rename modules/{ => nixos}/services/hydra.nix (86%) rename modules/{ => nixos}/services/jellyfin.nix (81%) rename modules/{ => nixos}/services/nextcloud.nix (86%) rename modules/{ => nixos}/services/ollama.nix (92%) rename modules/{ => nixos}/services/openssh.nix (88%) rename modules/{ => nixos}/services/syncthing.nix (76%) rename modules/{ => nixos}/services/system-logger/default.nix (100%) rename modules/{ => nixos}/services/system-logger/system-logger.sh (100%) rename modules/{ => nixos}/services/tailscale.nix (86%) rename modules/{ => nixos}/services/vaultwarden.nix (71%) rename modules/{ => nixos}/services/vscode-server.nix (100%) rename modules/{ => nixos}/services/wanikani-bypass-lessons.nix (100%) rename modules/{ => nixos}/services/wanikani-fetch-data/default.nix (100%) rename modules/{ => nixos}/services/wanikani-fetch-data/wanikani-fetcher.sh (100%) rename modules/{ => nixos}/services/wanikani-stats/app.py (100%) rename modules/{ => nixos}/services/wanikani-stats/default.nix (100%) diff --git a/modules/services/attic.nix b/modules/nixos/services/attic.nix similarity index 92% rename from modules/services/attic.nix rename to modules/nixos/services/attic.nix index 770b0eb..6ddf83d 100644 --- a/modules/services/attic.nix +++ b/modules/nixos/services/attic.nix @@ -8,7 +8,7 @@ let in { options = { - myModules.enableAttic = lib.mkOption { + osbmModules.enableAttic = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Attic nix cache service"; @@ -16,7 +16,7 @@ in }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableAttic { + (lib.mkIf config.osbmModules.enableAttic { services.atticd = { enable = true; environmentFile = "/persist/attic.env"; diff --git a/modules/services/caddy.nix b/modules/nixos/services/caddy.nix similarity index 93% rename from modules/services/caddy.nix rename to modules/nixos/services/caddy.nix index 650b868..5caf07c 100644 --- a/modules/services/caddy.nix +++ b/modules/nixos/services/caddy.nix @@ -6,7 +6,7 @@ }: { options = { - myModules.enableCaddy = lib.mkOption { + osbmModules.enableCaddy = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Caddy server"; @@ -14,7 +14,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableCaddy { + (lib.mkIf config.osbmModules.enableCaddy { services.caddy = { enable = true; # package = pkgs.caddy.withPlugins { diff --git a/modules/services/cloudflare-dyndns.nix b/modules/nixos/services/cloudflare-dyndns.nix similarity index 91% rename from modules/services/cloudflare-dyndns.nix rename to modules/nixos/services/cloudflare-dyndns.nix index a2c0f2e..3c04b38 100644 --- a/modules/services/cloudflare-dyndns.nix +++ b/modules/nixos/services/cloudflare-dyndns.nix @@ -29,7 +29,7 @@ let in { options = { - myModules.enableCloudflareDyndns = lib.mkOption { + osbmModules.enableCloudflareDyndns = lib.mkOption { type = lib.types.bool; default = false; description = "Enable a service to push my public IP address to my Cloudflare domain."; @@ -37,7 +37,7 @@ in }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableCloudflareDyndns { + (lib.mkIf config.osbmModules.enableCloudflareDyndns { services.cloudflare-dyndns = { package = cloudflare-dyndns-5-3; enable = true; diff --git a/modules/services/cloudflared.nix b/modules/nixos/services/cloudflared.nix similarity index 75% rename from modules/services/cloudflared.nix rename to modules/nixos/services/cloudflared.nix index ec42ef6..9117020 100644 --- a/modules/services/cloudflared.nix +++ b/modules/nixos/services/cloudflared.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableCloudflared = lib.mkOption { + osbmModules.enableCloudflared = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Cloudflare tunnels"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableCloudflared { + (lib.mkIf config.osbmModules.enableCloudflared { services.cloudflared = { enable = true; certificateFile = "/home/osbm/.cloudflared/cert.pem"; diff --git a/modules/services/default.nix b/modules/nixos/services/default.nix similarity index 100% rename from modules/services/default.nix rename to modules/nixos/services/default.nix diff --git a/modules/services/forgejo.nix b/modules/nixos/services/forgejo.nix similarity index 93% rename from modules/services/forgejo.nix rename to modules/nixos/services/forgejo.nix index a5d8487..2ada6be 100644 --- a/modules/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableForgejo = lib.mkOption { + osbmModules.enableForgejo = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Forgejo server"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableForgejo { + (lib.mkIf config.osbmModules.enableForgejo { services.forgejo = { enable = true; lfs.enable = true; diff --git a/modules/services/glance.nix b/modules/nixos/services/glance.nix similarity index 98% rename from modules/services/glance.nix rename to modules/nixos/services/glance.nix index ab793ce..1afb7c8 100644 --- a/modules/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableGlance = lib.mkOption { + osbmModules.enableGlance = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Glance server"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableGlance { + (lib.mkIf config.osbmModules.enableGlance { services.glance = { enable = true; openFirewall = true; diff --git a/modules/services/hydra.nix b/modules/nixos/services/hydra.nix similarity index 86% rename from modules/services/hydra.nix rename to modules/nixos/services/hydra.nix index 73ba924..e12caf0 100644 --- a/modules/services/hydra.nix +++ b/modules/nixos/services/hydra.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableHydra = lib.mkOption { + osbmModules.enableHydra = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Hydra continuous integration server"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableHydra { + (lib.mkIf config.osbmModules.enableHydra { services.hydra = { enable = true; port = 3000; diff --git a/modules/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix similarity index 81% rename from modules/services/jellyfin.nix rename to modules/nixos/services/jellyfin.nix index 153bf5d..e8d3e4a 100644 --- a/modules/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableJellyfin = lib.mkOption { + osbmModules.enableJellyfin = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Jellyfin media server"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableJellyfin { + (lib.mkIf config.osbmModules.enableJellyfin { services.jellyfin = { enable = true; openFirewall = true; diff --git a/modules/services/nextcloud.nix b/modules/nixos/services/nextcloud.nix similarity index 86% rename from modules/services/nextcloud.nix rename to modules/nixos/services/nextcloud.nix index 77f1e37..3413d6f 100644 --- a/modules/services/nextcloud.nix +++ b/modules/nixos/services/nextcloud.nix @@ -6,7 +6,7 @@ }: { options = { - myModules.enableNextcloud = lib.mkOption { + osbmModules.enableNextcloud = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Nextcloud server"; @@ -14,7 +14,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableNextcloud { + (lib.mkIf config.osbmModules.enableNextcloud { environment.etc."nextcloud-admin-pass".text = "m7eJ4KJ1NK33JE%51"; services.nextcloud = { enable = true; diff --git a/modules/services/ollama.nix b/modules/nixos/services/ollama.nix similarity index 92% rename from modules/services/ollama.nix rename to modules/nixos/services/ollama.nix index 5b0f21c..31bd5a6 100644 --- a/modules/services/ollama.nix +++ b/modules/nixos/services/ollama.nix @@ -5,7 +5,7 @@ }: { options = { - myModules = { + osbmModules = { enableOllama = lib.mkOption { type = lib.types.bool; default = false; @@ -15,7 +15,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableOllama { + (lib.mkIf config.osbmModules.enableOllama { services.ollama = { enable = true; acceleration = "cuda"; diff --git a/modules/services/openssh.nix b/modules/nixos/services/openssh.nix similarity index 88% rename from modules/services/openssh.nix rename to modules/nixos/services/openssh.nix index 842db16..bdbcd35 100644 --- a/modules/services/openssh.nix +++ b/modules/nixos/services/openssh.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableOpenssh = lib.mkOption { + osbmModules.enableOpenssh = lib.mkOption { type = lib.types.bool; default = true; description = "Enable OpenSSH service"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableOpenssh { + (lib.mkIf config.osbmModules.enableOpenssh { services.openssh = { enable = true; startWhenNeeded = true; diff --git a/modules/services/syncthing.nix b/modules/nixos/services/syncthing.nix similarity index 76% rename from modules/services/syncthing.nix rename to modules/nixos/services/syncthing.nix index 0be3b52..85b44c5 100644 --- a/modules/services/syncthing.nix +++ b/modules/nixos/services/syncthing.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableSyncthing = lib.mkOption { + osbmModules.enableSyncthing = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Syncthing file synchronization service"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableSyncthing { + (lib.mkIf config.osbmModules.enableSyncthing { services.syncthing = { enable = true; openDefaultPorts = true; diff --git a/modules/services/system-logger/default.nix b/modules/nixos/services/system-logger/default.nix similarity index 100% rename from modules/services/system-logger/default.nix rename to modules/nixos/services/system-logger/default.nix diff --git a/modules/services/system-logger/system-logger.sh b/modules/nixos/services/system-logger/system-logger.sh similarity index 100% rename from modules/services/system-logger/system-logger.sh rename to modules/nixos/services/system-logger/system-logger.sh diff --git a/modules/services/tailscale.nix b/modules/nixos/services/tailscale.nix similarity index 86% rename from modules/services/tailscale.nix rename to modules/nixos/services/tailscale.nix index c111a87..c9095d7 100644 --- a/modules/services/tailscale.nix +++ b/modules/nixos/services/tailscale.nix @@ -6,7 +6,7 @@ }: { options = { - myModules.enableTailscale = lib.mkOption { + osbmModules.enableTailscale = lib.mkOption { type = lib.types.bool; default = true; description = "Enable Tailscale VPN"; @@ -20,7 +20,7 @@ # and i have a laptop named tartarus config = lib.mkMerge [ - (lib.mkIf config.myModules.enableTailscale { + (lib.mkIf config.osbmModules.enableTailscale { services.tailscale = { enable = true; port = 51513; diff --git a/modules/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix similarity index 71% rename from modules/services/vaultwarden.nix rename to modules/nixos/services/vaultwarden.nix index d3db64e..b5a2032 100644 --- a/modules/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -5,7 +5,7 @@ }: { options = { - myModules.enableVaultwarden = lib.mkOption { + osbmModules.enableVaultwarden = lib.mkOption { type = lib.types.bool; default = false; description = "Enable Vaultwarden server"; @@ -13,7 +13,7 @@ }; config = lib.mkMerge [ - (lib.mkIf config.myModules.enableVaultwarden { + (lib.mkIf config.osbmModules.enableVaultwarden { services.vaultwarden = { enable = true; }; diff --git a/modules/services/vscode-server.nix b/modules/nixos/services/vscode-server.nix similarity index 100% rename from modules/services/vscode-server.nix rename to modules/nixos/services/vscode-server.nix diff --git a/modules/services/wanikani-bypass-lessons.nix b/modules/nixos/services/wanikani-bypass-lessons.nix similarity index 100% rename from modules/services/wanikani-bypass-lessons.nix rename to modules/nixos/services/wanikani-bypass-lessons.nix diff --git a/modules/services/wanikani-fetch-data/default.nix b/modules/nixos/services/wanikani-fetch-data/default.nix similarity index 100% rename from modules/services/wanikani-fetch-data/default.nix rename to modules/nixos/services/wanikani-fetch-data/default.nix diff --git a/modules/services/wanikani-fetch-data/wanikani-fetcher.sh b/modules/nixos/services/wanikani-fetch-data/wanikani-fetcher.sh similarity index 100% rename from modules/services/wanikani-fetch-data/wanikani-fetcher.sh rename to modules/nixos/services/wanikani-fetch-data/wanikani-fetcher.sh diff --git a/modules/services/wanikani-stats/app.py b/modules/nixos/services/wanikani-stats/app.py similarity index 100% rename from modules/services/wanikani-stats/app.py rename to modules/nixos/services/wanikani-stats/app.py diff --git a/modules/services/wanikani-stats/default.nix b/modules/nixos/services/wanikani-stats/default.nix similarity index 100% rename from modules/services/wanikani-stats/default.nix rename to modules/nixos/services/wanikani-stats/default.nix From b1cce6ca8263c0e073b7f565c51a9cc29ecb22c6 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 16:12:11 +0300 Subject: [PATCH 1380/1768] update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 87c96ce..5177d89 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ result .DS_Store -.direnv \ No newline at end of file +.direnv +*.old \ No newline at end of file From 3501857f2a3b3b16fc05eab4382dd3bb1dc8bf30 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 16:13:59 +0300 Subject: [PATCH 1381/1768] fuck it --- README.md | 67 +++- home/alacritty.nix | 35 -- home/direnv.nix | 8 - home/ghostty.nix | 19 - home/gpg.nix | 15 - home/gtk.nix | 35 -- home/home.nix | 44 --- home/mpv.nix | 5 - .../darwinHosts/prometheus/configuration.nix | 4 +- hosts/darwinHosts/prometheus/dummy-module.nix | 2 +- hosts/nixos/apollo/configuration.nix | 2 +- hosts/nixos/harmonica-sd/configuration.nix | 2 +- hosts/nixos/harmonica/configuration.nix | 2 +- hosts/nixos/pochita/configuration.nix | 2 +- hosts/nixos/tartarus/configuration.nix | 2 +- hosts/nixos/wallfacer/configuration.nix | 2 +- hosts/nixos/ymir/configuration.nix | 2 +- modules/common-packages.nix | 62 --- modules/concentration.nix | 56 --- modules/default.nix | 26 -- modules/disable-hibernation.nix | 39 -- modules/emulation.nix | 21 - modules/fonts.nix | 69 ---- modules/getty.nix | 3 - modules/graphical-interface.nix | 99 ----- modules/home-manager/default.nix | 16 + modules/home-manager/programs/alacritty.nix | 18 + .../home-manager/programs}/bash.nix | 0 modules/home-manager/programs/default.nix | 16 + modules/home-manager/programs/direnv.nix | 6 + .../home-manager/programs}/firefox.nix | 0 .../home-manager/programs}/fish.nix | 0 modules/home-manager/programs/ghostty.nix | 7 + .../home-manager/programs}/git.nix | 0 modules/home-manager/programs/mpv.nix | 10 + .../home-manager/programs}/ssh.nix | 0 .../home-manager/programs}/starship.nix | 0 .../home-manager/programs}/tlrc.nix | 0 .../home-manager/programs/tmux.nix | 0 .../home-manager/programs}/wezterm.nix | 0 .../home-manager/programs}/zoxide.nix | 0 modules/home.nix | 24 -- modules/i18n.nix | 35 -- modules/nix-index.nix | 9 - modules/nix-settings.nix | 109 ------ modules/nixos/default.nix | 9 + modules/nixos/hardware/default.nix | 9 + modules/nixos/hardware/disko.nix | 325 ++++++++++++++++ modules/nixos/hardware/hibernation.nix | 10 + modules/nixos/hardware/nvidia.nix | 33 ++ modules/nixos/hardware/sound.nix | 20 + modules/nixos/options.nix | 364 ++++++++++++++++++ modules/nixos/programs/command-line.nix | 48 +++ modules/nixos/programs/default.nix | 10 + modules/nixos/programs/graphical.nix | 17 + modules/nixos/programs/neovim.nix | 8 + modules/nixos/programs/steam.nix | 14 + modules/nixos/system/agenix.nix | 10 + modules/nixos/system/concentration.nix | 34 ++ modules/nixos/system/default.nix | 17 + modules/nixos/system/desktop-environment.nix | 63 +++ modules/nixos/system/emulation.nix | 7 + modules/nixos/system/fonts.nix | 27 ++ modules/nixos/system/home-manager.nix | 21 + modules/nixos/system/i18n.nix | 22 ++ modules/nixos/system/nix-index.nix | 7 + modules/nixos/system/nix-settings.nix | 78 ++++ modules/nixos/system/remote-builds.nix | 9 + modules/nixos/system/security.nix | 12 + modules/nixos/system/users.nix | 32 ++ modules/nixos/system/virtualization.nix | 28 ++ modules/remote-builds.nix | 35 -- modules/secrets.nix | 46 --- modules/security.nix | 5 - modules/sound.nix | 28 -- modules/users.nix | 39 -- modules/virtualisation.nix | 3 - modules/wake-on-lan.nix | 33 -- 78 files changed, 1383 insertions(+), 913 deletions(-) delete mode 100644 home/alacritty.nix delete mode 100644 home/direnv.nix delete mode 100644 home/ghostty.nix delete mode 100644 home/gpg.nix delete mode 100644 home/gtk.nix delete mode 100644 home/home.nix delete mode 100644 home/mpv.nix delete mode 100644 modules/common-packages.nix delete mode 100644 modules/concentration.nix delete mode 100644 modules/default.nix delete mode 100644 modules/disable-hibernation.nix delete mode 100644 modules/emulation.nix delete mode 100644 modules/fonts.nix delete mode 100644 modules/getty.nix delete mode 100644 modules/graphical-interface.nix create mode 100644 modules/home-manager/default.nix create mode 100644 modules/home-manager/programs/alacritty.nix rename {home => modules/home-manager/programs}/bash.nix (100%) create mode 100644 modules/home-manager/programs/default.nix create mode 100644 modules/home-manager/programs/direnv.nix rename {home => modules/home-manager/programs}/firefox.nix (100%) rename {home => modules/home-manager/programs}/fish.nix (100%) create mode 100644 modules/home-manager/programs/ghostty.nix rename {home => modules/home-manager/programs}/git.nix (100%) create mode 100644 modules/home-manager/programs/mpv.nix rename {home => modules/home-manager/programs}/ssh.nix (100%) rename {home => modules/home-manager/programs}/starship.nix (100%) rename {home => modules/home-manager/programs}/tlrc.nix (100%) rename home/tmux/default.nix => modules/home-manager/programs/tmux.nix (100%) rename {home => modules/home-manager/programs}/wezterm.nix (100%) rename {home => modules/home-manager/programs}/zoxide.nix (100%) delete mode 100644 modules/home.nix delete mode 100644 modules/i18n.nix delete mode 100644 modules/nix-index.nix delete mode 100644 modules/nix-settings.nix create mode 100644 modules/nixos/default.nix create mode 100644 modules/nixos/hardware/default.nix create mode 100644 modules/nixos/hardware/disko.nix create mode 100644 modules/nixos/hardware/hibernation.nix create mode 100644 modules/nixos/hardware/nvidia.nix create mode 100644 modules/nixos/hardware/sound.nix create mode 100644 modules/nixos/options.nix create mode 100644 modules/nixos/programs/command-line.nix create mode 100644 modules/nixos/programs/default.nix create mode 100644 modules/nixos/programs/graphical.nix create mode 100644 modules/nixos/programs/neovim.nix create mode 100644 modules/nixos/programs/steam.nix create mode 100644 modules/nixos/system/agenix.nix create mode 100644 modules/nixos/system/concentration.nix create mode 100644 modules/nixos/system/default.nix create mode 100644 modules/nixos/system/desktop-environment.nix create mode 100644 modules/nixos/system/emulation.nix create mode 100644 modules/nixos/system/fonts.nix create mode 100644 modules/nixos/system/home-manager.nix create mode 100644 modules/nixos/system/i18n.nix create mode 100644 modules/nixos/system/nix-index.nix create mode 100644 modules/nixos/system/nix-settings.nix create mode 100644 modules/nixos/system/remote-builds.nix create mode 100644 modules/nixos/system/security.nix create mode 100644 modules/nixos/system/users.nix create mode 100644 modules/nixos/system/virtualization.nix delete mode 100644 modules/remote-builds.nix delete mode 100644 modules/secrets.nix delete mode 100644 modules/security.nix delete mode 100644 modules/sound.nix delete mode 100644 modules/users.nix delete mode 100644 modules/virtualisation.nix delete mode 100644 modules/wake-on-lan.nix diff --git a/README.md b/README.md index 576ecfa..26685ac 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,71 @@ I didnt get these setup yet. - Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) - Android phone (termux) **android** (not setup yet) +My options: + +I implemented a module system for my configurations. Each machine has its own set of options that can be enabled or disabled. The options are defined in the `modules/options.nix` file. Each option is a module that can be imported into the machine configuration. + +I am containing my options in the `osbmModules` attribute set. I dont like to interfere with the global configuration namespace. Here is all the available options: + +```nix +osbmModules = { + desktopEnvironment = "plasma"; # options: "plasma", "none" + homeManager.enable = true; + machineType = "desktop"; # options: "desktop", "laptop", "server", "embedded", "mobile" + users = [ "osbm" "bayram" ]; + defaultUser = "osbm"; + agenix.enable = true; + nixSettings.enable = true; + programs = { + steam.enable = true; + graphical.enable = true; + commandLine.enable = true; + neovim.enable = true; + arduino.enable = true; + adbFastboot.enable = true; + }; + services = { + # list services to enable + }; + hardware = { + sound.enable = true; + nvidiaDriver.enable = false; + hibernation.enable = false; + disko = { + enable = true; + fileSystem = "zfs"; # options: "zfs", "ext4" + systemd-boot = true; + initrd-ssh = { + enable = true; + ethernetDrivers = [ "igc" ]; + }; + zfs = { + enable = true; + hostID = "49e95c43"; + root = { + disk1 = "nvme0n1"; + disk2 = "nvme1n1"; + reservation = "200G"; + impermanenceRoot = true; + }; + storage = { + enable = true; + disks = [ + "sda" + "sdb" + ]; + reservation = "1500G"; + mirror = true; + #amReinstalling = true; + }; + }; + }; + } +}; +``` + + +
How to bootstrap raspberry pi 5 @@ -39,7 +104,7 @@ and voila! when you plug the sd card to the raspberry pi 5 it will boot up with
build iso with: - nix build .#nixosConfigurations.myISO.config.system.build.isoImage + nix build .#nixosConfigurations.myISO.config.system.build.isoImage # To-do list diff --git a/home/alacritty.nix b/home/alacritty.nix deleted file mode 100644 index 10c431b..0000000 --- a/home/alacritty.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - options.enableAlacritty = lib.mkEnableOption "Alacritty terminal emulator"; - config = { - programs.alacritty = { - enable = config.enableAlacritty; - settings = { - font = { - size = 14.0; - normal.family = "Cascadia Code"; - }; - terminal.shell = { - args = [ - "new-session" - "-A" - "-s" - "general" - ]; - program = lib.getExe pkgs.tmux; - }; - window = { - decorations = "None"; - opacity = 1; - startup_mode = "Maximized"; - }; - env.TERM = "xterm-256color"; - }; - }; - }; -} diff --git a/home/direnv.nix b/home/direnv.nix deleted file mode 100644 index dd2f637..0000000 --- a/home/direnv.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - programs.direnv = { - enable = true; - # enableFishIntegration = true; # why add a read-only option? - nix-direnv.enable = true; - silent = true; - }; -} diff --git a/home/ghostty.nix b/home/ghostty.nix deleted file mode 100644 index 66bb838..0000000 --- a/home/ghostty.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -{ - options.enableGhostty = lib.mkEnableOption "Ghostty terminal emulator"; - config = { - programs.ghostty = { - enable = config.enableGhostty; - settings = { - maximize = true; - window-decoration = false; - command = lib.getExe pkgs.tmux; - }; - }; - }; -} diff --git a/home/gpg.nix b/home/gpg.nix deleted file mode 100644 index 4e6161a..0000000 --- a/home/gpg.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ pkgs, ... }: -{ - - services.gpg-agent = { - enable = true; - enableFishIntegration = true; - enableSshSupport = true; - # extraConfig = '' - # allow-loopback-pinentry - # ''; - pinentry.package = pkgs.pinentry-tty; - }; - programs.gpg.enable = true; - # home.packages = [ pkgs.pinentry-curses ]; -} diff --git a/home/gtk.nix b/home/gtk.nix deleted file mode 100644 index d0bebe1..0000000 --- a/home/gtk.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - options = { - # Enable the GTK theme - enableGTK = lib.mkEnableOption "enableGTK"; - }; - - config = lib.mkIf config.enableGTK { - home.pointerCursor = { - name = "Dracula"; - package = pkgs.dracula-theme; - gtk.enable = true; - }; - gtk = { - enable = true; - theme = { - name = "Dracula"; - package = pkgs.dracula-theme; - }; - gtk3.extraConfig = { - gtk-application-prefer-dark-theme = 1; - gtk-cursor-theme-size = 8; - }; - gtk4.extraConfig = { - gtk-application-prefer-dark-theme = 1; - gtk-cursor-theme-size = 8; - }; - }; - }; -} diff --git a/home/home.nix b/home/home.nix deleted file mode 100644 index c433f51..0000000 --- a/home/home.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - username, - homeDirectory, - stateVersion, - config, - enableGTK ? config.myModules.enableKDE, - enableGhostty ? config.myModules.enableKDE, - pkgs, - ... -}: -{ - imports = [ - ./alacritty.nix - ./tmux - ./ghostty.nix - ./git.nix - ./gpg.nix - ./gtk.nix - ./ssh.nix - ./bash.nix - ./direnv.nix - ./firefox.nix - ./fish.nix - ./tlrc.nix - ./starship.nix - ./wezterm.nix - ./zoxide.nix - ]; - - home.username = username; - home.homeDirectory = homeDirectory; - - home.packages = [ - pkgs.lazygit - ]; - - home.stateVersion = stateVersion; - - enableGTK = enableGTK; - enableFirefox = config.myModules.enableKDE; - enableAlacritty = config.myModules.enableKDE; - enableGhostty = enableGhostty; - enableWezterm = config.myModules.enableKDE; -} diff --git a/home/mpv.nix b/home/mpv.nix deleted file mode 100644 index 8c80492..0000000 --- a/home/mpv.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - programs.mpv = { - enable = true; - }; -} diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 3261001..3d10385 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -88,7 +88,7 @@ # type = "path"; # }; # }; - + osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs = { from = { type = "indirect"; id = "my-nixpkgs"; }; @@ -128,7 +128,7 @@ programs.fish.enable = true; - # myModules.setUsers = false; + # osbmModules.setUsers = false; users.users.osbm = { description = "osbm"; shell = pkgs.fish; diff --git a/hosts/darwinHosts/prometheus/dummy-module.nix b/hosts/darwinHosts/prometheus/dummy-module.nix index aebd406..d4a7076 100644 --- a/hosts/darwinHosts/prometheus/dummy-module.nix +++ b/hosts/darwinHosts/prometheus/dummy-module.nix @@ -1,7 +1,7 @@ { lib, ... }: { options = { - myModules.enableKDE = lib.mkOption { + osbmModules.enableKDE = lib.mkOption { type = lib.types.bool; default = false; description = "Enable KDE Plasma"; diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index aca6bc4..d6f26e2 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -14,7 +14,7 @@ inputs.impermanence.nixosModules.impermanence ]; - # myModules = { + # osbmModules = { # enableKDE = false; # enableFonts = false; # blockYoutube = false; diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index 413cd46..13683b2 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -11,7 +11,7 @@ ../../../modules ]; - myModules = { + osbmModules = { enableKDE = false; enableFonts = false; blockYoutube = false; diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 78f2607..ea6b6a7 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -9,7 +9,7 @@ ../../../modules ]; - myModules = { + osbmModules = { enableKDE = false; enableFonts = false; blockYoutube = false; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 0bc7a14..1895e48 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -12,7 +12,7 @@ inputs.nixos-hardware.nixosModules.raspberry-pi-5 ]; - myModules = { + osbmModules = { enableKDE = false; enableFonts = false; blockYoutube = false; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 01c9c37..6877026 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -10,7 +10,7 @@ ../../../modules ]; - myModules = { + osbmModules = { blockYoutube = false; blockTwitter = true; blockBluesky = false; diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 47a2214..ebd5959 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -4,7 +4,7 @@ ./hardware-configuration.nix ../../../modules ]; - myModules = { + osbmModules = { enableKDE = false; enableFonts = false; enableNextcloud = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index f02eb90..b8fe661 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -9,7 +9,7 @@ ../../../modules ]; - myModules = { + osbmModules = { blockYoutube = false; blockTwitter = true; blockBluesky = false; diff --git a/modules/common-packages.nix b/modules/common-packages.nix deleted file mode 100644 index cc5599f..0000000 --- a/modules/common-packages.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - pkgs, - inputs, - ... -}: -{ - environment.systemPackages = with pkgs; [ - inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default - wget - nano - git - lazygit - lazysql - git-lfs - gnumake - zip - fish - trash-cli - tmux - zoxide - htop - unzip - tlrc - (pkgs.writeShellScriptBin "wake-ymir" '' - echo waking up ymir - ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 - '') - btop - pciutils - # lm_sensors - cloc - neofetch - pfetch - inxi - jq - dig - onefetch - just - nixd - eza - gh - starship - tree - nix-output-monitor - yazi - ripgrep - nh - comma - nix-inspect - bat - fd - dust - # dysk - gnupg - attic-client - ]; - - environment.variables = { - EDITOR = "nvim"; - VISUAL = "nvim"; - }; -} diff --git a/modules/concentration.nix b/modules/concentration.nix deleted file mode 100644 index 1162f75..0000000 --- a/modules/concentration.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - lib, - config, - ... -}: -{ - options = { - myModules = { - blockYoutube = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Disables youtube using /etc/hosts file"; - }; - blockTwitter = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Disables twitter using /etc/hosts file"; - }; - blockBluesky = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Disables bluesky using /etc/hosts file"; - }; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.blockYoutube { - networking.extraHosts = '' - 0.0.0.0 youtube.com - ::0 youtube.com - - 0.0.0.0 www.youtube.com - ::0 www.youtube.com - ''; - }) - (lib.mkIf config.myModules.blockTwitter { - networking.extraHosts = '' - 0.0.0.0 twitter.com - ::0 twitter.com - - 0.0.0.0 www.twitter.com - ::0 www.twitter.com - ''; - }) - (lib.mkIf config.myModules.blockBluesky { - networking.extraHosts = '' - 0.0.0.0 bsky.app - ::0 bsky.app - - 0.0.0.0 www.bsky.app - ::0 www.bsky.app - ''; - }) - ]; -} diff --git a/modules/default.nix b/modules/default.nix deleted file mode 100644 index cfabab4..0000000 --- a/modules/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - imports = [ - ./services - ./adb.nix - ./arduino.nix - ./common-packages.nix - ./concentration.nix - ./disable-hibernation.nix - ./emulation.nix - ./fonts.nix - ./graphical-interface.nix - ./home.nix - ./i18n.nix - # ./minegrub.nix - ./nix-index.nix - ./nix-settings.nix - ./remote-builds.nix - ./secrets.nix - ./security.nix - ./sound.nix - ./users.nix - ./virtualisation.nix - ./wake-on-lan.nix - ./getty.nix - ]; -} diff --git a/modules/disable-hibernation.nix b/modules/disable-hibernation.nix deleted file mode 100644 index 0b7f40b..0000000 --- a/modules/disable-hibernation.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - config, - ... -}: -{ - options = { - myModules.disableHibernation = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Disable hibernation"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.disableHibernation { - systemd = { - targets = { - sleep = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - suspend = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - hibernate = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - "hybrid-sleep" = { - enable = false; - unitConfig.DefaultDependencies = "no"; - }; - }; - }; - }) - ]; -} diff --git a/modules/emulation.nix b/modules/emulation.nix deleted file mode 100644 index 84ac972..0000000 --- a/modules/emulation.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - config, - ... -}: -{ - options = { - myModules.enableAarch64Emulation = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Aarch64 emulation"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableAarch64Emulation { - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems; - }) - ]; -} diff --git a/modules/fonts.nix b/modules/fonts.nix deleted file mode 100644 index 54c8d20..0000000 --- a/modules/fonts.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - options = { - myModules.enableFonts = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Enable my favorite fonts"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableFonts { - fonts.packages = with pkgs; [ - cascadia-code - noto-fonts-cjk-sans - noto-fonts-color-emoji - liberation_ttf - fira-code - fira-code-symbols - mplus-outline-fonts.githubRelease - dina-font - nerd-fonts.fira-code - nerd-fonts.ubuntu - nerd-fonts.droid-sans-mono - proggyfonts - source-sans - source-han-sans - source-han-mono - source-sans-pro - source-serif-pro - font-awesome - font-awesome_5 - roboto - twitter-color-emoji - iosevka - dejavu_fonts - ]; - # to fix firefox - fonts.fontconfig.useEmbeddedBitmaps = true; - # fonts.fontconfig = { - # defaultFonts.emoji = ["Noto Color Emoji"]; - # }; - fonts.fontconfig.defaultFonts = { - serif = [ - "Source Han Serif SC" - "Source Han Serif TC" - "Noto Color Emoji" - ]; - sansSerif = [ - "Source Han Sans SC" - "Source Han Sans TC" - "Noto Color Emoji" - ]; - monospace = [ - "Droid Sans Mono" - "DejaVu Sans Mono" - "Source Han Mono" - "Cascadia Code" - ]; - emoji = [ "Noto Color Emoji" ]; - }; - }) - ]; -} diff --git a/modules/getty.nix b/modules/getty.nix deleted file mode 100644 index a51460b..0000000 --- a/modules/getty.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - services.getty.greetingLine = "hello"; -} diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix deleted file mode 100644 index d04ac63..0000000 --- a/modules/graphical-interface.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - options = { - myModules.enableKDE = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable KDE Plasma Desktop Environment with my favorite packages"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableKDE { - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm = { - enable = true; - # theme = "sugar-dark"; # looks ugly i give up - # wayland.enable = true; - }; - services.desktopManager.plasma6.enable = true; - - environment.plasma6.excludePackages = [ - pkgs.kdePackages.kate - pkgs.kdePackages.konsole - ]; - - # Enable CUPS to print documents. - services.printing.enable = true; - - hardware.bluetooth.enable = true; # enables support for Bluetooth - hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - environment.systemPackages = with pkgs; [ - blender - inkscape - sddm-sugar-dark - screenkey - vscode - alacritty - ghostty - obsidian - mpv - pomodoro-gtk - libreoffice - gimp - kitty - obs-studio - qbittorrent - ani-cli - prismlauncher - element-desktop - qbittorrent - discord - (pkgs.writeShellApplication { - name = "sync-terraria"; - runtimeInputs = [ - pkgs.python3Packages.huggingface-hub - pkgs.zip - ]; - text = '' - # check if logged in to huggingface - if [ "$(huggingface-cli whoami)" == "Not logged in" ]; then - echo "Please log in to huggingface" - exit 1 - fi - - cd ~/.local/share - timestamp=$(date +%Y-%m-%d_%H-%M) - echo "$timestamp" - zip -r "Terraria_$timestamp.zip" Terraria/ - huggingface-cli upload --repo-type dataset osbm/terraria-backups "Terraria_$timestamp.zip" "Terraria_$timestamp.zip" - ''; - }) - code-cursor - ungoogled-chromium - ]; - - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - dedicatedServer.openFirewall = true; - # Open ports in the firewall for Steam Local Network Game Transfers - localNetworkGameTransfers.openFirewall = true; - }; - networking.firewall.allowedTCPPorts = [ 51513 ]; - }) - ]; -} diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix new file mode 100644 index 0000000..067e288 --- /dev/null +++ b/modules/home-manager/default.nix @@ -0,0 +1,16 @@ +{ lib, ... }: +{ + # Import all home-manager modules + imports = [ + ./programs + ./services + ]; + + # Basic home-manager configuration + home.sessionVariables = { + EDITOR = lib.mkDefault "nvim"; + }; + + # Enable basic programs that most users want + programs.home-manager.enable = true; +} diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix new file mode 100644 index 0000000..a3c6b41 --- /dev/null +++ b/modules/home-manager/programs/alacritty.nix @@ -0,0 +1,18 @@ +{ lib, ... }: +{ + programs.alacritty = { + enable = lib.mkDefault false; + settings = { + window = { + opacity = 0.95; + padding = { + x = 10; + y = 10; + }; + }; + font = { + size = 11.0; + }; + }; + }; +} diff --git a/home/bash.nix b/modules/home-manager/programs/bash.nix similarity index 100% rename from home/bash.nix rename to modules/home-manager/programs/bash.nix diff --git a/modules/home-manager/programs/default.nix b/modules/home-manager/programs/default.nix new file mode 100644 index 0000000..1b22c2c --- /dev/null +++ b/modules/home-manager/programs/default.nix @@ -0,0 +1,16 @@ +{ ... }: +{ + imports = [ + ./fish.nix + ./starship.nix + ./git.nix + ./tmux.nix + ./zoxide.nix + ./direnv.nix + ./alacritty.nix + ./ghostty.nix + ./wezterm.nix + ./firefox.nix + ./mpv.nix + ]; +} diff --git a/modules/home-manager/programs/direnv.nix b/modules/home-manager/programs/direnv.nix new file mode 100644 index 0000000..2b51c9d --- /dev/null +++ b/modules/home-manager/programs/direnv.nix @@ -0,0 +1,6 @@ +{ + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; +} diff --git a/home/firefox.nix b/modules/home-manager/programs/firefox.nix similarity index 100% rename from home/firefox.nix rename to modules/home-manager/programs/firefox.nix diff --git a/home/fish.nix b/modules/home-manager/programs/fish.nix similarity index 100% rename from home/fish.nix rename to modules/home-manager/programs/fish.nix diff --git a/modules/home-manager/programs/ghostty.nix b/modules/home-manager/programs/ghostty.nix new file mode 100644 index 0000000..e5977bf --- /dev/null +++ b/modules/home-manager/programs/ghostty.nix @@ -0,0 +1,7 @@ +{ lib, ... }: +{ + programs.ghostty = { + enable = lib.mkDefault false; + # Configuration can be added as needed + }; +} diff --git a/home/git.nix b/modules/home-manager/programs/git.nix similarity index 100% rename from home/git.nix rename to modules/home-manager/programs/git.nix diff --git a/modules/home-manager/programs/mpv.nix b/modules/home-manager/programs/mpv.nix new file mode 100644 index 0000000..f08f20c --- /dev/null +++ b/modules/home-manager/programs/mpv.nix @@ -0,0 +1,10 @@ +{ lib, ... }: +{ + programs.mpv = { + enable = lib.mkDefault false; + config = { + hwdec = "auto"; + vo = "gpu"; + }; + }; +} diff --git a/home/ssh.nix b/modules/home-manager/programs/ssh.nix similarity index 100% rename from home/ssh.nix rename to modules/home-manager/programs/ssh.nix diff --git a/home/starship.nix b/modules/home-manager/programs/starship.nix similarity index 100% rename from home/starship.nix rename to modules/home-manager/programs/starship.nix diff --git a/home/tlrc.nix b/modules/home-manager/programs/tlrc.nix similarity index 100% rename from home/tlrc.nix rename to modules/home-manager/programs/tlrc.nix diff --git a/home/tmux/default.nix b/modules/home-manager/programs/tmux.nix similarity index 100% rename from home/tmux/default.nix rename to modules/home-manager/programs/tmux.nix diff --git a/home/wezterm.nix b/modules/home-manager/programs/wezterm.nix similarity index 100% rename from home/wezterm.nix rename to modules/home-manager/programs/wezterm.nix diff --git a/home/zoxide.nix b/modules/home-manager/programs/zoxide.nix similarity index 100% rename from home/zoxide.nix rename to modules/home-manager/programs/zoxide.nix diff --git a/modules/home.nix b/modules/home.nix deleted file mode 100644 index 5fbf391..0000000 --- a/modules/home.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: -{ - imports = [ - inputs.home-manager.nixosModules.home-manager - ]; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - verbose = true; - backupFileExtension = "hmbak"; - users.osbm = import ../home/home.nix { - inherit config pkgs; - # fuck you macos - username = "osbm"; - homeDirectory = "/home/osbm"; - inherit (config.system) stateVersion; - }; - }; -} diff --git a/modules/i18n.nix b/modules/i18n.nix deleted file mode 100644 index 6860e81..0000000 --- a/modules/i18n.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ pkgs, ... }: -{ - time.timeZone = "Europe/Istanbul"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "tr_TR.UTF-8"; - LC_IDENTIFICATION = "tr_TR.UTF-8"; - LC_MEASUREMENT = "tr_TR.UTF-8"; - LC_MONETARY = "tr_TR.UTF-8"; - LC_NAME = "tr_TR.UTF-8"; - LC_NUMERIC = "tr_TR.UTF-8"; - LC_PAPER = "tr_TR.UTF-8"; - LC_TELEPHONE = "tr_TR.UTF-8"; - LC_TIME = "ja_JP.UTF-8"; - # LC_ALL = "en_US.UTF-8"; - }; - - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; - - i18n.inputMethod = { - type = "fcitx5"; - enable = true; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-gtk - fcitx5-nord # a color theme - ]; - }; -} diff --git a/modules/nix-index.nix b/modules/nix-index.nix deleted file mode 100644 index 4970c07..0000000 --- a/modules/nix-index.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ inputs, ... }: -{ - imports = [ - inputs.nix-index-database.nixosModules.nix-index - ]; - programs.nix-index-database.comma.enable = true; - programs.command-not-found.enable = false; # TODO fix ts - -} diff --git a/modules/nix-settings.nix b/modules/nix-settings.nix deleted file mode 100644 index c848ff0..0000000 --- a/modules/nix-settings.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - inputs, - lib, - pkgs, - ... -}: -{ - # Allow unfree packages - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "vscode" # TODO: remove this - "discord" - "obsidian" - "steam" - "steam-unwrapped" - "open-webui" - "vscode-extension-github-copilot" - "spotify" - "cursor" - # nvidia related (i have to) - "nvidia-x11" - "cuda_cudart" - "libcublas" - "cuda_cccl" - "cuda_nvcc" - "nvidia-settings" - "cuda-merged" - ]; - nixpkgs.config.allowAliases = false; - - # enable nix flakes - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - # nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; - - nix.channel.enable = false; - - nix.registry = { - self.flake = inputs.self; - nixpkgs.flake = inputs.nixpkgs; - - # Commented out because i want to make sure it works if i switch a system - # to another nixpkgs with a different flake input name - # nixpkgs = { - # from = { type = "indirect"; id = "nixpkgs"; }; - # to = { - # path = pkgs.path; - # type = "path"; - # }; - # }; - - osbm-nvim.flake = inputs.osbm-nvim; - my-nixpkgs = { - from = { type = "indirect"; id = "my-nixpkgs"; }; - to = { - owner = "osbm"; - repo = "nixpkgs"; - type = "github"; - }; - }; - osbm-dev = { - from = { type = "indirect"; id = "osbm-dev"; }; - to = { - owner = "osbm"; - repo = "osbm.dev"; - type = "github"; - }; - }; - devshells = { - from = { type = "indirect"; id = "devshells"; }; - to = { - owner = "osbm"; - repo = "devshells"; - type = "github"; - }; - }; - }; - - nix.settings.trusted-users = [ - "root" - "osbm" - ]; - - nix.settings = { - substituters = [ - "https://nix-community.cachix.org" # nix-community cache - # "http://wallfacer.curl-boga.ts.net:7080/main" # personal attic cache - ]; - - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "main:2AjPdIsbKyoTGuw+4x2ZXMUT/353CXosW9pdbTQtjqw=" - ]; - }; - - nix.gc = { - automatic = true; - dates = "01:37"; - options = "--delete-older-than 7d"; - }; - - # nix.nixPath = ["nixpkgs=${pkgs.path}"]; - - system.configurationRevision = inputs.self.rev or "dirty"; -} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix new file mode 100644 index 0000000..7d125ae --- /dev/null +++ b/modules/nixos/default.nix @@ -0,0 +1,9 @@ +{ + imports = [ + ./options.nix + ./programs + ./hardware + ./services + ./system + ]; +} diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix new file mode 100644 index 0000000..e952fd7 --- /dev/null +++ b/modules/nixos/hardware/default.nix @@ -0,0 +1,9 @@ +{ + imports = [ + ./sound.nix + ./nvidia.nix + ./hibernation.nix + ./wake-on-lan.nix + ./disko.nix + ]; +} diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix new file mode 100644 index 0000000..64a71c3 --- /dev/null +++ b/modules/nixos/hardware/disko.nix @@ -0,0 +1,325 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.osbmModules.hardware.disko; + inherit (config.networking) hostName; + + # Default authorized keys for initrd SSH + defaultAuthorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDF1TFwXbqdC1UyG75q3HO1n7/L3yxpeRLIq2kQ9DalI" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHYSJ9ywFRJ747tkhvYWFkx/Y9SkLqv3rb7T1UuXVBWo" + ]; + + authorizedKeys = if cfg.initrd-ssh.authorizedKeys != [] + then cfg.initrd-ssh.authorizedKeys + else defaultAuthorizedKeys; +in +{ + config = lib.mkMerge [ + # Systemd-boot setup + (lib.mkIf (cfg.enable && cfg.systemd-boot) { + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + }) + + # Initrd SSH for remote unlocking + (lib.mkIf (cfg.enable && cfg.initrd-ssh.enable) { + boot.initrd.network.enable = true; + boot.initrd.availableKernelModules = cfg.initrd-ssh.ethernetDrivers; + boot.kernelParams = [ "ip=::::${hostName}-initrd::dhcp" ]; + boot.initrd.network.ssh = { + enable = true; + port = 22; + shell = "/bin/cryptsetup-askpass"; + authorizedKeys = authorizedKeys; + hostKeys = [ "/etc/ssh/initrd" ]; + }; + boot.initrd.secrets = { + "/etc/ssh/initrd" = "/etc/ssh/initrd"; + }; + }) + + # ZFS Configuration + (lib.mkIf (cfg.enable && cfg.zfs.enable) { + networking.hostId = cfg.zfs.hostID; + + environment.systemPackages = [ pkgs.zfs-prune-snapshots ]; + + boot = { + # ZFS does not support swapfiles + kernelParams = [ + "nohibernate" + "zfs.zfs_arc_max=17179869184" # 16GB ARC max + ]; + supportedFilesystems = [ "vfat" "zfs" ]; + zfs = { + devNodes = "/dev/disk/by-id/"; + forceImportAll = true; + requestEncryptionCredentials = cfg.zfs.root.encrypt; + }; + }; + + services.zfs = { + autoScrub.enable = true; + trim.enable = true; + }; + + # Disko configuration for ZFS + disko.devices = { + disk = lib.mkMerge [ + # Storage pool disks (if enabled and not reinstalling) + (lib.mkIf (cfg.zfs.storage.enable && !cfg.amReinstalling) ( + lib.mkMerge ( + map (diskname: { + "${diskname}" = { + type = "disk"; + device = "/dev/${diskname}"; + content = { + type = "gpt"; + partitions = { + luks = { + size = "100%"; + content = { + type = "luks"; + name = "stg${diskname}"; + settings.allowDiscards = true; + passwordFile = "/tmp/secret.key"; + content = { + type = "zfs"; + pool = "zstorage"; + }; + }; + }; + }; + }; + }; + }) cfg.zfs.storage.disks + ) + )) + + # Root disk 1 (primary) + { + one = lib.mkIf (cfg.zfs.root.disk1 != "") { + type = "disk"; + device = "/dev/${cfg.zfs.root.disk1}"; + content = { + type = "gpt"; + partitions = { + ESP = { + label = "EFI"; + name = "ESP"; + size = "2048M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "defaults" "umask=0077" ]; + }; + }; + + # Encrypted root partition + luks = lib.mkIf cfg.zfs.root.encrypt { + size = "100%"; + content = { + type = "luks"; + name = "crypted1"; + settings.allowDiscards = true; + passwordFile = "/tmp/secret.key"; + content = { + type = "zfs"; + pool = "zroot"; + }; + }; + }; + + # Unencrypted root partition + notluks = lib.mkIf (!cfg.zfs.root.encrypt) { + size = "100%"; + content = { + type = "zfs"; + pool = "zroot"; + }; + }; + }; + }; + }; + + # Root disk 2 (mirror) + two = lib.mkIf (cfg.zfs.root.disk2 != "") { + type = "disk"; + device = "/dev/${cfg.zfs.root.disk2}"; + content = { + type = "gpt"; + partitions = { + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted2"; + settings.allowDiscards = true; + passwordFile = "/tmp/secret.key"; + content = { + type = "zfs"; + pool = "zroot"; + }; + }; + }; + }; + }; + }; + } + ]; + + # ZFS pools + zpool = { + # Root pool + zroot = { + type = "zpool"; + mode = lib.mkIf cfg.zfs.root.mirror "mirror"; + rootFsOptions = { + canmount = "off"; + checksum = "edonr"; + compression = "zstd"; + dnodesize = "auto"; + mountpoint = "none"; + normalization = "formD"; + relatime = "on"; + "com.sun:auto-snapshot" = "false"; + }; + options = { + ashift = "12"; + autotrim = "on"; + }; + datasets = { + # Reserved space for ZFS CoW operations + reserved = { + type = "zfs_fs"; + options = { + canmount = "off"; + mountpoint = "none"; + reservation = cfg.zfs.root.reservation; + }; + }; + + # SSH keys dataset + etcssh = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + mountpoint = "/etc/ssh"; + options."com.sun:auto-snapshot" = "false"; + postCreateHook = "zfs snapshot zroot/etcssh@empty"; + }; + + # Persistent data + persist = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + mountpoint = "/persist"; + options."com.sun:auto-snapshot" = "false"; + postCreateHook = "zfs snapshot zroot/persist@empty"; + }; + + # Persistent save data + persistSave = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + mountpoint = "/persist/save"; + options."com.sun:auto-snapshot" = "false"; + postCreateHook = "zfs snapshot zroot/persistSave@empty"; + }; + + # Nix store + nix = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + mountpoint = "/nix"; + options = { + atime = "off"; + canmount = "on"; + "com.sun:auto-snapshot" = "false"; + }; + postCreateHook = "zfs snapshot zroot/nix@empty"; + }; + + # Root filesystem + root = { + type = "zfs_fs"; + options.mountpoint = "legacy"; + options."com.sun:auto-snapshot" = "false"; + mountpoint = "/"; + postCreateHook = "zfs snapshot zroot/root@empty"; + }; + }; + }; + + # Storage pool (if enabled and not reinstalling) + zstorage = lib.mkIf (cfg.zfs.storage.enable && !cfg.amReinstalling) { + type = "zpool"; + mode = lib.mkIf cfg.zfs.storage.mirror "mirror"; + rootFsOptions = { + canmount = "off"; + checksum = "edonr"; + compression = "zstd"; + dnodesize = "auto"; + mountpoint = "none"; + normalization = "formD"; + relatime = "on"; + "com.sun:auto-snapshot" = "false"; + }; + options = { + ashift = "12"; + autotrim = "on"; + }; + datasets = { + # Reserved space + reserved = { + type = "zfs_fs"; + options = { + canmount = "off"; + mountpoint = "none"; + reservation = cfg.zfs.storage.reservation; + }; + }; + + # Main storage + storage = { + type = "zfs_fs"; + mountpoint = "/storage"; + options = { + atime = "off"; + canmount = "on"; + "com.sun:auto-snapshot" = "false"; + }; + }; + + # Persistent save in storage + persistSave = { + type = "zfs_fs"; + mountpoint = "/storage/save"; + options = { + atime = "off"; + canmount = "on"; + "com.sun:auto-snapshot" = "false"; + }; + }; + }; + }; + }; + }; + + # Needed for agenix - SSH keys must be available before ZFS mounts + fileSystems."/etc/ssh".neededForBoot = true; + + # Needed for impermanence + fileSystems."/persist".neededForBoot = true; + fileSystems."/persist/save".neededForBoot = true; + }) + + # Impermanence: wipe root on boot + (lib.mkIf (cfg.enable && cfg.zfs.enable && cfg.zfs.root.impermanenceRoot) { + boot.initrd.postResumeCommands = lib.mkAfter '' + zfs rollback -r zroot/root@empty + ''; + }) + ]; +} diff --git a/modules/nixos/hardware/hibernation.nix b/modules/nixos/hardware/hibernation.nix new file mode 100644 index 0000000..6b5e247 --- /dev/null +++ b/modules/nixos/hardware/hibernation.nix @@ -0,0 +1,10 @@ +{ lib, config, ... }: +{ + config = lib.mkIf (!config.osbmModules.hardware.hibernation.enable) { + # Disable hibernation/suspend + systemd.targets.sleep.enable = false; + systemd.targets.suspend.enable = false; + systemd.targets.hibernate.enable = false; + systemd.targets.hybrid-sleep.enable = false; + }; +} diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix new file mode 100644 index 0000000..e010ea8 --- /dev/null +++ b/modules/nixos/hardware/nvidia.nix @@ -0,0 +1,33 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.hardware.nvidiaDriver.enable { + # Enable OpenGL + hardware.graphics = { + enable = true; + }; + + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = [ "nvidia" ]; + + hardware.nvidia = { + # Modesetting is required + modesetting.enable = true; + + # Nvidia power management + powerManagement.enable = false; + powerManagement.finegrained = false; + + # Use the open source kernel module + open = false; + + # Enable the Nvidia settings menu + nvidiaSettings = true; + + # Select appropriate driver version + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + + # Enable nvidia-container-toolkit if virtualization is enabled + hardware.nvidia-container-toolkit.enable = lib.mkIf config.osbmModules.virtualization.docker.enable true; + }; +} diff --git a/modules/nixos/hardware/sound.nix b/modules/nixos/hardware/sound.nix new file mode 100644 index 0000000..3a18a6f --- /dev/null +++ b/modules/nixos/hardware/sound.nix @@ -0,0 +1,20 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.hardware.sound.enable { + # Disable PulseAudio + services.pulseaudio.enable = false; + + # Enable rtkit for realtime audio + security.rtkit.enable = true; + + # Enable PipeWire + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications: + # jack.enable = true; + }; + }; +} diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix new file mode 100644 index 0000000..104647a --- /dev/null +++ b/modules/nixos/options.nix @@ -0,0 +1,364 @@ +{ lib, ... }: +{ + options.osbmModules = { + # Desktop Environment + desktopEnvironment = lib.mkOption { + type = lib.types.enum [ "plasma" "none" ]; + default = "none"; + description = "Which desktop environment to use"; + }; + + # Machine Type + machineType = lib.mkOption { + type = lib.types.enum [ "desktop" "laptop" "server" "embedded" "mobile" ]; + default = "server"; + description = "Type of machine for appropriate defaults"; + }; + + # Users + users = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ "osbm" "bayram" ]; + description = "List of users to create. `osbm` is my main user, and `bayram` is for my family."; + }; + + defaultUser = lib.mkOption { + type = lib.types.str; + default = "osbm"; + description = "Default user for the system"; + }; + + # Home Manager + homeManager = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable home-manager integration"; + }; + }; + + # Agenix + agenix = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable agenix for secrets management"; + }; + }; + + # Nix Settings + nixSettings = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable custom nix settings"; + }; + }; + + # Programs + programs = { + steam = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Steam gaming platform"; + }; + }; + + graphical = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable graphical applications"; + }; + }; + + commandLine = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable common command line tools"; + }; + }; + + neovim = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable neovim with custom configuration"; + }; + }; + + arduino = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Arduino IDE and development tools"; + }; + }; + + adbFastboot = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable ADB and Fastboot for Android development"; + }; + }; + }; + + # Services + services = { + openssh = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable OpenSSH server"; + }; + }; + + tailscale = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable Tailscale VPN"; + }; + }; + + syncthing.enable = lib.mkEnableOption "syncthing"; + jellyfin.enable = lib.mkEnableOption "jellyfin"; + nextcloud.enable = lib.mkEnableOption "nextcloud"; + vaultwarden.enable = lib.mkEnableOption "vaultwarden"; + ollama.enable = lib.mkEnableOption "ollama"; + forgejo.enable = lib.mkEnableOption "forgejo"; + caddy.enable = lib.mkEnableOption "caddy"; + attic.enable = lib.mkEnableOption "attic"; + cloudflared.enable = lib.mkEnableOption "cloudflared"; + cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns"; + glance.enable = lib.mkEnableOption "glance"; + hydra.enable = lib.mkEnableOption "hydra"; + vscode-server.enable = lib.mkEnableOption "vscode-server"; + }; + + # Hardware + hardware = { + sound = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable sound with pipewire"; + }; + }; + + nvidiaDriver = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable NVIDIA proprietary drivers"; + }; + }; + + hibernation = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable hibernation support"; + }; + }; + + wakeOnLan = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable wake-on-LAN support"; + }; + }; + + # Disko configuration (inspired by ZFS.nix) + disko = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable custom disk configuration with disko"; + }; + + amReinstalling = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Am I reinstalling and want to save the storage pool"; + }; + + fileSystem = lib.mkOption { + type = lib.types.enum [ "zfs" "ext4" ]; + default = "ext4"; + description = "Root filesystem type"; + }; + + systemd-boot = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Use systemd-boot bootloader"; + }; + + initrd-ssh = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable SSH in initrd for remote unlocking"; + }; + + authorizedKeys = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "SSH public keys for initrd access"; + }; + + ethernetDrivers = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Ethernet drivers to load in initrd"; + }; + }; + + zfs = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable ZFS filesystem"; + }; + + hostID = lib.mkOption { + type = lib.types.str; + default = ""; + description = "ZFS host ID (8 hex characters)"; + }; + + root = { + encrypt = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Encrypt root ZFS pool"; + }; + + disk1 = lib.mkOption { + type = lib.types.str; + default = ""; + description = "First disk device name (e.g., nvme0n1)"; + }; + + disk2 = lib.mkOption { + type = lib.types.str; + default = ""; + description = "Second disk device name for mirroring"; + }; + + reservation = lib.mkOption { + type = lib.types.str; + default = "20G"; + description = "ZFS reservation size"; + }; + + mirror = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Mirror the root ZFS pool"; + }; + + impermanenceRoot = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Wipe the root directory on boot (impermanence)"; + }; + }; + + storage = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable separate storage ZFS pool"; + }; + + disks = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "Storage pool disk device names"; + }; + + reservation = lib.mkOption { + type = lib.types.str; + default = "20G"; + description = "Storage pool ZFS reservation"; + }; + + mirror = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Mirror the storage ZFS pool"; + }; + }; + }; + }; + }; + + # Virtualization + virtualization = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable virtualization support (libvirt, docker, etc.)"; + }; + + docker = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Docker"; + }; + }; + + podman = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable Podman"; + }; + }; + + libvirt = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable libvirt/KVM"; + }; + }; + }; + + + + # Internationalization + i18n = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable internationalization settings"; + }; + }; + + # Fonts + fonts = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable custom fonts"; + }; + }; + + # Nix Index + nixIndex = { + enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Enable nix-index for command-not-found"; + }; + }; + }; +} diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix new file mode 100644 index 0000000..94c67c6 --- /dev/null +++ b/modules/nixos/programs/command-line.nix @@ -0,0 +1,48 @@ +{ pkgs, inputs, lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.programs.commandLine.enable { + environment.systemPackages = with pkgs; [ + wget + nano + git + lazygit + lazysql + git-lfs + gnumake + zip + fish + trash-cli + tmux + zoxide + htop + unzip + tlrc + btop + pciutils + cloc + neofetch + pfetch + inxi + jq + dig + onefetch + just + nixd + eza + gh + starship + tree + nix-output-monitor + yazi + ripgrep + nh + comma + nix-inspect + bat + fd + du-dust + duf + ncdu + ]; + }; +} diff --git a/modules/nixos/programs/default.nix b/modules/nixos/programs/default.nix new file mode 100644 index 0000000..f90fcd8 --- /dev/null +++ b/modules/nixos/programs/default.nix @@ -0,0 +1,10 @@ +{ + imports = [ + ./adb-fastboot.nix + ./arduino.nix + ./command-line.nix + ./graphical.nix + ./neovim.nix + ./steam.nix + ]; +} diff --git a/modules/nixos/programs/graphical.nix b/modules/nixos/programs/graphical.nix new file mode 100644 index 0000000..d388c0b --- /dev/null +++ b/modules/nixos/programs/graphical.nix @@ -0,0 +1,17 @@ +{ pkgs, lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.programs.graphical.enable { + environment.systemPackages = with pkgs; [ + mpv + gimp + inkscape + libreoffice + discord + telegram-desktop + obs-studio + blender + vscode + chromium + ]; + }; +} diff --git a/modules/nixos/programs/neovim.nix b/modules/nixos/programs/neovim.nix new file mode 100644 index 0000000..2814441 --- /dev/null +++ b/modules/nixos/programs/neovim.nix @@ -0,0 +1,8 @@ +{ lib, inputs, config, pkgs, ... }: +{ + config = lib.mkIf config.osbmModules.programs.neovim.enable { + environment.systemPackages = [ + inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default + ]; + }; +} diff --git a/modules/nixos/programs/steam.nix b/modules/nixos/programs/steam.nix new file mode 100644 index 0000000..94dbeae --- /dev/null +++ b/modules/nixos/programs/steam.nix @@ -0,0 +1,14 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.programs.steam.enable { + programs.steam = { + enable = true; + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; + }; + }; +} diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix new file mode 100644 index 0000000..e363f71 --- /dev/null +++ b/modules/nixos/system/agenix.nix @@ -0,0 +1,10 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.agenix.enable { + # Agenix will be configured via the agenix input + # This module exists to enable agenix-related configurations + age.identityPaths = lib.mkDefault [ + "/etc/ssh/ssh_host_ed25519_key" + ]; + }; +} diff --git a/modules/nixos/system/concentration.nix b/modules/nixos/system/concentration.nix new file mode 100644 index 0000000..7212310 --- /dev/null +++ b/modules/nixos/system/concentration.nix @@ -0,0 +1,34 @@ +{ lib, config, ... }: +let + cfg = config.osbmModules.concentration; + + blockedSites = lib.flatten [ + (lib.optional cfg.blockYoutube [ + "youtube.com" + "www.youtube.com" + "m.youtube.com" + "youtu.be" + ]) + (lib.optional cfg.blockTwitter [ + "twitter.com" + "www.twitter.com" + "x.com" + "www.x.com" + "mobile.twitter.com" + "mobile.x.com" + ]) + (lib.optional cfg.blockBluesky [ + "bsky.app" + "www.bsky.app" + "bluesky.app" + "www.bluesky.app" + ]) + ]; + + hostsEntries = lib.concatMapStrings (site: "127.0.0.1 ${site}\n") blockedSites; +in +{ + config = lib.mkIf (blockedSites != []) { + networking.extraHosts = hostsEntries; + }; +} diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix new file mode 100644 index 0000000..34c6a5c --- /dev/null +++ b/modules/nixos/system/default.nix @@ -0,0 +1,17 @@ +{ + imports = [ + ./users.nix + ./desktop-environment.nix + ./nix-settings.nix + ./agenix.nix + ./home-manager.nix + ./virtualization.nix + ./emulation.nix + ./concentration.nix + ./remote-builds.nix + ./i18n.nix + ./fonts.nix + ./security.nix + ./nix-index.nix + ]; +} diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix new file mode 100644 index 0000000..e84e89f --- /dev/null +++ b/modules/nixos/system/desktop-environment.nix @@ -0,0 +1,63 @@ +{ pkgs, lib, config, ... }: +let + cfg = config.osbmModules; +in +{ + config = lib.mkMerge [ + # Plasma Desktop Environment + (lib.mkIf (cfg.desktopEnvironment == "plasma") { + services.xserver.enable = true; + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + + environment.plasma6.excludePackages = with pkgs.kdePackages; [ + kate + konsole + ]; + + # Enable printing + services.printing.enable = true; + + # Enable Bluetooth + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + + # Desktop packages + environment.systemPackages = with pkgs; [ + alacritty + ghostty + obsidian + mpv + kitty + qbittorrent + element-desktop + ]; + + # Wayland support + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + }) + + # GNOME Desktop Environment + (lib.mkIf (cfg.desktopEnvironment == "gnome") { + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Enable printing + services.printing.enable = true; + + # Enable Bluetooth + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + }) + + # Common settings for any desktop environment + (lib.mkIf (cfg.desktopEnvironment != "none") { + # Enable X11 keymap + services.xserver.xkb = { + layout = lib.mkDefault "us"; + variant = lib.mkDefault ""; + }; + }) + ]; +} diff --git a/modules/nixos/system/emulation.nix b/modules/nixos/system/emulation.nix new file mode 100644 index 0000000..205474a --- /dev/null +++ b/modules/nixos/system/emulation.nix @@ -0,0 +1,7 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.emulation.aarch64.enable { + # Enable binfmt for aarch64 emulation + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + }; +} diff --git a/modules/nixos/system/fonts.nix b/modules/nixos/system/fonts.nix new file mode 100644 index 0000000..b8f68fe --- /dev/null +++ b/modules/nixos/system/fonts.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.fonts.enable { + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + proggyfonts + jetbrains-mono + (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Iosevka" ]; }) + ]; + + fonts.fontconfig = { + defaultFonts = { + serif = [ "Noto Serif" ]; + sansSerif = [ "Noto Sans" ]; + monospace = [ "JetBrainsMono Nerd Font" "Fira Code" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + }; +} diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix new file mode 100644 index 0000000..3a1e8db --- /dev/null +++ b/modules/nixos/system/home-manager.nix @@ -0,0 +1,21 @@ +{ lib, config, inputs, ... }: +let + cfg = config.osbmModules; +in +{ + config = lib.mkIf (cfg.homeManager.enable && inputs ? home-manager) { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + # Pass inputs and outputs to home-manager modules + extraSpecialArgs = { inherit inputs; }; + + # Configure home-manager for each user + users = lib.genAttrs cfg.users (username: { + home.stateVersion = lib.mkDefault "24.05"; + imports = [ ../../home-manager ]; + }); + }; + }; +} diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix new file mode 100644 index 0000000..8a127d5 --- /dev/null +++ b/modules/nixos/system/i18n.nix @@ -0,0 +1,22 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.i18n.enable { + # Set your time zone + time.timeZone = lib.mkDefault "Europe/Istanbul"; + + # Select internationalisation properties + i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; + + i18n.extraLocaleSettings = lib.mkDefault { + LC_ADDRESS = "tr_TR.UTF-8"; + LC_IDENTIFICATION = "tr_TR.UTF-8"; + LC_MEASUREMENT = "tr_TR.UTF-8"; + LC_MONETARY = "tr_TR.UTF-8"; + LC_NAME = "tr_TR.UTF-8"; + LC_NUMERIC = "tr_TR.UTF-8"; + LC_PAPER = "tr_TR.UTF-8"; + LC_TELEPHONE = "tr_TR.UTF-8"; + LC_TIME = "tr_TR.UTF-8"; + }; + }; +} diff --git a/modules/nixos/system/nix-index.nix b/modules/nixos/system/nix-index.nix new file mode 100644 index 0000000..17e4ca2 --- /dev/null +++ b/modules/nixos/system/nix-index.nix @@ -0,0 +1,7 @@ +{ lib, config, inputs, ... }: +{ + config = lib.mkIf (config.osbmModules.nixIndex.enable && inputs ? nix-index-database) { + programs.nix-index-database.comma.enable = true; + programs.command-not-found.enable = false; + }; +} diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix new file mode 100644 index 0000000..749c59a --- /dev/null +++ b/modules/nixos/system/nix-settings.nix @@ -0,0 +1,78 @@ +{ inputs, lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.nixSettings.enable { + # Allow unfree packages + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "vscode" + "discord" + "obsidian" + "steam" + "steam-unwrapped" + "open-webui" + "vscode-extension-github-copilot" + "spotify" + "cursor" + # NVIDIA related + "nvidia-x11" + "cuda_cudart" + "libcublas" + "cuda_cccl" + "cuda_nvcc" + "nvidia-settings" + "cuda-merged" + ]; + + nixpkgs.config.allowAliases = false; + + # Enable Nix flakes + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + + nix.channel.enable = false; + + # Nix registry configuration + nix.registry = lib.mkIf (inputs ? self && inputs ? nixpkgs) { + self.flake = inputs.self; + nixpkgs.flake = inputs.nixpkgs; + osbm-nvim = lib.mkIf (inputs ? osbm-nvim) { + flake = inputs.osbm-nvim; + }; + }; + + # Trusted users + nix.settings.trusted-users = [ + "root" + config.osbmModules.defaultUser + ]; + + # Binary cache configuration + nix.settings = { + substituters = [ + "https://nix-community.cachix.org" + ]; + + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; + + # Garbage collection + nix.gc = { + automatic = lib.mkDefault true; + dates = lib.mkDefault "weekly"; + options = lib.mkDefault "--delete-older-than 7d"; + }; + + # Optimize store automatically + nix.settings.auto-optimise-store = lib.mkDefault true; + + # Environment variables + environment.variables = { + EDITOR = lib.mkDefault "nvim"; + VISUAL = lib.mkDefault "nvim"; + }; + }; +} diff --git a/modules/nixos/system/remote-builds.nix b/modules/nixos/system/remote-builds.nix new file mode 100644 index 0000000..eb7807c --- /dev/null +++ b/modules/nixos/system/remote-builds.nix @@ -0,0 +1,9 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.remoteBuild.enable { + # Remote build configuration + # This should be customized per-host + nix.buildMachines = lib.mkDefault []; + nix.distributedBuilds = lib.mkDefault true; + }; +} diff --git a/modules/nixos/system/security.nix b/modules/nixos/system/security.nix new file mode 100644 index 0000000..5662781 --- /dev/null +++ b/modules/nixos/system/security.nix @@ -0,0 +1,12 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.osbmModules.security.enable { + # Security hardening + security.sudo.wheelNeedsPassword = lib.mkDefault true; + + # Polkit for privilege escalation + security.polkit.enable = lib.mkDefault true; + + # Additional security settings can be added here + }; +} diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix new file mode 100644 index 0000000..07f37a2 --- /dev/null +++ b/modules/nixos/system/users.nix @@ -0,0 +1,32 @@ +{ lib, config, ... }: +let + cfg = config.osbmModules; +in +{ + config = lib.mkIf (cfg.users != []) { + users.users = lib.mkMerge [ + # Create users based on the list + (lib.genAttrs cfg.users (username: { + isNormalUser = true; + description = username; + extraGroups = [ "networkmanager" ] + ++ lib.optional (username == cfg.defaultUser) "wheel" + ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" + ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; + })) + + # Additional configuration for default user + { + ${cfg.defaultUser} = { + openssh.authorizedKeys.keys = lib.mkDefault [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" + ]; + }; + } + ]; + + # Set default shell + users.defaultUserShell = lib.mkDefault config.pkgs.fish; + programs.fish.enable = lib.mkDefault true; + }; +} diff --git a/modules/nixos/system/virtualization.nix b/modules/nixos/system/virtualization.nix new file mode 100644 index 0000000..cbf4142 --- /dev/null +++ b/modules/nixos/system/virtualization.nix @@ -0,0 +1,28 @@ +{ lib, config, ... }: +let + cfg = config.osbmModules.virtualization; +in +{ + config = lib.mkMerge [ + # Docker + (lib.mkIf cfg.docker.enable { + virtualisation.docker.enable = true; + virtualisation.docker.storageDriver = lib.mkDefault "overlay2"; + }) + + # Podman + (lib.mkIf cfg.podman.enable { + virtualisation.podman = { + enable = true; + dockerCompat = lib.mkDefault true; + defaultNetwork.settings.dns_enabled = true; + }; + }) + + # Libvirt/KVM + (lib.mkIf cfg.libvirt.enable { + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; + }) + ]; +} diff --git a/modules/remote-builds.nix b/modules/remote-builds.nix deleted file mode 100644 index 901d928..0000000 --- a/modules/remote-builds.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - config, - outputs, - lib, - ... -}: -{ - config = lib.mkMerge [ - (lib.mkIf (config.networking.hostName == "pochita") { - nix.distributedBuilds = true; - # nix.settings.builders-use-substitutes = true; - nix.buildMachines = [ - { - hostName = "ymir"; - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; - supportedFeatures = outputs.nixosConfigurations.ymir.config.nix.settings.system-features; - sshKey = config.age.secrets.ssh-key-private.path; - sshUser = "osbm"; - protocol = "ssh-ng"; - } - { - hostName = "wallfacer"; - systems = [ "x86_64-linux" ]; - supportedFeatures = outputs.nixosConfigurations.wallfacer.config.nix.settings.system-features; - sshKey = config.age.secrets.ssh-key-private.path; - sshUser = "osbm"; - protocol = "ssh-ng"; - } - ]; - }) - ]; -} diff --git a/modules/secrets.nix b/modules/secrets.nix deleted file mode 100644 index f8a0843..0000000 --- a/modules/secrets.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - config, - pkgs, - inputs, - lib, - ... -}: -{ - imports = [ - inputs.agenix.nixosModules.default - ]; - options = { - myModules.enableSecrets = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Enable agenix secrets management"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableSecrets { - environment.systemPackages = [ - inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix - pkgs.age - ]; - - age.secrets = { - network-manager.file = ../secrets/network-manager.age; - ssh-key-private = { - file = ../secrets/ssh-key-private.age; - path = "/home/osbm/.ssh/id_ed25519"; - owner = "osbm"; - group = "users"; - mode = "600"; - }; - ssh-key-public = { - file = ../secrets/ssh-key-public.age; - path = "/home/osbm/.ssh/id_ed25519.pub"; - owner = "osbm"; - group = "users"; - mode = "644"; - }; - }; - }) - ]; -} diff --git a/modules/security.nix b/modules/security.nix deleted file mode 100644 index 980f102..0000000 --- a/modules/security.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - security.sudo.extraConfig = '' - Defaults timestamp_timeout=30 - ''; -} diff --git a/modules/sound.nix b/modules/sound.nix deleted file mode 100644 index deb119d..0000000 --- a/modules/sound.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - config, - ... -}: -{ - options = { - myModules.enableSound = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable sound with pipewire."; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableFonts { - # Enable sound with pipewire. - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - }) - ]; -} diff --git a/modules/users.nix b/modules/users.nix deleted file mode 100644 index 1858987..0000000 --- a/modules/users.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, config, ... }: -{ - options = { - myModules.setUsers = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Enable user management."; - }; - }; - - config = lib.mkIf config.myModules.setUsers { - users.users = { - osbm = { - isNormalUser = true; - description = "osbm"; - initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; - extraGroups = [ - "networkmanager" - "wheel" - "docker" - ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" - ]; - packages = [ - ]; - }; - bayram = { - isNormalUser = true; - description = "bayram"; - initialHashedPassword = "$6$IamAbigfailure$3BP231DVwbqUtZ.mq33nM/JitBrT2u26Y25VpsfBwhZbezMHz4XbySrOMnaMcCYdsb3wZFL3Ppcp0L.R8nonT."; - extraGroups = [ "networkmanager" ]; - packages = [ - ]; - }; - root.initialHashedPassword = "$6$IamAbigfailure$irfkAsWev8CMAr78wUwUggclplXL98sbI21fpGY9nMDz47bU88RZWFLO7FcN5SdRA18ZSidkMqS76uLCMH68f."; - }; - }; -} diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix deleted file mode 100644 index a878015..0000000 --- a/modules/virtualisation.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - virtualisation.docker.enable = true; -} diff --git a/modules/wake-on-lan.nix b/modules/wake-on-lan.nix deleted file mode 100644 index 4a0f955..0000000 --- a/modules/wake-on-lan.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - options = { - myModules.enableWakeOnLan = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Wake on LAN"; - }; - }; - - config = lib.mkMerge [ - (lib.mkIf config.myModules.enableWakeOnLan { - networking.interfaces.enp3s0.wakeOnLan.enable = true; - # The services doesn't actually work atm, define an additional service - # see https://github.com/NixOS/nixpkgs/issues/91352 - systemd.services.wakeonlan = { - description = "Reenable wake on lan every boot"; - after = [ "network.target" ]; - serviceConfig = { - Type = "simple"; - RemainAfterExit = "true"; - ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp3s0 wol g"; - }; - wantedBy = [ "default.target" ]; - }; - }) - ]; -} From f1db3fcdfddc2059e2980fc51bebe028f4e20b78 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 16:53:34 +0300 Subject: [PATCH 1382/1768] update --- hosts/nixos/harmonica-sd/configuration.nix | 2 +- hosts/nixos/harmonica/configuration.nix | 2 +- hosts/nixos/pochita/configuration.nix | 2 +- hosts/nixos/tartarus/configuration.nix | 2 +- hosts/nixos/wallfacer/configuration.nix | 2 +- hosts/nixos/ymir/configuration.nix | 2 +- modules/default.nix | 7 ++++++ modules/nixos/hardware/wakeOnLan.nix | 25 ++++++++++++++++++++++ 8 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 modules/default.nix create mode 100644 modules/nixos/hardware/wakeOnLan.nix diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index 13683b2..238d2c8 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -8,7 +8,7 @@ ./sd-image.nix "${inputs.nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" ./hardware-configuration.nix - ../../../modules + ../../../modules/nixos ]; osbmModules = { diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index ea6b6a7..61ae7e1 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -6,7 +6,7 @@ { imports = [ ./hardware-configuration.nix - ../../../modules + ../../../modules/nixos ]; osbmModules = { diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 1895e48..048a3eb 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -7,7 +7,7 @@ { imports = [ ./hardware-configuration.nix - ../../../modules + ../../../modules/nixos inputs.raspberry-pi-nix.nixosModules.raspberry-pi inputs.nixos-hardware.nixosModules.raspberry-pi-5 ]; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 6877026..b39e53d 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -7,7 +7,7 @@ { imports = [ ./hardware-configuration.nix - ../../../modules + ../../../modules/nixos ]; osbmModules = { diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index ebd5959..c7eb70a 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -2,7 +2,7 @@ { imports = [ ./hardware-configuration.nix - ../../../modules + ../../../modules/nixos ]; osbmModules = { enableKDE = false; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index b8fe661..2dfff76 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -6,7 +6,7 @@ { imports = [ ./hardware-configuration.nix - ../../../modules + ../../../modules/nixos ]; osbmModules = { diff --git a/modules/default.nix b/modules/default.nix new file mode 100644 index 0000000..c3bdd53 --- /dev/null +++ b/modules/default.nix @@ -0,0 +1,7 @@ +# Main module entry point +# Import the new NixOS module system +{ + imports = [ + ./nixos + ]; +} diff --git a/modules/nixos/hardware/wakeOnLan.nix b/modules/nixos/hardware/wakeOnLan.nix new file mode 100644 index 0000000..b6bfaa9 --- /dev/null +++ b/modules/nixos/hardware/wakeOnLan.nix @@ -0,0 +1,25 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + config = lib.mkMerge [ + (lib.mkIf config.osbmModules.hardware.wakeOnLan.enable { + networking.interfaces.enp3s0.wakeOnLan.enable = true; + # The services doesn't actually work atm, define an additional service + # see https://github.com/NixOS/nixpkgs/issues/91352 + systemd.services.wakeonlan = { + description = "Reenable wake on lan every boot"; + after = [ "network.target" ]; + serviceConfig = { + Type = "simple"; + RemainAfterExit = "true"; + ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp3s0 wol g"; + }; + wantedBy = [ "default.target" ]; + }; + }) + ]; +} From f5d6d62278dba3f7fbcc6152db68389bc3263c2c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 16:53:45 +0300 Subject: [PATCH 1383/1768] u --- modules/nixos/system/security.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/system/security.nix b/modules/nixos/system/security.nix index 5662781..9c78955 100644 --- a/modules/nixos/system/security.nix +++ b/modules/nixos/system/security.nix @@ -3,10 +3,10 @@ config = lib.mkIf config.osbmModules.security.enable { # Security hardening security.sudo.wheelNeedsPassword = lib.mkDefault true; - + # Polkit for privilege escalation security.polkit.enable = lib.mkDefault true; - + # Additional security settings can be added here }; } From adc642f3ca9d5cc006f603ccf0c79e60fce95714 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 16:53:48 +0300 Subject: [PATCH 1384/1768] u --- modules/nixos/system/home-manager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 3a1e8db..23cc86c 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -7,10 +7,10 @@ in home-manager = { useGlobalPkgs = true; useUserPackages = true; - + # Pass inputs and outputs to home-manager modules extraSpecialArgs = { inherit inputs; }; - + # Configure home-manager for each user users = lib.genAttrs cfg.users (username: { home.stateVersion = lib.mkDefault "24.05"; From ac473d06bce6277d02f073f28a34b76ac5806152 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 16:53:50 +0300 Subject: [PATCH 1385/1768] u --- modules/nixos/system/concentration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/system/concentration.nix b/modules/nixos/system/concentration.nix index 7212310..bf8831f 100644 --- a/modules/nixos/system/concentration.nix +++ b/modules/nixos/system/concentration.nix @@ -1,7 +1,7 @@ { lib, config, ... }: let cfg = config.osbmModules.concentration; - + blockedSites = lib.flatten [ (lib.optional cfg.blockYoutube [ "youtube.com" @@ -24,7 +24,7 @@ let "www.bluesky.app" ]) ]; - + hostsEntries = lib.concatMapStrings (site: "127.0.0.1 ${site}\n") blockedSites; in { From 477b1c03ad1ce20e1d738ea7b2f41751c07a32bf Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 16:53:56 +0300 Subject: [PATCH 1386/1768] wake --- modules/nixos/programs/command-line.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index 94c67c6..1715446 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -42,7 +42,10 @@ fd du-dust duf - ncdu + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') ]; }; } From c42c5e33633d5a9b98cda933c1acb64d89a64b81 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 18:38:56 +0300 Subject: [PATCH 1387/1768] simpler --- hosts/nixos/harmonica-sd/configuration.nix | 2 -- hosts/nixos/harmonica/configuration.nix | 2 -- hosts/nixos/pochita/configuration.nix | 2 -- hosts/nixos/tartarus/configuration.nix | 3 -- hosts/nixos/ymir/configuration.nix | 3 -- modules/nixos/system/concentration.nix | 34 ---------------------- modules/nixos/system/default.nix | 2 -- modules/nixos/system/security.nix | 12 -------- 8 files changed, 60 deletions(-) delete mode 100644 modules/nixos/system/concentration.nix delete mode 100644 modules/nixos/system/security.nix diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index 238d2c8..e3b2acd 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -14,8 +14,6 @@ osbmModules = { enableKDE = false; enableFonts = false; - blockYoutube = false; - blockTwitter = false; enableTailscale = true; }; diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 61ae7e1..32838b7 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -12,8 +12,6 @@ osbmModules = { enableKDE = false; enableFonts = false; - blockYoutube = false; - blockTwitter = false; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 048a3eb..c6b4090 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -15,8 +15,6 @@ osbmModules = { enableKDE = false; enableFonts = false; - blockYoutube = false; - blockTwitter = false; enableForgejo = true; # enableCaddy = true; # enableCloudflareDyndns = true; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index b39e53d..9034e15 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -11,9 +11,6 @@ ]; osbmModules = { - blockYoutube = false; - blockTwitter = true; - blockBluesky = false; enableKDE = true; enableAarch64Emulation = true; enableSound = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 2dfff76..bcaeb00 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -10,9 +10,6 @@ ]; osbmModules = { - blockYoutube = false; - blockTwitter = true; - blockBluesky = false; enableKDE = true; enableJellyfin = true; enableAarch64Emulation = true; diff --git a/modules/nixos/system/concentration.nix b/modules/nixos/system/concentration.nix deleted file mode 100644 index bf8831f..0000000 --- a/modules/nixos/system/concentration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, config, ... }: -let - cfg = config.osbmModules.concentration; - - blockedSites = lib.flatten [ - (lib.optional cfg.blockYoutube [ - "youtube.com" - "www.youtube.com" - "m.youtube.com" - "youtu.be" - ]) - (lib.optional cfg.blockTwitter [ - "twitter.com" - "www.twitter.com" - "x.com" - "www.x.com" - "mobile.twitter.com" - "mobile.x.com" - ]) - (lib.optional cfg.blockBluesky [ - "bsky.app" - "www.bsky.app" - "bluesky.app" - "www.bluesky.app" - ]) - ]; - - hostsEntries = lib.concatMapStrings (site: "127.0.0.1 ${site}\n") blockedSites; -in -{ - config = lib.mkIf (blockedSites != []) { - networking.extraHosts = hostsEntries; - }; -} diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index 34c6a5c..ab262cb 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -7,11 +7,9 @@ ./home-manager.nix ./virtualization.nix ./emulation.nix - ./concentration.nix ./remote-builds.nix ./i18n.nix ./fonts.nix - ./security.nix ./nix-index.nix ]; } diff --git a/modules/nixos/system/security.nix b/modules/nixos/system/security.nix deleted file mode 100644 index 9c78955..0000000 --- a/modules/nixos/system/security.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, config, ... }: -{ - config = lib.mkIf config.osbmModules.security.enable { - # Security hardening - security.sudo.wheelNeedsPassword = lib.mkDefault true; - - # Polkit for privilege escalation - security.polkit.enable = lib.mkDefault true; - - # Additional security settings can be added here - }; -} From 852a363b04c1714fa5534a839e2f0f7c0e861998 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 18:39:02 +0300 Subject: [PATCH 1388/1768] simpler --- modules/nixos/system/home-manager.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 23cc86c..a399245 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -1,9 +1,11 @@ { lib, config, inputs, ... }: -let - cfg = config.osbmModules; -in + { - config = lib.mkIf (cfg.homeManager.enable && inputs ? home-manager) { + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; + + config = lib.mkIf (config.osbmModules.homeManager.enable && inputs ? home-manager) { home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -12,7 +14,7 @@ in extraSpecialArgs = { inherit inputs; }; # Configure home-manager for each user - users = lib.genAttrs cfg.users (username: { + users = lib.genAttrs config.osbmModules.users (username: { home.stateVersion = lib.mkDefault "24.05"; imports = [ ../../home-manager ]; }); From 7dfddb9fee72c83897b16e5fabde50255d38c05c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 18:39:05 +0300 Subject: [PATCH 1389/1768] fix --- modules/nixos/system/agenix.nix | 34 +++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix index e363f71..4630856 100644 --- a/modules/nixos/system/agenix.nix +++ b/modules/nixos/system/agenix.nix @@ -1,10 +1,32 @@ -{ lib, config, ... }: +{ lib, pkgs, inputs, config, ... }: { + imports = [ + inputs.agenix.nixosModules.default + ]; + config = lib.mkIf config.osbmModules.agenix.enable { - # Agenix will be configured via the agenix input - # This module exists to enable agenix-related configurations - age.identityPaths = lib.mkDefault [ - "/etc/ssh/ssh_host_ed25519_key" - ]; + environment.systemPackages = [ + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix + pkgs.age + ]; + + age.secrets = { + network-manager.file = ../secrets/network-manager.age; + ssh-key-private = { + file = ../secrets/ssh-key-private.age; + path = "/home/osbm/.ssh/id_ed25519"; + owner = "osbm"; + group = "users"; + mode = "600"; + }; + ssh-key-public = { + file = ../secrets/ssh-key-public.age; + path = "/home/osbm/.ssh/id_ed25519.pub"; + owner = "osbm"; + group = "users"; + mode = "644"; + }; + }; + }; } From 77b362b48e4caa0307fc26d86aa97dd9478ca828 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 18:39:10 +0300 Subject: [PATCH 1390/1768] fix disko --- modules/nixos/hardware/disko.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix index 64a71c3..74a23a3 100644 --- a/modules/nixos/hardware/disko.nix +++ b/modules/nixos/hardware/disko.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: let cfg = config.osbmModules.hardware.disko; inherit (config.networking) hostName; @@ -14,6 +14,10 @@ let else defaultAuthorizedKeys; in { + imports = [ + inputs.disko.nixosModules.default + ]; + config = lib.mkMerge [ # Systemd-boot setup (lib.mkIf (cfg.enable && cfg.systemd-boot) { From 7417258623d89d4c3cae902dfb4f7b5908bcda95 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 18:39:17 +0300 Subject: [PATCH 1391/1768] fix module name --- modules/nixos/hardware/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix index e952fd7..d8c30a8 100644 --- a/modules/nixos/hardware/default.nix +++ b/modules/nixos/hardware/default.nix @@ -3,7 +3,7 @@ ./sound.nix ./nvidia.nix ./hibernation.nix - ./wake-on-lan.nix + ./wakeOnLan.nix ./disko.nix ]; } From 055f0b066139e4018b287253d663882ab0cbc1aa Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 20:48:26 +0300 Subject: [PATCH 1392/1768] fix --- modules/nixos/programs/command-line.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index 1715446..a01666a 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, lib, config, ... }: +{ pkgs, lib, config, ... }: { config = lib.mkIf config.osbmModules.programs.commandLine.enable { environment.systemPackages = with pkgs; [ @@ -40,7 +40,7 @@ nix-inspect bat fd - du-dust + dust duf (pkgs.writeShellScriptBin "wake-ymir" '' echo waking up ymir From 8b6046e64c151c55f241b763e26ad6f745ab99cc Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 20:48:39 +0300 Subject: [PATCH 1393/1768] remote builds --- modules/nixos/system/default.nix | 1 - modules/nixos/system/remote-builds.nix | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 modules/nixos/system/remote-builds.nix diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index ab262cb..41e2cfe 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -7,7 +7,6 @@ ./home-manager.nix ./virtualization.nix ./emulation.nix - ./remote-builds.nix ./i18n.nix ./fonts.nix ./nix-index.nix diff --git a/modules/nixos/system/remote-builds.nix b/modules/nixos/system/remote-builds.nix deleted file mode 100644 index eb7807c..0000000 --- a/modules/nixos/system/remote-builds.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, config, ... }: -{ - config = lib.mkIf config.osbmModules.remoteBuild.enable { - # Remote build configuration - # This should be customized per-host - nix.buildMachines = lib.mkDefault []; - nix.distributedBuilds = lib.mkDefault true; - }; -} From ecabe3fca59acd8270c4aafeb1bf248cd75682cf Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 20:48:46 +0300 Subject: [PATCH 1394/1768] no default shell --- modules/nixos/system/users.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index 07f37a2..dfc3b40 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -25,8 +25,5 @@ in } ]; - # Set default shell - users.defaultUserShell = lib.mkDefault config.pkgs.fish; - programs.fish.enable = lib.mkDefault true; }; } From ddd2d05c433749bab51a467a6d23f26d1fddd603 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 20:49:04 +0300 Subject: [PATCH 1395/1768] nix index --- modules/nixos/system/nix-index.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/nixos/system/nix-index.nix b/modules/nixos/system/nix-index.nix index 17e4ca2..87b1fb6 100644 --- a/modules/nixos/system/nix-index.nix +++ b/modules/nixos/system/nix-index.nix @@ -1,5 +1,9 @@ { lib, config, inputs, ... }: { + imports = [ + inputs.nix-index-database.nixosModules.nix-index + ]; + config = lib.mkIf (config.osbmModules.nixIndex.enable && inputs ? nix-index-database) { programs.nix-index-database.comma.enable = true; programs.command-not-found.enable = false; From c48f9a1fd5a36098940e1e64a5c706a0be9d3c26 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 20:49:11 +0300 Subject: [PATCH 1396/1768] nvim --- modules/nixos/system/nix-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 749c59a..e8489b1 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -71,8 +71,8 @@ # Environment variables environment.variables = { - EDITOR = lib.mkDefault "nvim"; - VISUAL = lib.mkDefault "nvim"; + EDITOR = "nvim"; + VISUAL = "nvim"; }; }; } From 95c05ba9e44b71d78077751060016049679cc508 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 21:01:08 +0300 Subject: [PATCH 1397/1768] no flake error --- flake.nix | 66 +++++----- hosts/nixos/apollo/configuration.nix | 137 ++++++++------------- hosts/nixos/harmonica-sd/configuration.nix | 6 +- hosts/nixos/harmonica/configuration.nix | 4 +- hosts/nixos/pochita/configuration.nix | 16 +-- hosts/nixos/tartarus/configuration.nix | 6 +- hosts/nixos/wallfacer/configuration.nix | 14 +-- hosts/nixos/ymir/configuration.nix | 17 ++- modules/nixos/options.nix | 11 +- modules/nixos/system/home-manager.nix | 6 +- modules/nixos/system/users.nix | 8 +- 11 files changed, 133 insertions(+), 158 deletions(-) diff --git a/flake.nix b/flake.nix index 7947330..db4a9c2 100644 --- a/flake.nix +++ b/flake.nix @@ -93,38 +93,38 @@ }; lib = import ./lib { inherit (nixpkgs) lib; }; formatter = forAllSystems (system: (makePkgs system).nixfmt-tree); - deploy.nodes.harmonica = { - hostname = "192.168.0.11"; - profiles.system = { - user = "osbm"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; - }; - }; - packages = forAllSystems ( - system: - let - makeNixosConfigWithSystemOverride = - configName: - nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./hosts/nixos/${configName}/configuration.nix - { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; } - ]; - }; - dotfilesMachineNames = [ - "ymir" - "pochita" - "tartarus" - "wallfacer" - ]; - in - builtins.listToAttrs ( - map (name: { - name = "${name}-dotfiles"; - value = (makeNixosConfigWithSystemOverride name).config.home-manager.users.osbm.home-files; - }) dotfilesMachineNames - ) - ); + # deploy.nodes.harmonica = { + # hostname = "192.168.0.11"; + # profiles.system = { + # user = "osbm"; + # path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; + # }; + # }; + # packages = forAllSystems ( + # system: + # let + # makeNixosConfigWithSystemOverride = + # configName: + # nixpkgs.lib.nixosSystem { + # specialArgs = { inherit inputs outputs; }; + # modules = [ + # ./hosts/nixos/${configName}/configuration.nix + # { nixpkgs.hostPlatform = nixpkgs.lib.mkForce system; } + # ]; + # }; + # dotfilesMachineNames = [ + # "ymir" + # "pochita" + # "tartarus" + # "wallfacer" + # ]; + # in + # builtins.listToAttrs ( + # map (name: { + # name = "${name}-dotfiles"; + # value = (makeNixosConfigWithSystemOverride name).config.home-manager.users.osbm.home-files; + # }) dotfilesMachineNames + # ) + # ); }; } diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index d6f26e2..b9afc97 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -6,106 +6,68 @@ { imports = [ ./hardware-configuration.nix - ../../../modules/common-packages.nix - # ../../modules/services/tailscale.nix - # ../../modules/services/openssh.nix - ../../../modules/nix-settings.nix + ../../../modules/nixos inputs.disko.nixosModules.disko inputs.impermanence.nixosModules.impermanence ]; - # osbmModules = { - # enableKDE = false; - # enableFonts = false; - # blockYoutube = false; - # blockTwitter = false; - # }; + osbmModules = { + desktopEnvironment = "none"; + machineType = "server"; + users = [ "osbm" ]; + defaultUser = "osbm"; - i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method + nixSettings.enable = true; + + programs = { + commandLine.enable = true; + neovim.enable = true; + }; + + services = { + openssh.enable = true; + }; + + hardware = { + sound.enable = false; + hibernation.enable = false; + + # Disable disko module since we have manual disko config in hardware-configuration.nix + disko.enable = false; + }; + }; + + i18n.inputMethod.enable = lib.mkForce false; system.stateVersion = "25.11"; networking.hostName = "apollo"; + networking.hostId = "0f7de22e"; # Required for ZFS - networking.hostId = "0f7de22e"; # Generate your own with: head -c 8 /etc/machine-id + # ZFS configuration + boot.zfs.requestEncryptionCredentials = true; + + # Initrd SSH for remote unlocking + boot.initrd.network.enable = true; + boot.initrd.availableKernelModules = [ "virtio_pci" ]; + boot.initrd.network.ssh = { + enable = true; + port = 22; + shell = "/bin/cryptsetup-askpass"; + authorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" + ]; + hostKeys = [ "/etc/ssh/initrd" ]; + }; + boot.initrd.secrets = { + "/etc/ssh/initrd" = "/etc/ssh/initrd"; + }; # Enable zram swap zramSwap.enable = true; - users.users.root.initialPassword = "changeme"; + users.users.osbm.initialPassword = "changeme"; users.mutableUsers = false; - # Persistence configuration - environment.persistence."/persist" = { - hideMounts = true; - files = [ - "/etc/machine-id" - ]; - directories = [ - "/var/log" - "/var/lib/tailscale" - "/var/lib/borg" - "/var/lib/nixos" - ]; - }; - - # Remote ZFS unlocking in initrd - boot = { - # Static IP in initrd - adjust these values for your network - kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::ens3:none" ]; - - initrd = { - # Network driver for initrd - change to match your hardware - # Common options: "virtio_pci" (VMs), "e1000e", "igb", "r8169" - availableKernelModules = [ "virtio_pci" ]; - - network = { - enable = true; - ssh = { - enable = true; - port = 2222; - # Generate with: ssh-keygen -t ed25519 -N "" -f /persist/etc/ssh/ssh_host_ed25519_key_initrd - hostKeys = [ "/persist/etc/ssh/ssh_host_ed25519_key_initrd" ]; - # Add your SSH public key here - authorizedKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" - ]; - }; - # Auto-prompt for ZFS password on SSH login - postCommands = '' - cat < /root/.profile - if pgrep -x "zfs" > /dev/null - then - zfs load-key -a - killall zfs - else - echo "zfs not running -- maybe the pool is taking some time to load for some unforseen reason." - fi - EOF - ''; - }; - }; - }; - - # SSH host keys on persistent storage - services.openssh = { - enable = true; - openFirewall = true; - settings = { - PasswordAuthentication = false; - KbdInteractiveAuthentication = false; - }; - hostKeys = [ - { - bits = 4096; - path = "/persist/etc/ssh/ssh_host_rsa_key"; - type = "rsa"; - } - { - path = "/persist/etc/ssh/ssh_host_ed25519_key"; - type = "ed25519"; - } - ]; - }; - + # Network configuration networking = { useDHCP = false; interfaces.ens3 = { @@ -122,4 +84,7 @@ defaultGateway = "152.53.152.1"; defaultGateway6 = { address = "fe80::1"; interface = "ens3"; }; }; + + # Override initrd kernel params for static IP + boot.kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::ens3:none" ]; } diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index e3b2acd..473fa06 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -12,9 +12,9 @@ ]; osbmModules = { - enableKDE = false; - enableFonts = false; - enableTailscale = true; + desktopEnvironment = "none"; + fonts.enable = false; + services.tailscale.enable = true; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 32838b7..88c6f7f 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -10,8 +10,8 @@ ]; osbmModules = { - enableKDE = false; - enableFonts = false; + desktopEnvironment = "none"; + fonts.enable = false; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index c6b4090..61a7e28 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -13,14 +13,14 @@ ]; osbmModules = { - enableKDE = false; - enableFonts = false; - enableForgejo = true; - # enableCaddy = true; - # enableCloudflareDyndns = true; - enableCloudflared = true; - enableVaultwarden = true; - enableGlance = true; + desktopEnvironment = "none"; + fonts.enable = false; + services.forgejo.enable = true; + # services.caddy.enable = true; + # services.cloudflare-dyndns.enable = true; + services.cloudflared.enable = true; + services.vaultwarden.enable = true; + services.glance.enable = true; }; services.wanikani-bypass-lessons.enable = true; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 9034e15..1e5406e 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -11,9 +11,9 @@ ]; osbmModules = { - enableKDE = true; - enableAarch64Emulation = true; - enableSound = true; + desktopEnvironment = "plasma"; + emulation.aarch64.enable = true; + hardware.sound.enable = true; }; # Bootloader. diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index c7eb70a..265861e 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -5,13 +5,13 @@ ../../../modules/nixos ]; osbmModules = { - enableKDE = false; - enableFonts = false; - enableNextcloud = true; - enableHydra = true; - # enableCaddy = true; - enableAttic = true; - enableCloudflared = true; + desktopEnvironment = "none"; + fonts.enable = false; + services.nextcloud.enable = true; + services.hydra.enable = true; + # services.caddy.enable = true; + services.attic.enable = true; + services.cloudflared.enable = true; }; boot.loader.systemd-boot.enable = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index bcaeb00..6469eeb 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -10,15 +10,14 @@ ]; osbmModules = { - enableKDE = true; - enableJellyfin = true; - enableAarch64Emulation = true; - disableHibernation = true; - enableWakeOnLan = true; - enableSound = true; - enableADB = true; - enableOllama = true; - # enableMinegrubTheme = true; + desktopEnvironment = "plasma"; + services.jellyfin.enable = true; + emulation.aarch64.enable = true; + hardware.hibernation.enable = false; + hardware.wakeOnLan.enable = true; + hardware.sound.enable = true; + programs.adbFastboot.enable = true; + services.ollama.enable = true; }; # Bootloader. diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 104647a..d5db454 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -332,7 +332,16 @@ }; }; - + # Emulation + emulation = { + aarch64 = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable aarch64 emulation via binfmt"; + }; + }; + }; # Internationalization i18n = { diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index a399245..e0552d8 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -1,7 +1,7 @@ { lib, config, inputs, ... }: { - imports = [ + imports = lib.optionals (inputs ? home-manager) [ inputs.home-manager.nixosModules.home-manager ]; @@ -13,8 +13,8 @@ # Pass inputs and outputs to home-manager modules extraSpecialArgs = { inherit inputs; }; - # Configure home-manager for each user - users = lib.genAttrs config.osbmModules.users (username: { + # Configure home-manager for each user (excluding root) + users = lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: { home.stateVersion = lib.mkDefault "24.05"; imports = [ ../../home-manager ]; }); diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index dfc3b40..18870e7 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -1,12 +1,14 @@ { lib, config, ... }: let cfg = config.osbmModules; + # Filter out 'root' from the users list since it's a special system user + regularUsers = builtins.filter (u: u != "root") cfg.users; in { config = lib.mkIf (cfg.users != []) { users.users = lib.mkMerge [ - # Create users based on the list - (lib.genAttrs cfg.users (username: { + # Create users based on the list (excluding root) + (lib.genAttrs regularUsers (username: { isNormalUser = true; description = username; extraGroups = [ "networkmanager" ] @@ -15,7 +17,7 @@ in ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; })) - # Additional configuration for default user + # Additional configuration for default user (including root if it's default) { ${cfg.defaultUser} = { openssh.authorizedKeys.keys = lib.mkDefault [ From 316187dd31c469d1b4c425fc4276533810989dee Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 21:01:47 +0300 Subject: [PATCH 1398/1768] fix --- hosts/nixos/apollo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index b9afc97..0a21669 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -44,7 +44,7 @@ # ZFS configuration boot.zfs.requestEncryptionCredentials = true; - + # Initrd SSH for remote unlocking boot.initrd.network.enable = true; boot.initrd.availableKernelModules = [ "virtio_pci" ]; From f7f7dee1905e0b096c2f145aa79f373e7448f7fd Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 21:31:09 +0300 Subject: [PATCH 1399/1768] fix --- hosts/nixos/apollo/configuration.nix | 47 +++---- hosts/nixos/apollo/hardware-configuration.nix | 125 +----------------- modules/nixos/options.nix | 12 ++ 3 files changed, 39 insertions(+), 145 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 0a21669..aa70bd3 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../../modules/nixos - inputs.disko.nixosModules.disko inputs.impermanence.nixosModules.impermanence ]; @@ -32,34 +31,36 @@ sound.enable = false; hibernation.enable = false; - # Disable disko module since we have manual disko config in hardware-configuration.nix - disko.enable = false; + disko = { + enable = true; + fileSystem = "zfs"; + systemd-boot = true; + + initrd-ssh = { + enable = true; + authorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" + ]; + ethernetDrivers = [ "virtio_pci" ]; + }; + + zfs = { + enable = true; + hostID = "0f7de22e"; + root = { + useTmpfs = false; # Use ZFS root, not tmpfs + encrypt = true; + disk1 = "vda"; + impermanenceRoot = true; # Wipe root on boot with ZFS snapshots + }; + }; + }; }; }; i18n.inputMethod.enable = lib.mkForce false; system.stateVersion = "25.11"; networking.hostName = "apollo"; - networking.hostId = "0f7de22e"; # Required for ZFS - - # ZFS configuration - boot.zfs.requestEncryptionCredentials = true; - - # Initrd SSH for remote unlocking - boot.initrd.network.enable = true; - boot.initrd.availableKernelModules = [ "virtio_pci" ]; - boot.initrd.network.ssh = { - enable = true; - port = 22; - shell = "/bin/cryptsetup-askpass"; - authorizedKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" - ]; - hostKeys = [ "/etc/ssh/initrd" ]; - }; - boot.initrd.secrets = { - "/etc/ssh/initrd" = "/etc/ssh/initrd"; - }; # Enable zram swap zramSwap.enable = true; diff --git a/hosts/nixos/apollo/hardware-configuration.nix b/hosts/nixos/apollo/hardware-configuration.nix index 9d1bb02..5c9e404 100644 --- a/hosts/nixos/apollo/hardware-configuration.nix +++ b/hosts/nixos/apollo/hardware-configuration.nix @@ -1,127 +1,8 @@ { config, lib, ... }: { - disko.devices = { - disk = { - main = { - device = "/dev/vda"; # Change this to match your actual disk - type = "disk"; - content = { - type = "gpt"; - partitions = { - ESP = { - priority = 1; - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - zfs = { - size = "100%"; - content = { - type = "zfs"; - pool = "rpool"; - }; - }; - }; - }; - }; - }; - zpool = { - rpool = { - type = "zpool"; - options = { - ashift = "12"; - autotrim = "on"; - }; - rootFsOptions = { - acltype = "posixacl"; - atime = "off"; - canmount = "off"; - compression = "zstd"; - dnodesize = "auto"; - normalization = "formD"; - xattr = "sa"; - mountpoint = "none"; - encryption = "on"; - keylocation = "prompt"; - keyformat = "passphrase"; - }; - datasets = { - # Reserved space to prevent pool from becoming full - "local/reserved" = { - type = "zfs_fs"; - options = { - refreservation = "1G"; - mountpoint = "none"; - }; - }; - # Nix store - "local/nix" = { - type = "zfs_fs"; - mountpoint = "/nix"; - options.mountpoint = "/nix"; - }; - # Persistent data - "safe/persist" = { - type = "zfs_fs"; - mountpoint = "/persist"; - options = { - mountpoint = "/persist"; - }; - postCreateHook = "zfs snapshot rpool/safe/persist@empty"; - }; - }; - }; - }; - nodev = { - "/" = { - fsType = "tmpfs"; - mountOptions = [ - "defaults" - "size=2G" - "mode=755" - ]; - }; - }; - }; - - # ZFS-specific boot configuration - boot.supportedFilesystems = [ "zfs" ]; + # Disko configuration is now managed by osbmModules.hardware.disko + # All disk configuration moved to configuration.nix - # Bootloader configuration - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - # Required for ZFS nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - # Mark /persist as needed for boot (required by impermanence) -fileSystems."/" = { - device = "none"; - fsType = "tmpfs"; - options = [ "defaults" "size=2G" "mode=755" ]; -}; - -fileSystems."/boot" = { - device = "/dev/disk/by-partlabel/disk-main-ESP"; - fsType = "vfat"; -}; - -fileSystems."/nix" = { - device = "rpool/local/nix"; - fsType = "zfs"; - options = [ "zfsutil" ]; -}; - -fileSystems."/persist" = { - device = "rpool/safe/persist"; - fsType = "zfs"; - options = [ "zfsutil" ]; - neededForBoot = true; -}; - -} \ No newline at end of file +} diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index d5db454..d14da81 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -233,6 +233,18 @@ }; root = { + useTmpfs = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Use tmpfs for root instead of ZFS (with ZFS datasets for /nix and /persist)"; + }; + + tmpfsSize = lib.mkOption { + type = lib.types.str; + default = "2G"; + description = "Size of tmpfs root filesystem"; + }; + encrypt = lib.mkOption { type = lib.types.bool; default = true; From 20e99d234d6cf9be2dd8e79d9fa0e3a0b6c76ae7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 22:46:02 +0300 Subject: [PATCH 1400/1768] cleaner --- hosts/nixos/apollo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index aa70bd3..d0e67cc 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -35,7 +35,7 @@ enable = true; fileSystem = "zfs"; systemd-boot = true; - + initrd-ssh = { enable = true; authorizedKeys = [ @@ -43,7 +43,7 @@ ]; ethernetDrivers = [ "virtio_pci" ]; }; - + zfs = { enable = true; hostID = "0f7de22e"; From 9ea28ef2186572c111fb536266b6597c3a50c12c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 19 Oct 2025 22:46:17 +0300 Subject: [PATCH 1401/1768] formatting --- .../darwinHosts/prometheus/configuration.nix | 16 +++++-- hosts/nixos/apollo/configuration.nix | 29 ++++++----- hosts/nixos/apollo/hardware-configuration.nix | 2 +- modules/home-manager/programs/ssh.nix | 2 +- modules/nixos/hardware/disko.nix | 28 ++++++++--- modules/nixos/options.nix | 23 +++++++-- modules/nixos/programs/arduino.nix | 7 ++- modules/nixos/programs/command-line.nix | 7 ++- modules/nixos/programs/graphical.nix | 7 ++- modules/nixos/programs/neovim.nix | 8 +++- modules/nixos/programs/steam.nix | 18 +++---- modules/nixos/system/agenix.nix | 48 +++++++++++-------- modules/nixos/system/desktop-environment.nix | 7 ++- modules/nixos/system/fonts.nix | 20 ++++++-- modules/nixos/system/home-manager.nix | 7 ++- modules/nixos/system/nix-index.nix | 7 ++- modules/nixos/system/nix-settings.nix | 10 +++- modules/nixos/system/users.nix | 12 +++-- 18 files changed, 183 insertions(+), 75 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 3d10385..892d3a8 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -67,7 +67,6 @@ nix.channel.enable = false; - nix.registry = { self.flake = inputs.self; nixpkgs.flake = inputs.nixpkgs; @@ -91,7 +90,10 @@ osbm-nvim.flake = inputs.osbm-nvim; my-nixpkgs = { - from = { type = "indirect"; id = "my-nixpkgs"; }; + from = { + type = "indirect"; + id = "my-nixpkgs"; + }; to = { owner = "osbm"; repo = "nixpkgs"; @@ -99,7 +101,10 @@ }; }; osbm-dev = { - from = { type = "indirect"; id = "osbm-dev"; }; + from = { + type = "indirect"; + id = "osbm-dev"; + }; to = { owner = "osbm"; repo = "osbm.dev"; @@ -107,7 +112,10 @@ }; }; devshells = { - from = { type = "indirect"; id = "devshells"; }; + from = { + type = "indirect"; + id = "devshells"; + }; to = { owner = "osbm"; repo = "devshells"; diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index d0e67cc..ba52af6 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -48,10 +48,10 @@ enable = true; hostID = "0f7de22e"; root = { - useTmpfs = false; # Use ZFS root, not tmpfs + useTmpfs = false; # Use ZFS root, not tmpfs encrypt = true; disk1 = "vda"; - impermanenceRoot = true; # Wipe root on boot with ZFS snapshots + impermanenceRoot = true; # Wipe root on boot with ZFS snapshots }; }; }; @@ -73,17 +73,24 @@ useDHCP = false; interfaces.ens3 = { useDHCP = false; - ipv4.addresses = [{ - address = "152.53.152.129"; - prefixLength = 22; - }]; - ipv6.addresses = [{ - address = "2a00:11c0:47:3b2a::1"; - prefixLength = 64; - }]; + ipv4.addresses = [ + { + address = "152.53.152.129"; + prefixLength = 22; + } + ]; + ipv6.addresses = [ + { + address = "2a00:11c0:47:3b2a::1"; + prefixLength = 64; + } + ]; }; defaultGateway = "152.53.152.1"; - defaultGateway6 = { address = "fe80::1"; interface = "ens3"; }; + defaultGateway6 = { + address = "fe80::1"; + interface = "ens3"; + }; }; # Override initrd kernel params for static IP diff --git a/hosts/nixos/apollo/hardware-configuration.nix b/hosts/nixos/apollo/hardware-configuration.nix index 5c9e404..0b20651 100644 --- a/hosts/nixos/apollo/hardware-configuration.nix +++ b/hosts/nixos/apollo/hardware-configuration.nix @@ -2,7 +2,7 @@ { # Disko configuration is now managed by osbmModules.hardware.disko # All disk configuration moved to configuration.nix - + # Required for ZFS nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index 12a937d..ac1367a 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -28,7 +28,7 @@ in programs.ssh = { enable = true; enableDefaultConfig = false; - + matchBlocks = { ymir = sshBlock "192.168.0.2"; ymir-ts = sshBlock "ymir.curl-boga.ts.net"; diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix index 74a23a3..93fa04d 100644 --- a/modules/nixos/hardware/disko.nix +++ b/modules/nixos/hardware/disko.nix @@ -1,4 +1,10 @@ -{ config, inputs, lib, pkgs, ... }: +{ + config, + inputs, + lib, + pkgs, + ... +}: let cfg = config.osbmModules.hardware.disko; inherit (config.networking) hostName; @@ -9,9 +15,11 @@ let "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHYSJ9ywFRJ747tkhvYWFkx/Y9SkLqv3rb7T1UuXVBWo" ]; - authorizedKeys = if cfg.initrd-ssh.authorizedKeys != [] - then cfg.initrd-ssh.authorizedKeys - else defaultAuthorizedKeys; + authorizedKeys = + if cfg.initrd-ssh.authorizedKeys != [ ] then + cfg.initrd-ssh.authorizedKeys + else + defaultAuthorizedKeys; in { imports = [ @@ -52,9 +60,12 @@ in # ZFS does not support swapfiles kernelParams = [ "nohibernate" - "zfs.zfs_arc_max=17179869184" # 16GB ARC max + "zfs.zfs_arc_max=17179869184" # 16GB ARC max + ]; + supportedFilesystems = [ + "vfat" + "zfs" ]; - supportedFilesystems = [ "vfat" "zfs" ]; zfs = { devNodes = "/dev/disk/by-id/"; forceImportAll = true; @@ -117,7 +128,10 @@ in type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = [ "defaults" "umask=0077" ]; + mountOptions = [ + "defaults" + "umask=0077" + ]; }; }; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index d14da81..50f00d6 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -3,14 +3,23 @@ options.osbmModules = { # Desktop Environment desktopEnvironment = lib.mkOption { - type = lib.types.enum [ "plasma" "none" ]; + type = lib.types.enum [ + "plasma" + "none" + ]; default = "none"; description = "Which desktop environment to use"; }; # Machine Type machineType = lib.mkOption { - type = lib.types.enum [ "desktop" "laptop" "server" "embedded" "mobile" ]; + type = lib.types.enum [ + "desktop" + "laptop" + "server" + "embedded" + "mobile" + ]; default = "server"; description = "Type of machine for appropriate defaults"; }; @@ -18,7 +27,10 @@ # Users users = lib.mkOption { type = lib.types.listOf lib.types.str; - default = [ "osbm" "bayram" ]; + default = [ + "osbm" + "bayram" + ]; description = "List of users to create. `osbm` is my main user, and `bayram` is for my family."; }; @@ -188,7 +200,10 @@ }; fileSystem = lib.mkOption { - type = lib.types.enum [ "zfs" "ext4" ]; + type = lib.types.enum [ + "zfs" + "ext4" + ]; default = "ext4"; description = "Root filesystem type"; }; diff --git a/modules/nixos/programs/arduino.nix b/modules/nixos/programs/arduino.nix index 719d170..f5123eb 100644 --- a/modules/nixos/programs/arduino.nix +++ b/modules/nixos/programs/arduino.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.programs.arduino.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index a01666a..8311a71 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.programs.commandLine.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/programs/graphical.nix b/modules/nixos/programs/graphical.nix index d388c0b..3f4f11d 100644 --- a/modules/nixos/programs/graphical.nix +++ b/modules/nixos/programs/graphical.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.programs.graphical.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/programs/neovim.nix b/modules/nixos/programs/neovim.nix index 2814441..429f032 100644 --- a/modules/nixos/programs/neovim.nix +++ b/modules/nixos/programs/neovim.nix @@ -1,4 +1,10 @@ -{ lib, inputs, config, pkgs, ... }: +{ + lib, + inputs, + config, + pkgs, + ... +}: { config = lib.mkIf config.osbmModules.programs.neovim.enable { environment.systemPackages = [ diff --git a/modules/nixos/programs/steam.nix b/modules/nixos/programs/steam.nix index 94dbeae..21f6359 100644 --- a/modules/nixos/programs/steam.nix +++ b/modules/nixos/programs/steam.nix @@ -1,14 +1,14 @@ { lib, config, ... }: { config = lib.mkIf config.osbmModules.programs.steam.enable { - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - dedicatedServer.openFirewall = true; - # Open ports in the firewall for Steam Local Network Game Transfers - localNetworkGameTransfers.openFirewall = true; - }; + programs.steam = { + enable = true; + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; + }; }; } diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix index 4630856..cd84056 100644 --- a/modules/nixos/system/agenix.nix +++ b/modules/nixos/system/agenix.nix @@ -1,32 +1,38 @@ -{ lib, pkgs, inputs, config, ... }: +{ + lib, + pkgs, + inputs, + config, + ... +}: { imports = [ inputs.agenix.nixosModules.default ]; config = lib.mkIf config.osbmModules.agenix.enable { - environment.systemPackages = [ - inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix - pkgs.age - ]; + environment.systemPackages = [ + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix + pkgs.age + ]; - age.secrets = { - network-manager.file = ../secrets/network-manager.age; - ssh-key-private = { - file = ../secrets/ssh-key-private.age; - path = "/home/osbm/.ssh/id_ed25519"; - owner = "osbm"; - group = "users"; - mode = "600"; - }; - ssh-key-public = { - file = ../secrets/ssh-key-public.age; - path = "/home/osbm/.ssh/id_ed25519.pub"; - owner = "osbm"; - group = "users"; - mode = "644"; - }; + age.secrets = { + network-manager.file = ../secrets/network-manager.age; + ssh-key-private = { + file = ../secrets/ssh-key-private.age; + path = "/home/osbm/.ssh/id_ed25519"; + owner = "osbm"; + group = "users"; + mode = "600"; }; + ssh-key-public = { + file = ../secrets/ssh-key-public.age; + path = "/home/osbm/.ssh/id_ed25519.pub"; + owner = "osbm"; + group = "users"; + mode = "644"; + }; + }; }; } diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index e84e89f..430316f 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: let cfg = config.osbmModules; in diff --git a/modules/nixos/system/fonts.nix b/modules/nixos/system/fonts.nix index b8f68fe..388afd8 100644 --- a/modules/nixos/system/fonts.nix +++ b/modules/nixos/system/fonts.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.fonts.enable { fonts.packages = with pkgs; [ @@ -12,14 +17,23 @@ dina-font proggyfonts jetbrains-mono - (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" "Iosevka" ]; }) + (nerdfonts.override { + fonts = [ + "FiraCode" + "JetBrainsMono" + "Iosevka" + ]; + }) ]; fonts.fontconfig = { defaultFonts = { serif = [ "Noto Serif" ]; sansSerif = [ "Noto Sans" ]; - monospace = [ "JetBrainsMono Nerd Font" "Fira Code" ]; + monospace = [ + "JetBrainsMono Nerd Font" + "Fira Code" + ]; emoji = [ "Noto Color Emoji" ]; }; }; diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index e0552d8..950fdfd 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -1,4 +1,9 @@ -{ lib, config, inputs, ... }: +{ + lib, + config, + inputs, + ... +}: { imports = lib.optionals (inputs ? home-manager) [ diff --git a/modules/nixos/system/nix-index.nix b/modules/nixos/system/nix-index.nix index 87b1fb6..6b1f8e9 100644 --- a/modules/nixos/system/nix-index.nix +++ b/modules/nixos/system/nix-index.nix @@ -1,4 +1,9 @@ -{ lib, config, inputs, ... }: +{ + lib, + config, + inputs, + ... +}: { imports = [ inputs.nix-index-database.nixosModules.nix-index diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index e8489b1..0e2bbd0 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -1,8 +1,14 @@ -{ inputs, lib, config, ... }: +{ + inputs, + lib, + config, + ... +}: { config = lib.mkIf config.osbmModules.nixSettings.enable { # Allow unfree packages - nixpkgs.config.allowUnfreePredicate = pkg: + nixpkgs.config.allowUnfreePredicate = + pkg: builtins.elem (lib.getName pkg) [ "vscode" "discord" diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index 18870e7..d3d3b14 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -5,16 +5,18 @@ let regularUsers = builtins.filter (u: u != "root") cfg.users; in { - config = lib.mkIf (cfg.users != []) { + config = lib.mkIf (cfg.users != [ ]) { users.users = lib.mkMerge [ # Create users based on the list (excluding root) (lib.genAttrs regularUsers (username: { isNormalUser = true; description = username; - extraGroups = [ "networkmanager" ] - ++ lib.optional (username == cfg.defaultUser) "wheel" - ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" - ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; + extraGroups = [ + "networkmanager" + ] + ++ lib.optional (username == cfg.defaultUser) "wheel" + ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" + ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; })) # Additional configuration for default user (including root if it's default) From c9d16bd973ae3498406ed1d416de39ae30c8eb9c Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 09:49:07 +0300 Subject: [PATCH 1402/1768] random bullshit go --- hosts/nixos/apollo/configuration.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index ba52af6..97aab69 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -41,7 +41,8 @@ authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; - ethernetDrivers = [ "virtio_pci" ]; + ethernetDrivers = [ "virtio_pci" # QEMU support + "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" "virtio_gpu" ]; }; zfs = { @@ -71,7 +72,7 @@ # Network configuration networking = { useDHCP = false; - interfaces.ens3 = { + interfaces.eth0 = { useDHCP = false; ipv4.addresses = [ { @@ -89,10 +90,10 @@ defaultGateway = "152.53.152.1"; defaultGateway6 = { address = "fe80::1"; - interface = "ens3"; + interface = "eth0"; }; }; # Override initrd kernel params for static IP - boot.kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::ens3:none" ]; + boot.kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::eth0:none" ]; } From e5f9e6967548bb0b1cae380c11b20ea06ceff68b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 09:49:20 +0300 Subject: [PATCH 1403/1768] fucking hell --- modules/nixos/hardware/disko.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix index 93fa04d..b8c3324 100644 --- a/modules/nixos/hardware/disko.nix +++ b/modules/nixos/hardware/disko.nix @@ -37,10 +37,10 @@ in (lib.mkIf (cfg.enable && cfg.initrd-ssh.enable) { boot.initrd.network.enable = true; boot.initrd.availableKernelModules = cfg.initrd-ssh.ethernetDrivers; - boot.kernelParams = [ "ip=::::${hostName}-initrd::dhcp" ]; + boot.kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::eth0:none" ]; boot.initrd.network.ssh = { enable = true; - port = 22; + port = 2222; # different port to avoid conflicts shell = "/bin/cryptsetup-askpass"; authorizedKeys = authorizedKeys; hostKeys = [ "/etc/ssh/initrd" ]; From bd4c2e64bb1359b06f3baa3cdb14f8d8ba0275c4 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 10:10:00 +0300 Subject: [PATCH 1404/1768] add dns nameservers --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 97aab69..0e24b37 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -92,6 +92,7 @@ address = "fe80::1"; interface = "eth0"; }; + nameservers = [ "1.1.1.1" "8.8.8.8" ]; # Cloudflare and Google DNS }; # Override initrd kernel params for static IP From 1ebe022f03f73220eefcede1acaf630aa4dc1686 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 10:42:50 +0300 Subject: [PATCH 1405/1768] no services as of now --- modules/home-manager/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 067e288..5fdbc45 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -3,7 +3,9 @@ # Import all home-manager modules imports = [ ./programs - ./services + # no home manager services yet + # ./services + ]; # Basic home-manager configuration From d664253d151be9a3f4d41f0b1fbe27583f7c5dd5 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 10:43:18 +0300 Subject: [PATCH 1406/1768] formatting --- hosts/nixos/apollo/configuration.nix | 16 +++++++++++++--- modules/home-manager/default.nix | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 0e24b37..e3e8c93 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -41,8 +41,15 @@ authorizedKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; - ethernetDrivers = [ "virtio_pci" # QEMU support - "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" "virtio_gpu" ]; + ethernetDrivers = [ + "virtio_pci" # QEMU support + "virtio_net" + "virtio_pci" + "virtio_blk" + "virtio_balloon" + "virtio_console" + "virtio_gpu" + ]; }; zfs = { @@ -92,7 +99,10 @@ address = "fe80::1"; interface = "eth0"; }; - nameservers = [ "1.1.1.1" "8.8.8.8" ]; # Cloudflare and Google DNS + nameservers = [ + "1.1.1.1" + "8.8.8.8" + ]; # Cloudflare and Google DNS }; # Override initrd kernel params for static IP diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 5fdbc45..dde3bf8 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -4,7 +4,7 @@ imports = [ ./programs # no home manager services yet - # ./services + # ./services ]; From 11054257851a1377a4459042593c0bfff20ce9d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 10:59:20 +0300 Subject: [PATCH 1407/1768] add flake outputs --- flake.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/flake.nix b/flake.nix index db4a9c2..d700481 100644 --- a/flake.nix +++ b/flake.nix @@ -93,6 +93,18 @@ }; lib = import ./lib { inherit (nixpkgs) lib; }; formatter = forAllSystems (system: (makePkgs system).nixfmt-tree); + + # Export your module system for use in other flakes + nixosModules = { + default = ./modules/nixos; + osbm = ./modules/nixos; # Alias with your name + }; + + # If you also want to export home-manager modules + homeManagerModules = { + default = ./modules/home-manager; + osbm = ./modules/home-manager; + }; # deploy.nodes.harmonica = { # hostname = "192.168.0.11"; # profiles.system = { From 8d77d07661d7dc0599ab6f72ee8b0ad67f9825dd Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 14:40:34 +0300 Subject: [PATCH 1408/1768] delete deploy --- flake.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/flake.nix b/flake.nix index d700481..5720bb6 100644 --- a/flake.nix +++ b/flake.nix @@ -35,10 +35,6 @@ raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; - deploy-rs = { - url = "github:serokell/deploy-rs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; nix-index-database = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; @@ -58,7 +54,6 @@ nixpkgs, nix-on-droid, nix-darwin, - deploy-rs, ... }@inputs: let From 6639d45b945e767fe3d2738b7e83c74df470be20 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 14:46:28 +0300 Subject: [PATCH 1409/1768] remove deployrs --- flake.lock | 76 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 68b1521..2b62518 100644 --- a/flake.lock +++ b/flake.lock @@ -47,28 +47,6 @@ "type": "github" } }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1756719547, - "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -89,22 +67,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -129,7 +91,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -497,7 +459,7 @@ "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_3", "nuschtosSearch": "nuschtosSearch", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1758665797, @@ -657,7 +619,6 @@ "root": { "inputs": { "agenix": "agenix", - "deploy-rs": "deploy-rs", "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", @@ -849,39 +810,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "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_2" - }, - "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" - } } }, "root": "root", From d54c6750df31634d4541ddf9cbb2bf4e0dba4e8b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 14:46:39 +0300 Subject: [PATCH 1410/1768] wait a sec --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index 5720bb6..5c18da9 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,10 @@ raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; + # colmena = { + # url = "github:zhaofengli/colmena"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; nix-index-database = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; @@ -45,6 +49,8 @@ }; impermanence = { url = "github:nix-community/impermanence"; + # inputs.nixpkgs.follows = "nixpkgs"; + # inputs.home-manager.follows = "home-manager"; }; }; From c35ad8e623bad1f3e3ffbf5c9519cfadc93e0976 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 20 Oct 2025 14:46:45 +0300 Subject: [PATCH 1411/1768] instructions --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 26685ac..ef1a4ed 100644 --- a/README.md +++ b/README.md @@ -127,3 +127,11 @@ build iso with: - [ ] enable swap on pochita - [ ] learnis it possible to enable swap with sd-image? + +nano /tmp/secret.key +sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode destroy,format,mount --flake github:osbm/flake#apollo + +sudo mkdir -p /mnt/etc/ssh +sudo ssh-keygen -t ed25519 -N "" -f /mnt/etc/ssh/initrd + +sudo nixos-install --flake github:osbm/flake#apollo --root /mnt --no-root-passwd From 88f7974e6aafe9429cbf36b2606bf023d0ca886e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 08:38:19 +0300 Subject: [PATCH 1412/1768] home manager impermanence things --- modules/nixos/system/home-manager.nix | 31 ++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 950fdfd..b487bc5 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -6,11 +6,11 @@ }: { - imports = lib.optionals (inputs ? home-manager) [ + imports = [ inputs.home-manager.nixosModules.home-manager ]; - config = lib.mkIf (config.osbmModules.homeManager.enable && inputs ? home-manager) { + config = lib.mkIf (config.osbmModules.homeManager.enable) { home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -21,7 +21,32 @@ # Configure home-manager for each user (excluding root) users = lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: { home.stateVersion = lib.mkDefault "24.05"; - imports = [ ../../home-manager ]; + imports = [ + ../../home-manager + ] ++ lib.optionals config.osbmModules.hardware.disko.zfs.impermanence.enable [ + # if impermanence is enabled, configure persistence + { + home.persistence."/persist/home/${username}" = { + directories = [ + "Pictures" + "Documents" + "Videos" + ".gnupg" + ".ssh" + ".local/share/keyrings" + ".local/share/direnv" + # { + # directory = ".local/share/Steam"; + # method = "symlink"; + # } + ]; + files = [ + ".screenrc" + ]; + allowOther = true; + }; + } + ]; }); }; }; From 7d261138d9c0e9a3c5bb08f0742fa3a934bbcae3 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 09:23:37 +0300 Subject: [PATCH 1413/1768] add home manager and tailscale --- hosts/nixos/apollo/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index e3e8c93..0df8e84 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -15,7 +15,7 @@ machineType = "server"; users = [ "osbm" ]; defaultUser = "osbm"; - + homeManager.enable = true; nixSettings.enable = true; programs = { @@ -25,6 +25,7 @@ services = { openssh.enable = true; + tailscale.enable = true; }; hardware = { From e7bb5b424525daa5b596c938b842ce3ceb1421b3 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 10:23:38 +0300 Subject: [PATCH 1414/1768] is it working --- modules/nixos/system/home-manager.nix | 86 +++++++++++++++------------ 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index b487bc5..cf75718 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -10,44 +10,54 @@ inputs.home-manager.nixosModules.home-manager ]; - config = lib.mkIf (config.osbmModules.homeManager.enable) { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; + config = lib.mkMerge [ + (lib.mkIf (config.osbmModules.homeManager.enable) { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; - # Pass inputs and outputs to home-manager modules - extraSpecialArgs = { inherit inputs; }; + # Pass inputs and outputs to home-manager modules + extraSpecialArgs = { inherit inputs; }; - # Configure home-manager for each user (excluding root) - users = lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: { - home.stateVersion = lib.mkDefault "24.05"; - imports = [ - ../../home-manager - ] ++ lib.optionals config.osbmModules.hardware.disko.zfs.impermanence.enable [ - # if impermanence is enabled, configure persistence - { - home.persistence."/persist/home/${username}" = { - directories = [ - "Pictures" - "Documents" - "Videos" - ".gnupg" - ".ssh" - ".local/share/keyrings" - ".local/share/direnv" - # { - # directory = ".local/share/Steam"; - # method = "symlink"; - # } - ]; - files = [ - ".screenrc" - ]; - allowOther = true; - }; - } - ]; - }); - }; - }; + # Configure home-manager for each user (excluding root) + users = + let + # Capture the NixOS system config before entering the home-manager scope + systemConfig = config; + in + lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: { + home.stateVersion = lib.mkDefault "24.05"; + imports = [ + ../../home-manager + ] + ++ lib.optionals systemConfig.osbmModules.hardware.disko.zfs.root.impermanenceRoot [ + # Import impermanence home-manager module when impermanence is enabled + inputs.impermanence.homeManagerModules.impermanence + # Configure persistence + { + home.persistence."/persist/home/${username}" = { + directories = [ + "Pictures" + "Documents" + "Videos" + ".gnupg" + ".ssh" + ".local/share/keyrings" + ".local/share/direnv" + # { + # directory = ".local/share/Steam"; + # method = "symlink"; + # } + ]; + files = [ + ".screenrc" + ]; + allowOther = true; + }; + } + ]; + }); + }; + }) + ]; } From 0bf1c48bd4f325dd723cbaf813570576faccc75a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 10:23:43 +0300 Subject: [PATCH 1415/1768] todo kinda --- modules/home-manager/programs/ssh.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index ac1367a..409c997 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -44,6 +44,9 @@ in wallfacer-ts = sshBlock "wallfacer.curl-boga.ts.net"; prometheus = sshBlock "192.168.0.12"; prometheus-ts = sshBlock "prometheus.curl-boga.ts.net"; + # apollo + # apollo-initrd + # artemis }; }; } From 6fd92bdb5af66c65d6dbb03abe279ab9193c8a8e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 10:36:00 +0300 Subject: [PATCH 1416/1768] allow fuse if impermanent --- modules/nixos/system/home-manager.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index cf75718..412cf77 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -11,6 +11,11 @@ ]; config = lib.mkMerge [ + # Enable FUSE user_allow_other when impermanence is used + (lib.mkIf (config.osbmModules.hardware.disko.zfs.root.impermanenceRoot) { + programs.fuse.userAllowOther = true; + }) + (lib.mkIf (config.osbmModules.homeManager.enable) { home-manager = { useGlobalPkgs = true; From 06ca85ed521d2ed3c3e9fcb31f409871f719fbfa Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 15:14:58 +0300 Subject: [PATCH 1417/1768] dont shorten --- modules/nixos/system/users.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index d3d3b14..4bee1a5 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -1,11 +1,10 @@ { lib, config, ... }: let - cfg = config.osbmModules; # Filter out 'root' from the users list since it's a special system user - regularUsers = builtins.filter (u: u != "root") cfg.users; + regularUsers = builtins.filter (u: u != "root") config.osbmModules.users; in { - config = lib.mkIf (cfg.users != [ ]) { + config = lib.mkIf (config.osbmModules.users != [ ]) { users.users = lib.mkMerge [ # Create users based on the list (excluding root) (lib.genAttrs regularUsers (username: { @@ -14,14 +13,14 @@ in extraGroups = [ "networkmanager" ] - ++ lib.optional (username == cfg.defaultUser) "wheel" + ++ lib.optional (username == config.osbmModules.defaultUser) "wheel" ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; })) # Additional configuration for default user (including root if it's default) { - ${cfg.defaultUser} = { + ${config.osbmModules.defaultUser} = { openssh.authorizedKeys.keys = lib.mkDefault [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; From 5fb91cde2fb4191200d10297a787cd2262001827 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 15:18:29 +0300 Subject: [PATCH 1418/1768] impermanence --- hosts/nixos/apollo/configuration.nix | 1 - modules/nixos/system/default.nix | 1 + modules/nixos/system/home-manager.nix | 22 -------------- modules/nixos/system/impermanence.nix | 43 +++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 modules/nixos/system/impermanence.nix diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 0df8e84..223a1cb 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./hardware-configuration.nix ../../../modules/nixos - inputs.impermanence.nixosModules.impermanence ]; osbmModules = { diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index 41e2cfe..dd01a58 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -8,6 +8,7 @@ ./virtualization.nix ./emulation.nix ./i18n.nix + ./impermanence.nix ./fonts.nix ./nix-index.nix ]; diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 412cf77..75289df 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -38,28 +38,6 @@ ++ lib.optionals systemConfig.osbmModules.hardware.disko.zfs.root.impermanenceRoot [ # Import impermanence home-manager module when impermanence is enabled inputs.impermanence.homeManagerModules.impermanence - # Configure persistence - { - home.persistence."/persist/home/${username}" = { - directories = [ - "Pictures" - "Documents" - "Videos" - ".gnupg" - ".ssh" - ".local/share/keyrings" - ".local/share/direnv" - # { - # directory = ".local/share/Steam"; - # method = "symlink"; - # } - ]; - files = [ - ".screenrc" - ]; - allowOther = true; - }; - } ]; }); }; diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix new file mode 100644 index 0000000..dcf6eb9 --- /dev/null +++ b/modules/nixos/system/impermanence.nix @@ -0,0 +1,43 @@ +# impermanence +{lib, inputs, config, ...}: +let + # Filter out 'root' from the users list since it's a special system user + regularUsers = builtins.filter (u: u != "root") config.osbmModules.users; + + # Generate user persistence configuration + userPersistence = lib.genAttrs regularUsers (username: { + directories = [ + "Documents" + { directory = ".gnupg"; mode = "0700"; } + { directory = ".ssh"; mode = "0700"; } + ".local/share/direnv" + ]; + # files = [ + # ".screenrc" + # ]; + }); +in +{ + imports = [ + inputs.impermanence.nixosModules.impermanence + ]; + + config = lib.mkMerge [ + # Enable impermanence root if configured + (lib.mkIf (config.osbmModules.hardware.disko.zfs.root.impermanenceRoot) { + environment.persistence."/persist" = { + hideMounts = true; + directories = [ + "/var/log" + "/var/lib/nixos" + "/var/lib/systemd/coredump" + "/etc/NetworkManager/system-connections" + ]; + files = [ + "/etc/machine-id" + ]; + users = userPersistence; + }; + }) + ]; +} \ No newline at end of file From d98a5734fcd4f0d5ac1b46bc3edcd12fcd8305d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 15:22:48 +0300 Subject: [PATCH 1419/1768] no machineid --- modules/nixos/system/impermanence.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index dcf6eb9..5d67b94 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -33,9 +33,9 @@ in "/var/lib/systemd/coredump" "/etc/NetworkManager/system-connections" ]; - files = [ - "/etc/machine-id" - ]; + # files = [ # the fuck is this file + # "/etc/machine-id" + # ]; users = userPersistence; }; }) From 5101d47e2df70207d52388d01d7b44e9b82cdc02 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 15:29:38 +0300 Subject: [PATCH 1420/1768] fix vscode --- modules/nixos/services/vscode-server.nix | 93 ++++++++++++------------ 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/modules/nixos/services/vscode-server.nix b/modules/nixos/services/vscode-server.nix index 279343c..7df7b67 100644 --- a/modules/nixos/services/vscode-server.nix +++ b/modules/nixos/services/vscode-server.nix @@ -1,53 +1,56 @@ { config, pkgs, + lib, ... }: { - services.code-server = { - # only true if the machine is not pochita - enable = config.networking.hostName != "pochita"; - port = 4444; - disableTelemetry = true; - disableUpdateCheck = true; - user = "osbm"; - group = "users"; - # auth = "none"; - host = "${config.networking.hostName}.curl-boga.ts.net"; - hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; - package = pkgs.vscode-with-extensions.override { - vscode = pkgs.code-server; - vscodeExtensions = - with pkgs.vscode-extensions; - [ - bbenoist.nix - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons - charliermarsh.ruff - davidanson.vscode-markdownlint - esbenp.prettier-vscode - foxundermoon.shell-format - github.copilot - github.vscode-github-actions - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-azuretools.vscode-docker - ms-python.python - # ms-vscode-remote.remote-ssh - timonwong.shellcheck - tyriar.sort-lines - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - # Available in nixpkgs, but outdated (0.4.0) at the time of adding - name = "vscode-tailscale"; - publisher = "tailscale"; - sha256 = "sha256-MKiCZ4Vu+0HS2Kl5+60cWnOtb3udyEriwc+qb/7qgUg="; - version = "1.0.0"; - } - ]; + config = (lib.mkIf config.osbmModules.services.vscode-server.enable { + services.code-server = { + # only true if the machine is not pochita + enable = config.networking.hostName != "pochita"; + port = 4444; + disableTelemetry = true; + disableUpdateCheck = true; + user = "osbm"; + group = "users"; + # auth = "none"; + host = "${config.networking.hostName}.curl-boga.ts.net"; + hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; + package = pkgs.vscode-with-extensions.override { + vscode = pkgs.code-server; + vscodeExtensions = + with pkgs.vscode-extensions; + [ + bbenoist.nix + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + charliermarsh.ruff + davidanson.vscode-markdownlint + esbenp.prettier-vscode + foxundermoon.shell-format + github.copilot + github.vscode-github-actions + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + ms-azuretools.vscode-docker + ms-python.python + # ms-vscode-remote.remote-ssh + timonwong.shellcheck + tyriar.sort-lines + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + # Available in nixpkgs, but outdated (0.4.0) at the time of adding + name = "vscode-tailscale"; + publisher = "tailscale"; + sha256 = "sha256-MKiCZ4Vu+0HS2Kl5+60cWnOtb3udyEriwc+qb/7qgUg="; + version = "1.0.0"; + } + ]; + }; }; - }; - networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; + networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; + }); } From 5b24a1a0f3f409bf8a945d6214fff89606163076 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 15:52:37 +0300 Subject: [PATCH 1421/1768] update flake.lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 2b62518..b9d4c8c 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1760836749, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", "type": "github" }, "original": { @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1761005073, + "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1760338583, - "narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=", + "lastModified": 1760721282, + "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf", + "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1760241904, - "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", + "lastModified": 1760846226, + "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", + "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1753100895, - "narHash": "sha256-nEuGlpIT7q4c/otPu00pGhb5Y12FtQm00pH3MXOJpfw=", + "lastModified": 1760773689, + "narHash": "sha256-TaRP+sx4EiqBcfdKVYKT+RbrRHioJF+HUmiaUaHj5I8=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "27696cac81d4444319bb9158037b0da45e213f5e", + "rev": "1c306c07b3e99ab79b967ead32f9af7b8672a7ef", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1760958188, + "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { From 87a14d619da27ac888ec7b11cea939aa955f6f38 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 15:54:57 +0300 Subject: [PATCH 1422/1768] silence first sudo (because every sudo is first sudo) --- hosts/nixos/apollo/configuration.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 223a1cb..50c9f16 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -76,6 +76,11 @@ users.users.osbm.initialPassword = "changeme"; users.mutableUsers = false; + # Disable sudo lecture message + security.sudo.extraConfig = '' + Defaults lecture = never + ''; + # Network configuration networking = { useDHCP = false; From d09cca58aa854b08ae82c7cf31e1ac3078fc4b74 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 15:55:02 +0300 Subject: [PATCH 1423/1768] apollo --- modules/home-manager/programs/ssh.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index 409c997..3960332 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -44,8 +44,16 @@ in wallfacer-ts = sshBlock "wallfacer.curl-boga.ts.net"; prometheus = sshBlock "192.168.0.12"; prometheus-ts = sshBlock "prometheus.curl-boga.ts.net"; - # apollo - # apollo-initrd + apollo = sshBlock "152.53.152.129"; + apollo-ts = sshBlock "apollo.curl-boga.ts.net"; + apollo-initrd = { + hostname = "152.53.152.129"; + port = 2222; + user = "root"; + identityFile = "~/.ssh/id_ed25519"; + hashKnownHosts = true; + compression = true; + }; # artemis }; }; From d4b2c24d78d936b80bafe59f6f99681fdd9b6478 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:01:02 +0300 Subject: [PATCH 1424/1768] enable i18n --- hosts/nixos/ymir/configuration.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 6469eeb..cfa1e98 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -11,13 +11,15 @@ osbmModules = { desktopEnvironment = "plasma"; - services.jellyfin.enable = true; + programs.adbFastboot.enable = true; emulation.aarch64.enable = true; hardware.hibernation.enable = false; hardware.wakeOnLan.enable = true; hardware.sound.enable = true; - programs.adbFastboot.enable = true; + services.jellyfin.enable = true; services.ollama.enable = true; + i18n.enable = true; + }; # Bootloader. From 3c9eb038ff20890599bd3883c5a12002bacdc9c2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:09:18 +0300 Subject: [PATCH 1425/1768] update path --- hosts/darwinHosts/prometheus/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 892d3a8..3eb5ca2 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -7,8 +7,8 @@ }: { imports = [ - # ../../modules - ../../modules/common-packages.nix + ../../modules/nixos/options.nix + ../../modules/nixos/programs/command-line.nix # inputs.home-manager-darwin.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager ./dummy-module.nix From a52511fc0f439c37a7321cf66d74434a89bef827 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:09:47 +0300 Subject: [PATCH 1426/1768] fix path --- hosts/darwinHosts/prometheus/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 3eb5ca2..5da77b2 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -7,8 +7,8 @@ }: { imports = [ - ../../modules/nixos/options.nix - ../../modules/nixos/programs/command-line.nix + ../../../modules/nixos/options.nix + ../../../modules/nixos/programs/command-line.nix # inputs.home-manager-darwin.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager ./dummy-module.nix From 8e1030645ea5c98df25ab3e8c575442cde2693d7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:10:40 +0300 Subject: [PATCH 1427/1768] i hate darwin --- hosts/darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 5da77b2..327c315 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -19,7 +19,7 @@ useUserPackages = true; verbose = true; backupFileExtension = "hmbak"; - users.osbm = import ../../home/home.nix { + users.osbm = import ../../../modules/home-manager/home.nix { inherit config pkgs; username = "osbm"; homeDirectory = "/Users/osbm"; From f43bc4b89961966e24151e0963c853e39bdea853 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:11:16 +0300 Subject: [PATCH 1428/1768] fuck --- hosts/darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 327c315..c9c2176 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -19,7 +19,7 @@ useUserPackages = true; verbose = true; backupFileExtension = "hmbak"; - users.osbm = import ../../../modules/home-manager/home.nix { + users.osbm = import ../../../modules/home-manager/default.nix { inherit config pkgs; username = "osbm"; homeDirectory = "/Users/osbm"; From 926314380b79c9efe9b31262660132de9d66c701 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:11:47 +0300 Subject: [PATCH 1429/1768] wtf am i doing --- hosts/darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index c9c2176..f57dbd3 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -20,7 +20,7 @@ verbose = true; backupFileExtension = "hmbak"; users.osbm = import ../../../modules/home-manager/default.nix { - inherit config pkgs; + inherit config pkgs lib; username = "osbm"; homeDirectory = "/Users/osbm"; stateVersion = "24.11"; From bc3f697cff2d9f922d75762c94160242a7e14e66 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:21:07 +0300 Subject: [PATCH 1430/1768] fix home manager config --- hosts/darwinHosts/prometheus/configuration.nix | 10 +++------- modules/home-manager/default.nix | 3 +++ modules/nixos/system/home-manager.nix | 11 ++++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index f57dbd3..4e18e7a 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -19,13 +19,9 @@ useUserPackages = true; verbose = true; backupFileExtension = "hmbak"; - users.osbm = import ../../../modules/home-manager/default.nix { - inherit config pkgs lib; - username = "osbm"; - homeDirectory = "/Users/osbm"; - stateVersion = "24.11"; - enableGTK = false; - enableGhostty = false; + users.osbm = { + imports = [ ../../../modules/home-manager ]; + home.stateVersion = "24.11"; }; }; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index dde3bf8..406de61 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -13,6 +13,9 @@ EDITOR = lib.mkDefault "nvim"; }; + # Don't set stateVersion here - let it be set by the system configuration + # home.stateVersion should be set in the system's home-manager configuration + # Enable basic programs that most users want programs.home-manager.enable = true; } diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 75289df..a94170a 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -25,16 +25,17 @@ extraSpecialArgs = { inherit inputs; }; # Configure home-manager for each user (excluding root) - users = + users = let # Capture the NixOS system config before entering the home-manager scope systemConfig = config; in lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: { - home.stateVersion = lib.mkDefault "24.05"; - imports = [ - ../../home-manager - ] + # Use the system's stateVersion for home-manager + home.stateVersion = lib.mkDefault systemConfig.system.stateVersion; + imports = [ + ../../home-manager + ] ++ lib.optionals systemConfig.osbmModules.hardware.disko.zfs.root.impermanenceRoot [ # Import impermanence home-manager module when impermanence is enabled inputs.impermanence.homeManagerModules.impermanence From 805508b5ff12902ae009af60c3c152fa5468df66 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:21:12 +0300 Subject: [PATCH 1431/1768] formatting --- flake.nix | 2 +- modules/nixos/services/vscode-server.nix | 96 ++++++++++++------------ modules/nixos/system/impermanence.nix | 23 ++++-- 3 files changed, 67 insertions(+), 54 deletions(-) diff --git a/flake.nix b/flake.nix index 5c18da9..d82afa7 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ # Export your module system for use in other flakes nixosModules = { default = ./modules/nixos; - osbm = ./modules/nixos; # Alias with your name + osbm = ./modules/nixos; # Alias with your name }; # If you also want to export home-manager modules diff --git a/modules/nixos/services/vscode-server.nix b/modules/nixos/services/vscode-server.nix index 7df7b67..0c51e62 100644 --- a/modules/nixos/services/vscode-server.nix +++ b/modules/nixos/services/vscode-server.nix @@ -5,52 +5,54 @@ ... }: { - config = (lib.mkIf config.osbmModules.services.vscode-server.enable { - services.code-server = { - # only true if the machine is not pochita - enable = config.networking.hostName != "pochita"; - port = 4444; - disableTelemetry = true; - disableUpdateCheck = true; - user = "osbm"; - group = "users"; - # auth = "none"; - host = "${config.networking.hostName}.curl-boga.ts.net"; - hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; - package = pkgs.vscode-with-extensions.override { - vscode = pkgs.code-server; - vscodeExtensions = - with pkgs.vscode-extensions; - [ - bbenoist.nix - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons - charliermarsh.ruff - davidanson.vscode-markdownlint - esbenp.prettier-vscode - foxundermoon.shell-format - github.copilot - github.vscode-github-actions - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-azuretools.vscode-docker - ms-python.python - # ms-vscode-remote.remote-ssh - timonwong.shellcheck - tyriar.sort-lines - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - # Available in nixpkgs, but outdated (0.4.0) at the time of adding - name = "vscode-tailscale"; - publisher = "tailscale"; - sha256 = "sha256-MKiCZ4Vu+0HS2Kl5+60cWnOtb3udyEriwc+qb/7qgUg="; - version = "1.0.0"; - } - ]; + config = ( + lib.mkIf config.osbmModules.services.vscode-server.enable { + services.code-server = { + # only true if the machine is not pochita + enable = config.networking.hostName != "pochita"; + port = 4444; + disableTelemetry = true; + disableUpdateCheck = true; + user = "osbm"; + group = "users"; + # auth = "none"; + host = "${config.networking.hostName}.curl-boga.ts.net"; + hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; + package = pkgs.vscode-with-extensions.override { + vscode = pkgs.code-server; + vscodeExtensions = + with pkgs.vscode-extensions; + [ + bbenoist.nix + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + charliermarsh.ruff + davidanson.vscode-markdownlint + esbenp.prettier-vscode + foxundermoon.shell-format + github.copilot + github.vscode-github-actions + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + ms-azuretools.vscode-docker + ms-python.python + # ms-vscode-remote.remote-ssh + timonwong.shellcheck + tyriar.sort-lines + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + # Available in nixpkgs, but outdated (0.4.0) at the time of adding + name = "vscode-tailscale"; + publisher = "tailscale"; + sha256 = "sha256-MKiCZ4Vu+0HS2Kl5+60cWnOtb3udyEriwc+qb/7qgUg="; + version = "1.0.0"; + } + ]; + }; }; - }; - networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; - }); + networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; + } + ); } diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index 5d67b94..c65a043 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -1,15 +1,26 @@ -# impermanence -{lib, inputs, config, ...}: +# impermanence +{ + lib, + inputs, + config, + ... +}: let # Filter out 'root' from the users list since it's a special system user regularUsers = builtins.filter (u: u != "root") config.osbmModules.users; - + # Generate user persistence configuration userPersistence = lib.genAttrs regularUsers (username: { directories = [ "Documents" - { directory = ".gnupg"; mode = "0700"; } - { directory = ".ssh"; mode = "0700"; } + { + directory = ".gnupg"; + mode = "0700"; + } + { + directory = ".ssh"; + mode = "0700"; + } ".local/share/direnv" ]; # files = [ @@ -40,4 +51,4 @@ in }; }) ]; -} \ No newline at end of file +} From 9907dc8066d078e15c6b42c20065e66360379335 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:25:26 +0300 Subject: [PATCH 1432/1768] fix warning --- modules/home-manager/programs/git.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix index 333fc89..f3cadfd 100644 --- a/modules/home-manager/programs/git.nix +++ b/modules/home-manager/programs/git.nix @@ -1,8 +1,6 @@ { programs.git = { enable = true; - userEmail = "osbm@osbm.dev"; - userName = "osbm"; signing = { format = "openpgp"; }; @@ -14,7 +12,11 @@ "result" # nix "node_modules" # node ]; - extraConfig = { + settings = { + user = { + email = "osbm@osbm.dev"; + name = "osbm"; + }; credential = { helper = "store"; }; From 7d6c5c08ab4ff5b3b7e75d545da001baf76198f7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:29:58 +0300 Subject: [PATCH 1433/1768] move options --- modules/nixos/programs/neovim.nix | 5 +++++ modules/nixos/system/nix-settings.nix | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/nixos/programs/neovim.nix b/modules/nixos/programs/neovim.nix index 429f032..4c0cc3b 100644 --- a/modules/nixos/programs/neovim.nix +++ b/modules/nixos/programs/neovim.nix @@ -10,5 +10,10 @@ environment.systemPackages = [ inputs.osbm-nvim.packages."${pkgs.stdenv.hostPlatform.system}".default ]; + # Environment variables + environment.variables = { + EDITOR = "nvim"; + VISUAL = "nvim"; + }; }; } diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 0e2bbd0..a31c873 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -75,10 +75,6 @@ # Optimize store automatically nix.settings.auto-optimise-store = lib.mkDefault true; - # Environment variables - environment.variables = { - EDITOR = "nvim"; - VISUAL = "nvim"; - }; + }; } From fa1f59047ce9214e171df9e174504f8dc28f587c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:30:10 +0300 Subject: [PATCH 1434/1768] enable neovim --- hosts/darwinHosts/prometheus/configuration.nix | 6 ++++-- hosts/darwinHosts/prometheus/dummy-module.nix | 10 ---------- 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 hosts/darwinHosts/prometheus/dummy-module.nix diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 4e18e7a..7928e44 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -9,11 +9,13 @@ imports = [ ../../../modules/nixos/options.nix ../../../modules/nixos/programs/command-line.nix - # inputs.home-manager-darwin.darwinModules.home-manager inputs.home-manager.darwinModules.home-manager - ./dummy-module.nix ]; + osbmModules = { + programs.neovim.enable = true; + }; + home-manager = { useGlobalPkgs = true; useUserPackages = true; diff --git a/hosts/darwinHosts/prometheus/dummy-module.nix b/hosts/darwinHosts/prometheus/dummy-module.nix deleted file mode 100644 index d4a7076..0000000 --- a/hosts/darwinHosts/prometheus/dummy-module.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, ... }: -{ - options = { - osbmModules.enableKDE = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable KDE Plasma"; - }; - }; -} From e486a9f9cd5441e06956629bcea23962b45998dc Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:33:14 +0300 Subject: [PATCH 1435/1768] add important stuff --- modules/nixos/system/nix-settings.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index a31c873..332ced9 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -75,6 +75,7 @@ # Optimize store automatically nix.settings.auto-optimise-store = lib.mkDefault true; + system.configurationRevision = inputs.self.rev or "dirty"; }; } From a8e7aebcdee992f398187330eb2079cba268da95 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:33:25 +0300 Subject: [PATCH 1436/1768] how about this --- .../darwinHosts/prometheus/configuration.nix | 103 +----------------- 1 file changed, 2 insertions(+), 101 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 7928e44..53a2691 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -9,6 +9,8 @@ imports = [ ../../../modules/nixos/options.nix ../../../modules/nixos/programs/command-line.nix + ../../../modules/nixos/programs/neovim.nix + ../../../modules/nixos/system/nix-settings.nix inputs.home-manager.darwinModules.home-manager ]; @@ -31,107 +33,6 @@ enable = true; }; - # Allow unfree packages - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "vscode" # TODO: remove this - "discord" - "obsidian" - "steam" - "steam-unwrapped" - "open-webui" - "vscode-extension-github-copilot" - "spotify" - "cursor" - # nvidia related (i have to) - "nvidia-x11" - "cuda_cudart" - "libcublas" - "cuda_cccl" - "cuda_nvcc" - "nvidia-settings" - "cuda-merged" - ]; - nixpkgs.config.allowAliases = false; - - # enable nix flakes - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - # nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"]; - - nix.channel.enable = false; - - nix.registry = { - self.flake = inputs.self; - nixpkgs.flake = inputs.nixpkgs; - # nixpkgs = { - # from = { type = "indirect"; id = "nixpkgs"; }; - # to = { - # path = inputs.nixpkgs.outPath; - # type = "path"; - # }; - # }; - - # Commented out because i want to make sure it works if i switch a system - # to another nixpkgs with a different flake input name - # nixpkgs = { - # from = { type = "indirect"; id = "nixpkgs"; }; - # to = { - # path = pkgs.path; - # type = "path"; - # }; - # }; - - osbm-nvim.flake = inputs.osbm-nvim; - my-nixpkgs = { - from = { - type = "indirect"; - id = "my-nixpkgs"; - }; - to = { - owner = "osbm"; - repo = "nixpkgs"; - type = "github"; - }; - }; - osbm-dev = { - from = { - type = "indirect"; - id = "osbm-dev"; - }; - to = { - owner = "osbm"; - repo = "osbm.dev"; - type = "github"; - }; - }; - devshells = { - from = { - type = "indirect"; - id = "devshells"; - }; - to = { - owner = "osbm"; - repo = "devshells"; - type = "github"; - }; - }; - }; - - nix.settings.trusted-users = [ - "root" - "osbm" - "mac" # TODO change mac user to osbm - ]; - - # nix.nixPath = ["nixpkgs=${pkgs.path}"]; - - system.configurationRevision = inputs.self.rev or "dirty"; - programs.fish.enable = true; # osbmModules.setUsers = false; From 06a4200ca5d6ea1bcb7ffb2448f8839ef806f4fb Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:34:37 +0300 Subject: [PATCH 1437/1768] suggestion --- modules/nixos/system/nix-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 332ced9..ea62be1 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -73,7 +73,7 @@ }; # Optimize store automatically - nix.settings.auto-optimise-store = lib.mkDefault true; + nix.optimise.automatic = true; system.configurationRevision = inputs.self.rev or "dirty"; From 157453cd8d7fe94492caf981dc2c2e09215218a1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:37:10 +0300 Subject: [PATCH 1438/1768] fuck --- modules/nixos/system/nix-settings.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index ea62be1..8de646c 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -65,13 +65,6 @@ ]; }; - # Garbage collection - nix.gc = { - automatic = lib.mkDefault true; - dates = lib.mkDefault "weekly"; - options = lib.mkDefault "--delete-older-than 7d"; - }; - # Optimize store automatically nix.optimise.automatic = true; From 59378f866eda0c21adffd4e645d03df5c3860cb9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:40:37 +0300 Subject: [PATCH 1439/1768] enable home manager by default --- modules/nixos/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 50f00d6..673b064 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -44,7 +44,7 @@ homeManager = { enable = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = "Enable home-manager integration"; }; }; From d970da197244575e87f65f8458484171549fe663 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:54:59 +0300 Subject: [PATCH 1440/1768] formatting --- hosts/nixos/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index cfa1e98..d1e3813 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -19,7 +19,6 @@ services.jellyfin.enable = true; services.ollama.enable = true; i18n.enable = true; - }; # Bootloader. From 1b7b0b620cabbd0883cd5db92c1bd29602614dff Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 16:55:01 +0300 Subject: [PATCH 1441/1768] fix --- modules/home-manager/programs/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/home-manager/programs/default.nix b/modules/home-manager/programs/default.nix index 1b22c2c..9da3ac0 100644 --- a/modules/home-manager/programs/default.nix +++ b/modules/home-manager/programs/default.nix @@ -1,16 +1,18 @@ -{ ... }: { imports = [ - ./fish.nix - ./starship.nix - ./git.nix - ./tmux.nix - ./zoxide.nix - ./direnv.nix ./alacritty.nix - ./ghostty.nix - ./wezterm.nix + ./bash.nix + ./direnv.nix ./firefox.nix + ./fish.nix + ./ghostty.nix + ./git.nix ./mpv.nix + ./ssh.nix + ./starship.nix + ./tlrc.nix + ./tmux.nix + ./wezterm.nix + ./zoxide.nix ]; } From be65eb3b8854105cd5244958d23b75f5f22d36e2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 20:47:21 +0300 Subject: [PATCH 1442/1768] firefox --- modules/home-manager/programs/firefox.nix | 18 +++++++++++++----- modules/nixos/system/home-manager.nix | 6 +++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 435e104..d571487 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -1,13 +1,20 @@ { lib, config, + nixosConfig ? null, # Receive the NixOS config ... }: { - options.enableFirefox = lib.mkEnableOption "enableFirefox"; - config = { - programs.firefox = { - enable = config.enableFirefox; + config = lib.mkMerge [ + # Auto-enable Firefox if system has a desktop environment + (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + # Set enableFirefox to true by default when there's a desktop environment + programs.firefox.enable = lib.mkDefault true; + }) + + # Firefox configuration + { + programs.firefox = { languagePacks = [ "ja" "tr" @@ -100,5 +107,6 @@ }; }; }; - }; + } + ]; } diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index a94170a..15a2e27 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -22,7 +22,11 @@ useUserPackages = true; # Pass inputs and outputs to home-manager modules - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { + inherit inputs; + # Pass the NixOS system config to home-manager modules + nixosConfig = config; + }; # Configure home-manager for each user (excluding root) users = From b431744859daa1cf69ed97d5e1921d8c8574195c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 20:51:32 +0300 Subject: [PATCH 1443/1768] automatically enable graphic apps by default --- modules/nixos/options.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 673b064..1b566c3 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ lib, config, ... }: { options.osbmModules = { # Desktop Environment @@ -80,7 +80,7 @@ graphical = { enable = lib.mkOption { type = lib.types.bool; - default = false; + default = config.osbmModules.desktopEnvironment != "none"; description = "Enable graphical applications"; }; }; From 42209ddb6aa8b62a32a50d0129b8375ef9c6db93 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:02:44 +0300 Subject: [PATCH 1444/1768] systemd-boot is default now --- README.md | 1 - hosts/nixos/apollo/configuration.nix | 1 - hosts/nixos/tartarus/configuration.nix | 4 ---- hosts/nixos/wallfacer/configuration.nix | 2 -- hosts/nixos/ymir/configuration.nix | 4 ---- modules/nixos/hardware/boot.nix | 8 ++++++++ modules/nixos/hardware/default.nix | 1 + modules/nixos/hardware/disko.nix | 7 ------- modules/nixos/options.nix | 12 ++++++------ 9 files changed, 15 insertions(+), 25 deletions(-) create mode 100644 modules/nixos/hardware/boot.nix diff --git a/README.md b/README.md index ef1a4ed..26e72c5 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,6 @@ osbmModules = { disko = { enable = true; fileSystem = "zfs"; # options: "zfs", "ext4" - systemd-boot = true; initrd-ssh = { enable = true; ethernetDrivers = [ "igc" ]; diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 50c9f16..65008b1 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -34,7 +34,6 @@ disko = { enable = true; fileSystem = "zfs"; - systemd-boot = true; initrd-ssh = { enable = true; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 1e5406e..e950159 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -16,10 +16,6 @@ hardware.sound.enable = true; }; - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "tartarus"; # Define your hostname. # Enable networking diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 265861e..6026ef1 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -14,8 +14,6 @@ services.cloudflared.enable = true; }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; i18n.inputMethod.enable = lib.mkForce false; networking.hostName = "wallfacer"; system.stateVersion = "25.05"; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index d1e3813..6268864 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -21,10 +21,6 @@ i18n.enable = true; }; - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "ymir"; # Define your hostname. networking.firewall.allowedTCPPorts = [ diff --git a/modules/nixos/hardware/boot.nix b/modules/nixos/hardware/boot.nix new file mode 100644 index 0000000..18673f0 --- /dev/null +++ b/modules/nixos/hardware/boot.nix @@ -0,0 +1,8 @@ +{config, lib, ...}: + +{ + config = lib.mkIf (config.osbmModules.hardware.systemd-boot.enable) { + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + }; +} \ No newline at end of file diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix index d8c30a8..c803909 100644 --- a/modules/nixos/hardware/default.nix +++ b/modules/nixos/hardware/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./boot.nix ./sound.nix ./nvidia.nix ./hibernation.nix diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix index b8c3324..cba32d1 100644 --- a/modules/nixos/hardware/disko.nix +++ b/modules/nixos/hardware/disko.nix @@ -7,7 +7,6 @@ }: let cfg = config.osbmModules.hardware.disko; - inherit (config.networking) hostName; # Default authorized keys for initrd SSH defaultAuthorizedKeys = [ @@ -27,12 +26,6 @@ in ]; config = lib.mkMerge [ - # Systemd-boot setup - (lib.mkIf (cfg.enable && cfg.systemd-boot) { - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - }) - # Initrd SSH for remote unlocking (lib.mkIf (cfg.enable && cfg.initrd-ssh.enable) { boot.initrd.network.enable = true; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 1b566c3..419e06d 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -185,6 +185,12 @@ }; }; + systemd-boot.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Use systemd-boot bootloader"; + }; + # Disko configuration (inspired by ZFS.nix) disko = { enable = lib.mkOption { @@ -208,12 +214,6 @@ description = "Root filesystem type"; }; - systemd-boot = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Use systemd-boot bootloader"; - }; - initrd-ssh = { enable = lib.mkOption { type = lib.types.bool; From a39c31658f4549c6b41874712a23f6d14d284e1e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:12:06 +0300 Subject: [PATCH 1445/1768] fix warning --- modules/home-manager/programs/firefox.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index d571487..32a4993 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -1,6 +1,5 @@ { lib, - config, nixosConfig ? null, # Receive the NixOS config ... }: From 296cc209bdfe281cb1450867f02c122fd8170079 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:12:48 +0300 Subject: [PATCH 1446/1768] only enable fonts based on desktop environment --- modules/nixos/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 419e06d..c98519b 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -383,7 +383,7 @@ fonts = { enable = lib.mkOption { type = lib.types.bool; - default = false; + default = config.osbmModules.desktopEnvironment != "none"; description = "Enable custom fonts"; }; }; From 352e81c1b7081580b8414b287d05674541053292 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:13:53 +0300 Subject: [PATCH 1447/1768] fix warning --- hosts/darwinHosts/prometheus/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 53a2691..1b952d1 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -1,8 +1,6 @@ { pkgs, inputs, - lib, - config, ... }: { From 67c1238cd58fe4177ccae2f74814e4e53d97adce Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:17:34 +0300 Subject: [PATCH 1448/1768] dont enable bayram in userfacing machines --- modules/nixos/options.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index c98519b..900ed4a 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -27,11 +27,12 @@ # Users users = lib.mkOption { type = lib.types.listOf lib.types.str; - default = [ - "osbm" - "bayram" - ]; - description = "List of users to create. `osbm` is my main user, and `bayram` is for my family."; + default = + [ "osbm" ] + ++ lib.optionals + (config.osbmModules.machineType == "desktop" || config.osbmModules.machineType == "laptop") + [ "bayram" ]; + description = "List of users to create. `osbm` is my main user, and `bayram` is for my family (only on desktop/laptop)."; }; defaultUser = lib.mkOption { From e6e57d8a415419a1af93e7bd404060c8bf02f972 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:18:36 +0300 Subject: [PATCH 1449/1768] dont set default values --- hosts/nixos/apollo/configuration.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 65008b1..0c90dc7 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -14,18 +14,6 @@ machineType = "server"; users = [ "osbm" ]; defaultUser = "osbm"; - homeManager.enable = true; - nixSettings.enable = true; - - programs = { - commandLine.enable = true; - neovim.enable = true; - }; - - services = { - openssh.enable = true; - tailscale.enable = true; - }; hardware = { sound.enable = false; From 8dc67f79927fc076185e68ba11f28d49eb792858 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:19:54 +0300 Subject: [PATCH 1450/1768] set machine types --- hosts/nixos/harmonica/configuration.nix | 1 + hosts/nixos/pochita/configuration.nix | 1 + hosts/nixos/tartarus/configuration.nix | 1 + hosts/nixos/wallfacer/configuration.nix | 1 + hosts/nixos/ymir/configuration.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 88c6f7f..71ab11c 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -12,6 +12,7 @@ osbmModules = { desktopEnvironment = "none"; fonts.enable = false; + machineType = "server"; }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 61a7e28..6102cb4 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -15,6 +15,7 @@ osbmModules = { desktopEnvironment = "none"; fonts.enable = false; + machineType = "server"; services.forgejo.enable = true; # services.caddy.enable = true; # services.cloudflare-dyndns.enable = true; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index e950159..86f2b6f 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -12,6 +12,7 @@ osbmModules = { desktopEnvironment = "plasma"; + machineType = "laptop"; emulation.aarch64.enable = true; hardware.sound.enable = true; }; diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 6026ef1..a626a4c 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -7,6 +7,7 @@ osbmModules = { desktopEnvironment = "none"; fonts.enable = false; + machineType = "server"; services.nextcloud.enable = true; services.hydra.enable = true; # services.caddy.enable = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 6268864..65728d4 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -11,6 +11,7 @@ osbmModules = { desktopEnvironment = "plasma"; + machineType = "desktop"; programs.adbFastboot.enable = true; emulation.aarch64.enable = true; hardware.hibernation.enable = false; From f1bdccd2630f74039be2f778ad3304357661659b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:20:05 +0300 Subject: [PATCH 1451/1768] group --- hosts/nixos/ymir/configuration.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 65728d4..3620632 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -14,11 +14,15 @@ machineType = "desktop"; programs.adbFastboot.enable = true; emulation.aarch64.enable = true; - hardware.hibernation.enable = false; - hardware.wakeOnLan.enable = true; - hardware.sound.enable = true; - services.jellyfin.enable = true; - services.ollama.enable = true; + hardware = { + hibernation.enable = false; + wakeOnLan.enable = true; + sound.enable = true; + }; + services = { + jellyfin.enable = true; + ollama.enable = true; + }; i18n.enable = true; }; From d8e7f36073476b7e34615a90e9b901bd66233095 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:20:32 +0300 Subject: [PATCH 1452/1768] fonts are default now --- hosts/nixos/harmonica/configuration.nix | 1 - hosts/nixos/pochita/configuration.nix | 1 - hosts/nixos/wallfacer/configuration.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 71ab11c..8a3e9a3 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -11,7 +11,6 @@ osbmModules = { desktopEnvironment = "none"; - fonts.enable = false; machineType = "server"; }; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 6102cb4..07e69bf 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -14,7 +14,6 @@ osbmModules = { desktopEnvironment = "none"; - fonts.enable = false; machineType = "server"; services.forgejo.enable = true; # services.caddy.enable = true; diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index a626a4c..4ca1a07 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -6,7 +6,6 @@ ]; osbmModules = { desktopEnvironment = "none"; - fonts.enable = false; machineType = "server"; services.nextcloud.enable = true; services.hydra.enable = true; From d693e7571f1a13ff83378a9b1b938acd340ffeff Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:20:42 +0300 Subject: [PATCH 1453/1768] clean --- hosts/nixos/pochita/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 07e69bf..f906a6f 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -16,8 +16,6 @@ desktopEnvironment = "none"; machineType = "server"; services.forgejo.enable = true; - # services.caddy.enable = true; - # services.cloudflare-dyndns.enable = true; services.cloudflared.enable = true; services.vaultwarden.enable = true; services.glance.enable = true; From 22e1851bc5dd6e7271b6c416f4a63a97f6fc6ca1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:23:04 +0300 Subject: [PATCH 1454/1768] warnings --- hosts/nixos/apollo/configuration.nix | 1 - hosts/nixos/apollo/hardware-configuration.nix | 2 +- hosts/nixos/harmonica/configuration.nix | 1 - hosts/nixos/tartarus/configuration.nix | 6 ------ hosts/nixos/tartarus/hardware-configuration.nix | 1 - hosts/nixos/wallfacer/configuration.nix | 2 +- 6 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 0c90dc7..c29680e 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -1,6 +1,5 @@ { lib, - inputs, ... }: { diff --git a/hosts/nixos/apollo/hardware-configuration.nix b/hosts/nixos/apollo/hardware-configuration.nix index 0b20651..2ff3542 100644 --- a/hosts/nixos/apollo/hardware-configuration.nix +++ b/hosts/nixos/apollo/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { # Disko configuration is now managed by osbmModules.hardware.disko # All disk configuration moved to configuration.nix diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 8a3e9a3..b06bfba 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -1,6 +1,5 @@ { lib, - inputs, ... }: { diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 86f2b6f..4c605d4 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -1,9 +1,3 @@ -{ - config, - pkgs, - inputs, - ... -}: { imports = [ ./hardware-configuration.nix diff --git a/hosts/nixos/tartarus/hardware-configuration.nix b/hosts/nixos/tartarus/hardware-configuration.nix index 25d54ac..45f3b93 100644 --- a/hosts/nixos/tartarus/hardware-configuration.nix +++ b/hosts/nixos/tartarus/hardware-configuration.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, modulesPath, ... }: diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 4ca1a07..867abf4 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -1,4 +1,4 @@ -{ lib, config, ... }: +{ lib, ... }: { imports = [ ./hardware-configuration.nix From 28323f2088688df27c954051d4eeefbfea17fd16 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:25:28 +0300 Subject: [PATCH 1455/1768] wtf --- modules/nixos/system/fonts.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/nixos/system/fonts.nix b/modules/nixos/system/fonts.nix index 388afd8..d553ff9 100644 --- a/modules/nixos/system/fonts.nix +++ b/modules/nixos/system/fonts.nix @@ -9,7 +9,7 @@ fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + # noto-fonts-emoji liberation_ttf fira-code fira-code-symbols @@ -17,13 +17,13 @@ dina-font proggyfonts jetbrains-mono - (nerdfonts.override { - fonts = [ - "FiraCode" - "JetBrainsMono" - "Iosevka" - ]; - }) + # (nerdfonts.override { + # fonts = [ + # "FiraCode" + # "JetBrainsMono" + # "Iosevka" + # ]; + # }) ]; fonts.fontconfig = { From b42c5670c772e2ea774de1ef82e4ad04739a9cf8 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:26:09 +0300 Subject: [PATCH 1456/1768] rpi dont use the systemd-boot --- hosts/nixos/harmonica-sd/configuration.nix | 1 + hosts/nixos/harmonica/configuration.nix | 1 + hosts/nixos/pochita/configuration.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index 473fa06..93c94c6 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -15,6 +15,7 @@ desktopEnvironment = "none"; fonts.enable = false; services.tailscale.enable = true; + hardware.systemd-boot.enable = false; # SD card uses extlinux }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index b06bfba..102da9e 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -11,6 +11,7 @@ osbmModules = { desktopEnvironment = "none"; machineType = "server"; + hardware.systemd-boot.enable = false; # Uses extlinux bootloader }; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index f906a6f..1149d8f 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -15,6 +15,7 @@ osbmModules = { desktopEnvironment = "none"; machineType = "server"; + hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader services.forgejo.enable = true; services.cloudflared.enable = true; services.vaultwarden.enable = true; From 5788098c170c6fd15350fc53c126e15d943f570b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:29:13 +0300 Subject: [PATCH 1457/1768] fix agenix --- modules/nixos/system/agenix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix index cd84056..ed6253b 100644 --- a/modules/nixos/system/agenix.nix +++ b/modules/nixos/system/agenix.nix @@ -17,16 +17,16 @@ ]; age.secrets = { - network-manager.file = ../secrets/network-manager.age; + network-manager.file = ../../../secrets/network-manager.age; ssh-key-private = { - file = ../secrets/ssh-key-private.age; + file = ../../../secrets/ssh-key-private.age; path = "/home/osbm/.ssh/id_ed25519"; owner = "osbm"; group = "users"; mode = "600"; }; ssh-key-public = { - file = ../secrets/ssh-key-public.age; + file = ../../../secrets/ssh-key-public.age; path = "/home/osbm/.ssh/id_ed25519.pub"; owner = "osbm"; group = "users"; From a60f7bbbb802f881f14267bf42db6c6be6f47fff Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:29:21 +0300 Subject: [PATCH 1458/1768] enable agenix by default --- modules/nixos/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 900ed4a..4bb5f4a 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -54,7 +54,7 @@ agenix = { enable = lib.mkOption { type = lib.types.bool; - default = false; + default = true; description = "Enable agenix for secrets management"; }; }; From 978368f361b321431cca7e8c0d7f366edb945d0a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:47:03 +0300 Subject: [PATCH 1459/1768] much better --- hosts/nixos/pochita/configuration.nix | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 1149d8f..0af9731 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -16,20 +16,18 @@ desktopEnvironment = "none"; machineType = "server"; hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader - services.forgejo.enable = true; - services.cloudflared.enable = true; - services.vaultwarden.enable = true; - services.glance.enable = true; + services = { + forgejo.enable = true; + cloudflared.enable = true; + vaultwarden.enable = true; + glance.enable = true; + wanikani-bypass-lessons.enable = true; + wanikani-fetch-data.enable = true; + wanikani-stats.enable = true; + }; }; - services.wanikani-bypass-lessons.enable = true; - services.wanikani-fetch-data.enable = true; - services.wanikani-stats.enable = true; - - # paperless is giving an error - # services.paperless = { - # enable = true; - # }; + zramSwap.enable = true; i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method From fc741d19fd3fa61a54ffcb15c5a9da8e37bdb051 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:47:34 +0300 Subject: [PATCH 1460/1768] set defaults --- modules/nixos/options.nix | 3 +++ modules/nixos/services/wanikani-bypass-lessons.nix | 2 +- modules/nixos/services/wanikani-fetch-data/default.nix | 2 +- modules/nixos/services/wanikani-stats/default.nix | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 4bb5f4a..77bac9c 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -150,6 +150,9 @@ glance.enable = lib.mkEnableOption "glance"; hydra.enable = lib.mkEnableOption "hydra"; vscode-server.enable = lib.mkEnableOption "vscode-server"; + wanikani-bypass-lessons.enable = lib.mkEnableOption "wanikani-bypass-lessons"; + wanikani-fetch-data.enable = lib.mkEnableOption "wanikani-fetch-data"; + wanikani-stats.enable = lib.mkEnableOption "wanikani-stats"; }; # Hardware diff --git a/modules/nixos/services/wanikani-bypass-lessons.nix b/modules/nixos/services/wanikani-bypass-lessons.nix index c15ba61..40fd4da 100644 --- a/modules/nixos/services/wanikani-bypass-lessons.nix +++ b/modules/nixos/services/wanikani-bypass-lessons.nix @@ -91,7 +91,7 @@ in { options.services.wanikani-bypass-lessons.enable = lib.mkEnableOption { description = "Enable WaniKani Bypass Lessons"; - default = false; + default = config.osbmModules.services.wanikani-bypass-lessons.enable or false; }; config = lib.mkIf config.services.wanikani-bypass-lessons.enable { diff --git a/modules/nixos/services/wanikani-fetch-data/default.nix b/modules/nixos/services/wanikani-fetch-data/default.nix index 0cf09ae..ff49fe5 100644 --- a/modules/nixos/services/wanikani-fetch-data/default.nix +++ b/modules/nixos/services/wanikani-fetch-data/default.nix @@ -18,7 +18,7 @@ in { options.services.wanikani-fetch-data.enable = lib.mkEnableOption { description = "Enable WaniKani Fetch Data"; - default = false; + default = config.osbmModules.services.wanikani-fetch-data.enable or false; }; config = lib.mkIf config.services.wanikani-fetch-data.enable { diff --git a/modules/nixos/services/wanikani-stats/default.nix b/modules/nixos/services/wanikani-stats/default.nix index 1c0e974..6c9a58a 100644 --- a/modules/nixos/services/wanikani-stats/default.nix +++ b/modules/nixos/services/wanikani-stats/default.nix @@ -53,7 +53,7 @@ in options.services.wanikani-stats = { enable = lib.mkEnableOption { description = "Enable WaniKani Stats Service"; - default = false; + default = config.osbmModules.services.wanikani-stats.enable or false; }; logDirectory = lib.mkOption { From 5afa8b4381901b98fa4c583180acd694ba332a47 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 21:54:09 +0300 Subject: [PATCH 1461/1768] this was japanese --- modules/nixos/system/i18n.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix index 8a127d5..05c403a 100644 --- a/modules/nixos/system/i18n.nix +++ b/modules/nixos/system/i18n.nix @@ -16,7 +16,7 @@ LC_NUMERIC = "tr_TR.UTF-8"; LC_PAPER = "tr_TR.UTF-8"; LC_TELEPHONE = "tr_TR.UTF-8"; - LC_TIME = "tr_TR.UTF-8"; + LC_TIME = "ja_JP.UTF-8"; }; }; } From 228605fd024cff29e8faa05ce1605bfc01caacf2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 22:03:43 +0300 Subject: [PATCH 1462/1768] fix i18n --- hosts/nixos/apollo/configuration.nix | 1 - hosts/nixos/harmonica-sd/configuration.nix | 1 - hosts/nixos/harmonica/configuration.nix | 1 - hosts/nixos/pochita/configuration.nix | 1 - hosts/nixos/wallfacer/configuration.nix | 1 - modules/nixos/system/i18n.nix | 32 ++++++++++++++++++---- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index c29680e..989750e 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -52,7 +52,6 @@ }; }; - i18n.inputMethod.enable = lib.mkForce false; system.stateVersion = "25.11"; networking.hostName = "apollo"; diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index 93c94c6..c4bb5e2 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -18,7 +18,6 @@ hardware.systemd-boot.enable = false; # SD card uses extlinux }; - i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method system.stateVersion = "25.05"; diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 102da9e..e96b380 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -14,7 +14,6 @@ hardware.systemd-boot.enable = false; # Uses extlinux bootloader }; - i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method system.stateVersion = "25.05"; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 0af9731..c9194b5 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -29,7 +29,6 @@ zramSwap.enable = true; - i18n.inputMethod.enable = lib.mkForce false; # no need for japanese input method networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 867abf4..3e239fa 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -14,7 +14,6 @@ services.cloudflared.enable = true; }; - i18n.inputMethod.enable = lib.mkForce false; networking.hostName = "wallfacer"; system.stateVersion = "25.05"; } diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix index 05c403a..a3819e8 100644 --- a/modules/nixos/system/i18n.nix +++ b/modules/nixos/system/i18n.nix @@ -1,13 +1,17 @@ -{ lib, config, ... }: +{ + lib, + pkgs, + config, + ... +}: { config = lib.mkIf config.osbmModules.i18n.enable { - # Set your time zone - time.timeZone = lib.mkDefault "Europe/Istanbul"; + time.timeZone = "Europe/Istanbul"; - # Select internationalisation properties - i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = lib.mkDefault { + i18n.extraLocaleSettings = { LC_ADDRESS = "tr_TR.UTF-8"; LC_IDENTIFICATION = "tr_TR.UTF-8"; LC_MEASUREMENT = "tr_TR.UTF-8"; @@ -17,6 +21,22 @@ LC_PAPER = "tr_TR.UTF-8"; LC_TELEPHONE = "tr_TR.UTF-8"; LC_TIME = "ja_JP.UTF-8"; + # LC_ALL = "en_US.UTF-8"; + }; + + services.xserver.xkb = { + layout = "us"; + variant = ""; + }; + + i18n.inputMethod = { + type = "fcitx5"; + enable = config.osbmModules.desktopEnvironment != "none"; + fcitx5.addons = with pkgs; [ + fcitx5-mozc + fcitx5-gtk + fcitx5-nord # a color theme + ]; }; }; } From 43e6317a351123b88d0ab7bcf5de2d9ce2240dd9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 22:03:49 +0300 Subject: [PATCH 1463/1768] formatting --- modules/nixos/options.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 77bac9c..5cdcf79 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -27,11 +27,12 @@ # Users users = lib.mkOption { type = lib.types.listOf lib.types.str; - default = - [ "osbm" ] - ++ lib.optionals - (config.osbmModules.machineType == "desktop" || config.osbmModules.machineType == "laptop") - [ "bayram" ]; + default = [ + "osbm" + ] + ++ lib.optionals ( + config.osbmModules.machineType == "desktop" || config.osbmModules.machineType == "laptop" + ) [ "bayram" ]; description = "List of users to create. `osbm` is my main user, and `bayram` is for my family (only on desktop/laptop)."; }; From 2cf520a38499b0a31fd6cf2fa2557b49159fdd60 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 22:03:59 +0300 Subject: [PATCH 1464/1768] fix fonts --- modules/nixos/system/fonts.nix | 58 ++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/modules/nixos/system/fonts.nix b/modules/nixos/system/fonts.nix index d553ff9..214d66f 100644 --- a/modules/nixos/system/fonts.nix +++ b/modules/nixos/system/fonts.nix @@ -7,35 +7,51 @@ { config = lib.mkIf config.osbmModules.fonts.enable { fonts.packages = with pkgs; [ - noto-fonts + cascadia-code noto-fonts-cjk-sans - # noto-fonts-emoji + noto-fonts-color-emoji liberation_ttf fira-code fira-code-symbols mplus-outline-fonts.githubRelease dina-font + nerd-fonts.fira-code + nerd-fonts.ubuntu + nerd-fonts.droid-sans-mono proggyfonts - jetbrains-mono - # (nerdfonts.override { - # fonts = [ - # "FiraCode" - # "JetBrainsMono" - # "Iosevka" - # ]; - # }) + source-sans + source-han-sans + source-han-mono + source-sans-pro + source-serif-pro + font-awesome + font-awesome_5 + roboto + twitter-color-emoji + iosevka + dejavu_fonts ]; - - fonts.fontconfig = { - defaultFonts = { - serif = [ "Noto Serif" ]; - sansSerif = [ "Noto Sans" ]; - monospace = [ - "JetBrainsMono Nerd Font" - "Fira Code" - ]; - emoji = [ "Noto Color Emoji" ]; - }; + # fonts.fontconfig = { + # defaultFonts.emoji = ["Noto Color Emoji"]; + # }; + fonts.fontconfig.defaultFonts = { + serif = [ + "Source Han Serif SC" + "Source Han Serif TC" + "Noto Color Emoji" + ]; + sansSerif = [ + "Source Han Sans SC" + "Source Han Sans TC" + "Noto Color Emoji" + ]; + monospace = [ + "Droid Sans Mono" + "DejaVu Sans Mono" + "Source Han Mono" + "Cascadia Code" + ]; + emoji = [ "Noto Color Emoji" ]; }; }; } From 71cca8027204412c58254037cc128c6a1e2b1554 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 22:04:25 +0300 Subject: [PATCH 1465/1768] formatting --- hosts/nixos/harmonica-sd/configuration.nix | 2 +- hosts/nixos/harmonica/configuration.nix | 2 +- hosts/nixos/pochita/configuration.nix | 2 +- modules/home-manager/programs/firefox.nix | 178 ++++++++++----------- modules/nixos/hardware/boot.nix | 4 +- 5 files changed, 94 insertions(+), 94 deletions(-) diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index c4bb5e2..f5558d7 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -15,7 +15,7 @@ desktopEnvironment = "none"; fonts.enable = false; services.tailscale.enable = true; - hardware.systemd-boot.enable = false; # SD card uses extlinux + hardware.systemd-boot.enable = false; # SD card uses extlinux }; diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index e96b380..ee80d8b 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -11,7 +11,7 @@ osbmModules = { desktopEnvironment = "none"; machineType = "server"; - hardware.systemd-boot.enable = false; # Uses extlinux bootloader + hardware.systemd-boot.enable = false; # Uses extlinux bootloader }; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index c9194b5..10ec8fa 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -15,7 +15,7 @@ osbmModules = { desktopEnvironment = "none"; machineType = "server"; - hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader + hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader services = { forgejo.enable = true; cloudflared.enable = true; diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 32a4993..b2e1e86 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -1,6 +1,6 @@ { lib, - nixosConfig ? null, # Receive the NixOS config + nixosConfig ? null, # Receive the NixOS config ... }: { @@ -14,98 +14,98 @@ # Firefox configuration { programs.firefox = { - languagePacks = [ - "ja" - "tr" - "en-US" - ]; - policies = { - DisableTelemetry = true; - DisableFirefoxStudies = true; - EnableTrackingProtection = { - Value = true; - Locked = true; - Cryptomining = true; - Fingerprinting = true; - }; - # DisablePocket = true; - DisableFirefoxAccounts = true; - DisableAccounts = true; - DisableFirefoxScreenshots = true; - StartPage = "previous-session"; - # OverrideFirstRunPage = ""; - # OverridePostUpdatePage = ""; - # DontCheckDefaultBrowser = true; - DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" - # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" - # SearchBar = "unified"; # alternat - ExtensionSettings = - with builtins; - let - extension = shortId: uuid: { - name = uuid; - value = { - install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; + languagePacks = [ + "ja" + "tr" + "en-US" + ]; + policies = { + DisableTelemetry = true; + DisableFirefoxStudies = true; + EnableTrackingProtection = { + Value = true; + Locked = true; + Cryptomining = true; + Fingerprinting = true; + }; + # DisablePocket = true; + DisableFirefoxAccounts = true; + DisableAccounts = true; + DisableFirefoxScreenshots = true; + StartPage = "previous-session"; + # OverrideFirstRunPage = ""; + # OverridePostUpdatePage = ""; + # DontCheckDefaultBrowser = true; + DisplayBookmarksToolbar = "always"; # alternatives: "never" or "newtab" + # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" + # SearchBar = "unified"; # alternat + ExtensionSettings = + with builtins; + let + extension = shortId: uuid: { + name = uuid; + value = { + install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; + installation_mode = "normal_installed"; + }; }; - }; - in - listToAttrs [ - (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") - (extension "ublock-origin" "uBlock0@raymondhill.net") - (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") - (extension "motivation-new-tab" "") - (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") - (extension "violentmonkey" "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}") - (extension "vimium-ff" "{d7742d87-e61d-4b78-b8a1-b469842139fa}") - (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack") - # (extension "tabliss" "extension@tabliss.io") - # (extension "umatrix" "uMatrix@raymondhill.net") - # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") - (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") - (extension "youtube-shorts-block" "") - ]; - # To add additional extensions, find it on addons.mozilla.org, find - # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) - # Then, download the XPI by filling it in to the install_url template, unzip it, - # run `jq .browser_specific_settings.gecko.id manifest.json` or - # `jq .applications.gecko.id manifest.json` to get the UUID - }; - profiles.default = { - id = 0; - name = "osbm"; + in + listToAttrs [ + (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") + (extension "ublock-origin" "uBlock0@raymondhill.net") + (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") + (extension "motivation-new-tab" "") + (extension "return-youtube-dislikes" "{762f9885-5a13-4abd-9c77-433dcd38b8fd}") + (extension "violentmonkey" "{aecec67f-0d10-4fa7-b7c7-609a2db280cf}") + (extension "vimium-ff" "{d7742d87-e61d-4b78-b8a1-b469842139fa}") + (extension "i-dont-care-about-cookies" "jid1-KKzOGWgsW3Ao4Q@jetpack") + # (extension "tabliss" "extension@tabliss.io") + # (extension "umatrix" "uMatrix@raymondhill.net") + # (extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me") + (extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}") + (extension "youtube-shorts-block" "") + ]; + # To add additional extensions, find it on addons.mozilla.org, find + # the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/) + # Then, download the XPI by filling it in to the install_url template, unzip it, + # run `jq .browser_specific_settings.gecko.id manifest.json` or + # `jq .applications.gecko.id manifest.json` to get the UUID + }; + profiles.default = { + id = 0; + name = "osbm"; - userChrome = '' - #tabbrowser-tabs { - visibility: collapse; - } - ''; - settings = { - # "Open previous windows and tabs" - "browser.startup.page" = 3; - "browser.contentblocking.category" = true; - "extensions.pocket.enabled" = false; - "extensions.screenshots.disabled" = true; - "browser.topsites.contile.enabled" = false; - "browser.formfill.enable" = false; - "browser.search.suggest.enabled" = false; - "browser.search.suggest.enabled.private" = false; - "browser.urlbar.suggest.searches" = false; - "browser.urlbar.showSearchSuggestionsFirst" = false; - "browser.newtabpage.activity-stream.feeds.section.topstories" = false; - "browser.newtabpage.activity-stream.feeds.snippets" = false; - "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; - "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; - "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; - "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; - "browser.newtabpage.activity-stream.showSponsored" = false; - "browser.newtabpage.activity-stream.system.showSponsored" = false; - "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "ui.key.menuAccessKeyFocuses" = false; + userChrome = '' + #tabbrowser-tabs { + visibility: collapse; + } + ''; + settings = { + # "Open previous windows and tabs" + "browser.startup.page" = 3; + "browser.contentblocking.category" = true; + "extensions.pocket.enabled" = false; + "extensions.screenshots.disabled" = true; + "browser.topsites.contile.enabled" = false; + "browser.formfill.enable" = false; + "browser.search.suggest.enabled" = false; + "browser.search.suggest.enabled.private" = false; + "browser.urlbar.suggest.searches" = false; + "browser.urlbar.showSearchSuggestionsFirst" = false; + "browser.newtabpage.activity-stream.feeds.section.topstories" = false; + "browser.newtabpage.activity-stream.feeds.snippets" = false; + "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; + "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false; + "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false; + "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false; + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.system.showSponsored" = false; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = false; + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "ui.key.menuAccessKeyFocuses" = false; + }; }; }; - }; } ]; } diff --git a/modules/nixos/hardware/boot.nix b/modules/nixos/hardware/boot.nix index 18673f0..1a497bd 100644 --- a/modules/nixos/hardware/boot.nix +++ b/modules/nixos/hardware/boot.nix @@ -1,8 +1,8 @@ -{config, lib, ...}: +{ config, lib, ... }: { config = lib.mkIf (config.osbmModules.hardware.systemd-boot.enable) { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; }; -} \ No newline at end of file +} From 993f4347ae0e9d93ee9bd25835d8fbe89da064fd Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 21 Oct 2025 22:04:41 +0300 Subject: [PATCH 1466/1768] formatting --- hosts/nixos/harmonica-sd/configuration.nix | 1 - hosts/nixos/harmonica/configuration.nix | 1 - hosts/nixos/pochita/configuration.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index f5558d7..5118eea 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -18,7 +18,6 @@ hardware.systemd-boot.enable = false; # SD card uses extlinux }; - system.stateVersion = "25.05"; networking.hostName = "harmonica"; diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index ee80d8b..01f82dd 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -14,7 +14,6 @@ hardware.systemd-boot.enable = false; # Uses extlinux bootloader }; - system.stateVersion = "25.05"; networking.hostName = "harmonica"; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 10ec8fa..d89c67f 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -29,7 +29,6 @@ zramSwap.enable = true; - networking.hostName = "pochita"; # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" From 8a3d3c882d6697f8caddbad1f4f5febd7595a312 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 11:30:15 +0300 Subject: [PATCH 1467/1768] add mobile-nixos machine artemis --- flake.nix | 8 ++-- hosts/nixos/artemis/configuration.nix | 59 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 hosts/nixos/artemis/configuration.nix diff --git a/flake.nix b/flake.nix index d82afa7..47e997f 100644 --- a/flake.nix +++ b/flake.nix @@ -47,10 +47,10 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - impermanence = { - url = "github:nix-community/impermanence"; - # inputs.nixpkgs.follows = "nixpkgs"; - # inputs.home-manager.follows = "home-manager"; + impermanence.url = "github:nix-community/impermanence"; + mobile-nixos = { + url = "github:mobile-nixos/mobile-nixos"; + flake = false; }; }; diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix new file mode 100644 index 0000000..058cf2f --- /dev/null +++ b/hosts/nixos/artemis/configuration.nix @@ -0,0 +1,59 @@ +{config, lib, pkgs, ...}: { + imports = [ + (import "${mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) + ]; + + # Allow unfree packages (needed for OnePlus firmware) + nixpkgs.config.allowUnfree = true; + + # Enable SSH server (essential for mobile device access) + services.openssh.enable = true; + services.openssh.settings.PermitRootLogin = "yes"; # For initial setup + services.openssh.settings.PasswordAuthentication = true; # For initial setup + + # Set root password for SSH access + users.users.root.password = "nixtheplanet"; + + # Enable GNOME Desktop Environment + services.xserver.enable = true; + services.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + + # Enable GNOME Keyring for password management + services.gnome.gnome-keyring.enable = true; + + # Enable dconf for GNOME settings + programs.dconf.enable = true; + + # Remove unwanted GNOME applications + environment.gnome.excludePackages = with pkgs; [ + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser + simple-scan # document scanner + totem # video player + yelp # help viewer + evince # document viewer + file-roller # archive manager + geary # email client + seahorse # password manager + gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts + gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-screenshot + gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections + ]; + + # Minimal essential packages + environment.systemPackages = with pkgs; [ + git + vim + wget + curl + lazygit + asciiquarium + neovim + kitty + ]; + + system.stateVersion = "25.11"; +} \ No newline at end of file From 35a471825cd8ef8d2b3530cf2b1049115f6a14c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 11:32:57 +0300 Subject: [PATCH 1468/1768] clean --- flake.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 47e997f..0ae3f52 100644 --- a/flake.nix +++ b/flake.nix @@ -95,17 +95,8 @@ lib = import ./lib { inherit (nixpkgs) lib; }; formatter = forAllSystems (system: (makePkgs system).nixfmt-tree); - # Export your module system for use in other flakes - nixosModules = { - default = ./modules/nixos; - osbm = ./modules/nixos; # Alias with your name - }; - - # If you also want to export home-manager modules - homeManagerModules = { - default = ./modules/home-manager; - osbm = ./modules/home-manager; - }; + nixosModules.default = ./modules/nixos; + homeManagerModules.default = ./modules/home-manager; # deploy.nodes.harmonica = { # hostname = "192.168.0.11"; # profiles.system = { From e33509491ca108b8b9cea971884c5035b2f0986e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 11:33:17 +0300 Subject: [PATCH 1469/1768] delete deploy-rs --- flake.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/flake.nix b/flake.nix index 0ae3f52..4c98cf9 100644 --- a/flake.nix +++ b/flake.nix @@ -97,13 +97,6 @@ nixosModules.default = ./modules/nixos; homeManagerModules.default = ./modules/home-manager; - # deploy.nodes.harmonica = { - # hostname = "192.168.0.11"; - # profiles.system = { - # user = "osbm"; - # path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmonica; - # }; - # }; # packages = forAllSystems ( # system: # let From 11fc735d236dcd2e56dbbb41504a2477c0138c39 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:02:36 +0300 Subject: [PATCH 1470/1768] fix atticd --- hosts/nixos/wallfacer/configuration.nix | 2 +- modules/nixos/options.nix | 2 +- .../nixos/services/{attic.nix => atticd.nix} | 18 +++++------------- modules/nixos/services/default.nix | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) rename modules/nixos/services/{attic.nix => atticd.nix} (65%) diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 3e239fa..21182c9 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -10,7 +10,7 @@ services.nextcloud.enable = true; services.hydra.enable = true; # services.caddy.enable = true; - services.attic.enable = true; + services.atticd.enable = true; services.cloudflared.enable = true; }; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 5cdcf79..17dfce3 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -145,7 +145,7 @@ ollama.enable = lib.mkEnableOption "ollama"; forgejo.enable = lib.mkEnableOption "forgejo"; caddy.enable = lib.mkEnableOption "caddy"; - attic.enable = lib.mkEnableOption "attic"; + atticd.enable = lib.mkEnableOption "atticd"; cloudflared.enable = lib.mkEnableOption "cloudflared"; cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns"; glance.enable = lib.mkEnableOption "glance"; diff --git a/modules/nixos/services/attic.nix b/modules/nixos/services/atticd.nix similarity index 65% rename from modules/nixos/services/attic.nix rename to modules/nixos/services/atticd.nix index 6ddf83d..58fdc2a 100644 --- a/modules/nixos/services/attic.nix +++ b/modules/nixos/services/atticd.nix @@ -4,24 +4,16 @@ ... }: let - atticPort = 7080; + atticdPort = 7080; in { - options = { - osbmModules.enableAttic = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Attic nix cache service"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableAttic { + (lib.mkIf config.osbmModules.services.atticd.enable { services.atticd = { enable = true; environmentFile = "/persist/attic.env"; settings = { - listen = "[::]:${toString atticPort}"; + listen = "[::]:${toString atticdPort}"; compression = { type = "zstd"; level = 9; @@ -34,14 +26,14 @@ in # }; }; }; - networking.firewall.allowedTCPPorts = [ atticPort ]; + networking.firewall.allowedTCPPorts = [ atticdPort ]; services.cloudflared.tunnels = { "fa301a21-b259-4149-b3d0-b1438c7c81f8" = { default = "http_status:404"; credentialsFile = "/home/osbm/.cloudflared/fa301a21-b259-4149-b3d0-b1438c7c81f8.json"; ingress = { "cache.osbm.dev" = { - service = "http://localhost:${toString atticPort}"; + service = "http://localhost:${toString atticdPort}"; }; }; }; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index f95d154..26fe647 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./attic.nix + ./atticd.nix ./caddy.nix ./cloudflare-dyndns.nix ./cloudflared.nix From c7a1e9613f9a3812ddb24b473108ce3af224c4ac Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:12:15 +0300 Subject: [PATCH 1471/1768] use my module options --- modules/nixos/services/caddy.nix | 10 +--------- modules/nixos/services/cloudflare-dyndns.nix | 10 +--------- modules/nixos/services/cloudflared.nix | 10 +--------- modules/nixos/services/forgejo.nix | 10 +--------- modules/nixos/services/glance.nix | 10 +--------- modules/nixos/services/hydra.nix | 10 +--------- modules/nixos/services/jellyfin.nix | 10 +--------- modules/nixos/services/nextcloud.nix | 10 +--------- modules/nixos/services/ollama.nix | 12 +----------- modules/nixos/services/openssh.nix | 10 +--------- modules/nixos/services/syncthing.nix | 10 +--------- modules/nixos/services/tailscale.nix | 9 +-------- modules/nixos/services/vaultwarden.nix | 10 +--------- 13 files changed, 13 insertions(+), 118 deletions(-) diff --git a/modules/nixos/services/caddy.nix b/modules/nixos/services/caddy.nix index 5caf07c..c20c225 100644 --- a/modules/nixos/services/caddy.nix +++ b/modules/nixos/services/caddy.nix @@ -5,16 +5,8 @@ ... }: { - options = { - osbmModules.enableCaddy = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Caddy server"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableCaddy { + (lib.mkIf config.osbmModules.services.caddy.enable { services.caddy = { enable = true; # package = pkgs.caddy.withPlugins { diff --git a/modules/nixos/services/cloudflare-dyndns.nix b/modules/nixos/services/cloudflare-dyndns.nix index 3c04b38..bfdc78b 100644 --- a/modules/nixos/services/cloudflare-dyndns.nix +++ b/modules/nixos/services/cloudflare-dyndns.nix @@ -28,16 +28,8 @@ let }; in { - options = { - osbmModules.enableCloudflareDyndns = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable a service to push my public IP address to my Cloudflare domain."; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableCloudflareDyndns { + (lib.mkIf config.osbmModules.services.cloudflare-dyndns.enable { services.cloudflare-dyndns = { package = cloudflare-dyndns-5-3; enable = true; diff --git a/modules/nixos/services/cloudflared.nix b/modules/nixos/services/cloudflared.nix index 9117020..5d8fd72 100644 --- a/modules/nixos/services/cloudflared.nix +++ b/modules/nixos/services/cloudflared.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableCloudflared = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Cloudflare tunnels"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableCloudflared { + (lib.mkIf config.osbmModules.services.cloudflared.enable { services.cloudflared = { enable = true; certificateFile = "/home/osbm/.cloudflared/cert.pem"; diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index 2ada6be..37d3b3d 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableForgejo = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Forgejo server"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableForgejo { + (lib.mkIf config.osbmModules.services.forgejo.enable { services.forgejo = { enable = true; lfs.enable = true; diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 1afb7c8..1fcf4d2 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableGlance = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Glance server"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableGlance { + (lib.mkIf config.osbmModules.services.glance.enable { services.glance = { enable = true; openFirewall = true; diff --git a/modules/nixos/services/hydra.nix b/modules/nixos/services/hydra.nix index e12caf0..3cc6c55 100644 --- a/modules/nixos/services/hydra.nix +++ b/modules/nixos/services/hydra.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableHydra = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Hydra continuous integration server"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableHydra { + (lib.mkIf config.osbmModules.services.hydra.enable { services.hydra = { enable = true; port = 3000; diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix index e8d3e4a..caae383 100644 --- a/modules/nixos/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableJellyfin = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Jellyfin media server"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableJellyfin { + (lib.mkIf config.osbmModules.services.jellyfin.enable { services.jellyfin = { enable = true; openFirewall = true; diff --git a/modules/nixos/services/nextcloud.nix b/modules/nixos/services/nextcloud.nix index 3413d6f..04905d4 100644 --- a/modules/nixos/services/nextcloud.nix +++ b/modules/nixos/services/nextcloud.nix @@ -5,16 +5,8 @@ ... }: { - options = { - osbmModules.enableNextcloud = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Nextcloud server"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableNextcloud { + (lib.mkIf config.osbmModules.services.nextcloud.enable { environment.etc."nextcloud-admin-pass".text = "m7eJ4KJ1NK33JE%51"; services.nextcloud = { enable = true; diff --git a/modules/nixos/services/ollama.nix b/modules/nixos/services/ollama.nix index 31bd5a6..b73333a 100644 --- a/modules/nixos/services/ollama.nix +++ b/modules/nixos/services/ollama.nix @@ -4,18 +4,8 @@ ... }: { - options = { - osbmModules = { - enableOllama = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Ollama services."; - }; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableOllama { + (lib.mkIf config.osbmModules.services.ollama.enable { services.ollama = { enable = true; acceleration = "cuda"; diff --git a/modules/nixos/services/openssh.nix b/modules/nixos/services/openssh.nix index bdbcd35..fd1db86 100644 --- a/modules/nixos/services/openssh.nix +++ b/modules/nixos/services/openssh.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableOpenssh = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Enable OpenSSH service"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableOpenssh { + (lib.mkIf config.osbmModules.services.openssh.enable { services.openssh = { enable = true; startWhenNeeded = true; diff --git a/modules/nixos/services/syncthing.nix b/modules/nixos/services/syncthing.nix index 85b44c5..b831305 100644 --- a/modules/nixos/services/syncthing.nix +++ b/modules/nixos/services/syncthing.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableSyncthing = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Syncthing file synchronization service"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableSyncthing { + (lib.mkIf config.osbmModules.services.syncthing.enable { services.syncthing = { enable = true; openDefaultPorts = true; diff --git a/modules/nixos/services/tailscale.nix b/modules/nixos/services/tailscale.nix index c9095d7..3c01d06 100644 --- a/modules/nixos/services/tailscale.nix +++ b/modules/nixos/services/tailscale.nix @@ -5,13 +5,6 @@ ... }: { - options = { - osbmModules.enableTailscale = lib.mkOption { - type = lib.types.bool; - default = true; - description = "Enable Tailscale VPN"; - }; - }; # i have 4 machines, 2 of them are always at home # pochita (raspberry pi 5) and ymir (desktop) @@ -20,7 +13,7 @@ # and i have a laptop named tartarus config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableTailscale { + (lib.mkIf config.osbmModules.services.tailscale.enable { services.tailscale = { enable = true; port = 51513; diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index b5a2032..33b758d 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -4,16 +4,8 @@ ... }: { - options = { - osbmModules.enableVaultwarden = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable Vaultwarden server"; - }; - }; - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.enableVaultwarden { + (lib.mkIf config.osbmModules.services.vaultwarden.enable { services.vaultwarden = { enable = true; }; From 32d69d95372cfda643445f3135bea0477da174c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:12:32 +0300 Subject: [PATCH 1472/1768] just use the default package --- modules/nixos/services/cloudflare-dyndns.nix | 24 -------------------- 1 file changed, 24 deletions(-) diff --git a/modules/nixos/services/cloudflare-dyndns.nix b/modules/nixos/services/cloudflare-dyndns.nix index bfdc78b..7816f94 100644 --- a/modules/nixos/services/cloudflare-dyndns.nix +++ b/modules/nixos/services/cloudflare-dyndns.nix @@ -4,34 +4,10 @@ pkgs, ... }: -let - # https://github.com/NixOS/nixpkgs/pull/394352 - cloudflare-dyndns-5-3 = pkgs.cloudflare-dyndns.overridePythonAttrs rec { - version = lib.warnIfNot ( - pkgs.cloudflare-dyndns.version == "5.0" - ) "The cloudflare-dyndns package is updated, you should remove this override" "5.3"; - src = pkgs.fetchFromGitHub { - owner = "kissgyorgy"; - repo = "cloudflare-dyndns"; - rev = "v${version}"; - hash = "sha256-t0MqH9lDfl+cAnPYSG7P32OGO8Qpo1ep0Hj3Xl76lhU="; - }; - build-system = with pkgs.python3Packages; [ - hatchling - ]; - dependencies = with pkgs.python3Packages; [ - click - httpx - pydantic - truststore - ]; - }; -in { config = lib.mkMerge [ (lib.mkIf config.osbmModules.services.cloudflare-dyndns.enable { services.cloudflare-dyndns = { - package = cloudflare-dyndns-5-3; enable = true; apiTokenFile = "/persist/cloudflare-dyndns"; proxied = false; # TODO please revert From 87606e30807ced832504b99def59e41146325d54 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:12:51 +0300 Subject: [PATCH 1473/1768] use current hostName --- modules/nixos/services/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nextcloud.nix b/modules/nixos/services/nextcloud.nix index 04905d4..ff30f48 100644 --- a/modules/nixos/services/nextcloud.nix +++ b/modules/nixos/services/nextcloud.nix @@ -16,7 +16,7 @@ config.dbtype = "sqlite"; database.createLocally = true; settings.trusted_domains = [ - "wallfacer.curl-boga.ts.net" + "${config.networking.hostName}.curl-boga.ts.net" "localhost" ]; }; From 53c234ec3c8ed1663cc1163a3542f1554a21b27c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:12:55 +0300 Subject: [PATCH 1474/1768] clean --- modules/nixos/services/tailscale.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/nixos/services/tailscale.nix b/modules/nixos/services/tailscale.nix index 3c01d06..ca26029 100644 --- a/modules/nixos/services/tailscale.nix +++ b/modules/nixos/services/tailscale.nix @@ -5,13 +5,6 @@ ... }: { - - # i have 4 machines, 2 of them are always at home - # pochita (raspberry pi 5) and ymir (desktop) - # pochita will be on all the time, ymir can be wake on lan - - # and i have a laptop named tartarus - config = lib.mkMerge [ (lib.mkIf config.osbmModules.services.tailscale.enable { services.tailscale = { From 705996899debf3e5e4afc045e65b416ff44cb8c6 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:13:07 +0300 Subject: [PATCH 1475/1768] seperate out options --- modules/nixos/services/forgejo.nix | 3 +++ modules/nixos/services/glance.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index 37d3b3d..cc03e8f 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -33,6 +33,9 @@ }; }; }; + }) + + (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable) { services.cloudflared.tunnels = { "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { default = "http_status:404"; diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 1fcf4d2..f2d4209 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -163,6 +163,8 @@ }; }; networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ]; + }) + (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable) { services.cloudflared.tunnels = { "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { default = "http_status:404"; From 573c0b3fc29a7b4d391a903fd4e48e3a920ec313 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:13:37 +0300 Subject: [PATCH 1476/1768] automatic domain variable value --- modules/nixos/services/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index cc03e8f..b82fa34 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -41,7 +41,7 @@ default = "http_status:404"; credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; ingress = { - "git.osbm.dev" = { + "${config.osbmModules.services.forgejo.settings.server.DOMAIN}" = { service = "http://localhost:3000"; }; }; From 450b3766a050e01a09cb06438780c5d5d366e168 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:17:51 +0300 Subject: [PATCH 1477/1768] fix --- modules/nixos/services/forgejo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index b82fa34..bb6ba38 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -41,7 +41,7 @@ default = "http_status:404"; credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; ingress = { - "${config.osbmModules.services.forgejo.settings.server.DOMAIN}" = { + "${config.services.forgejo.settings.server.DOMAIN}" = { service = "http://localhost:3000"; }; }; From e4743a30e702d8112e00acc8e22e65a46dfb494b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:19:27 +0300 Subject: [PATCH 1478/1768] update flake.lock --- flake.lock | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b9d4c8c..02d17aa 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1761005073, - "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=", + "lastModified": 1761081701, + "narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f", + "rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315", "type": "github" }, "original": { @@ -227,6 +227,22 @@ "type": "github" } }, + "mobile-nixos": { + "flake": false, + "locked": { + "lastModified": 1759261417, + "narHash": "sha256-TjuoBb8+isL3KTdGgtYh90XPyeUMFbgNAOG9l23CB3A=", + "owner": "mobile-nixos", + "repo": "mobile-nixos", + "rev": "e6f6d527bf6abf94dd52fbba3143a720cef96431", + "type": "github" + }, + "original": { + "owner": "mobile-nixos", + "repo": "mobile-nixos", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -622,6 +638,7 @@ "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", + "mobile-nixos": "mobile-nixos", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", From 23cb1166c9df930d7b973620afd73cd475d69678 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 13:31:27 +0300 Subject: [PATCH 1479/1768] formatting --- hosts/nixos/artemis/configuration.nix | 45 ++++++++++++++++++--------- modules/nixos/services/forgejo.nix | 23 ++++++++------ modules/nixos/services/glance.nix | 23 ++++++++------ 3 files changed, 57 insertions(+), 34 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 058cf2f..ccc4c87 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -1,4 +1,10 @@ -{config, lib, pkgs, ...}: { +{ + config, + lib, + pkgs, + ... +}: +{ imports = [ (import "${mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) ]; @@ -27,20 +33,31 @@ # Remove unwanted GNOME applications environment.gnome.excludePackages = with pkgs; [ - baobab # disk usage analyzer - cheese # photo booth - eog # image viewer - epiphany # web browser + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser simple-scan # document scanner - totem # video player - yelp # help viewer - evince # document viewer + totem # video player + yelp # help viewer + evince # document viewer file-roller # archive manager - geary # email client - seahorse # password manager - gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts - gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-screenshot - gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections + geary # email client + seahorse # password manager + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + gnome-screenshot + gnome-system-monitor + gnome-weather + gnome-disk-utility + pkgs.gnome-connections ]; # Minimal essential packages @@ -56,4 +73,4 @@ ]; system.stateVersion = "25.11"; -} \ No newline at end of file +} diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index bb6ba38..550f267 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -35,18 +35,21 @@ }; }) - (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable) { - services.cloudflared.tunnels = { - "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { - default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; - ingress = { - "${config.services.forgejo.settings.server.DOMAIN}" = { - service = "http://localhost:3000"; + (lib.mkIf + (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.forgejo.enable) + { + services.cloudflared.tunnels = { + "eb9052aa-9867-482f-80e3-97a7d7e2ef04" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/eb9052aa-9867-482f-80e3-97a7d7e2ef04.json"; + ingress = { + "${config.services.forgejo.settings.server.DOMAIN}" = { + service = "http://localhost:3000"; + }; }; }; }; - }; - }) + } + ) ]; } diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index f2d4209..dec1780 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -164,18 +164,21 @@ }; networking.firewall.allowedTCPPorts = [ config.services.glance.settings.server.port ]; }) - (lib.mkIf (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable) { - services.cloudflared.tunnels = { - "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { - default = "http_status:404"; - credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; - ingress = { - "home.osbm.dev" = { - service = "http://localhost:${toString config.services.glance.settings.server.port}"; + (lib.mkIf + (config.osbmModules.services.cloudflared.enable && config.osbmModules.services.glance.enable) + { + services.cloudflared.tunnels = { + "91b13f9b-81be-46e1-bca0-db2640bf2d0a" = { + default = "http_status:404"; + credentialsFile = "/home/osbm/.cloudflared/91b13f9b-81be-46e1-bca0-db2640bf2d0a.json"; + ingress = { + "home.osbm.dev" = { + service = "http://localhost:${toString config.services.glance.settings.server.port}"; + }; }; }; }; - }; - }) + } + ) ]; } From 181fa36037d8eb04ae900e99dfd8528368dc8ba5 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 21:19:39 +0300 Subject: [PATCH 1480/1768] clean --- hosts/nixos/apollo/configuration.nix | 4 ---- hosts/nixos/harmonica-sd/configuration.nix | 1 - hosts/nixos/harmonica/configuration.nix | 4 ---- hosts/nixos/pochita/configuration.nix | 1 - hosts/nixos/wallfacer/configuration.nix | 1 - 5 files changed, 11 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 989750e..6ad7057 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -1,7 +1,3 @@ -{ - lib, - ... -}: { imports = [ ./hardware-configuration.nix diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index 5118eea..e3a84f7 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -1,5 +1,4 @@ { - lib, inputs, ... }: diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 01f82dd..4bb24af 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -1,7 +1,3 @@ -{ - lib, - ... -}: { imports = [ ./hardware-configuration.nix diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index d89c67f..8766e08 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -1,6 +1,5 @@ { pkgs, - lib, inputs, ... }: diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 21182c9..3a99424 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -1,4 +1,3 @@ -{ lib, ... }: { imports = [ ./hardware-configuration.nix From 533b1978256fe55b69fe1c1a2293ba97d58e7417 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 21:20:10 +0300 Subject: [PATCH 1481/1768] set home manager options properly --- modules/home-manager/programs/alacritty.nix | 36 ++++++++++------ modules/home-manager/programs/ghostty.nix | 12 +++--- modules/home-manager/programs/mpv.nix | 24 +++++++---- modules/home-manager/programs/wezterm.nix | 48 +++++++++++---------- 4 files changed, 71 insertions(+), 49 deletions(-) diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix index a3c6b41..7a60352 100644 --- a/modules/home-manager/programs/alacritty.nix +++ b/modules/home-manager/programs/alacritty.nix @@ -1,18 +1,26 @@ -{ lib, ... }: +{ lib, nixosConfig, ... }: { - programs.alacritty = { - enable = lib.mkDefault false; - settings = { - window = { - opacity = 0.95; - padding = { - x = 10; - y = 10; + config = lib.mkMerge [ + (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + # Set enableAlacritty to true by default when there's a desktop environment + programs.alacritty.enable = lib.mkDefault true; + }) + + { + programs.alacritty = { + settings = { + window = { + opacity = 0.95; + padding = { + x = 10; + y = 10; + }; + }; + font = { + size = 11.0; + }; }; }; - font = { - size = 11.0; - }; - }; - }; + } + ]; } diff --git a/modules/home-manager/programs/ghostty.nix b/modules/home-manager/programs/ghostty.nix index e5977bf..6c50f2e 100644 --- a/modules/home-manager/programs/ghostty.nix +++ b/modules/home-manager/programs/ghostty.nix @@ -1,7 +1,9 @@ -{ lib, ... }: +{ lib, nixosConfig, ... }: { - programs.ghostty = { - enable = lib.mkDefault false; - # Configuration can be added as needed - }; + config = lib.mkMerge [ + (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + # Set enableGhostty to true by default when there's a desktop environment + programs.ghostty.enable = lib.mkDefault true; + }) + ]; } diff --git a/modules/home-manager/programs/mpv.nix b/modules/home-manager/programs/mpv.nix index f08f20c..0353ae2 100644 --- a/modules/home-manager/programs/mpv.nix +++ b/modules/home-manager/programs/mpv.nix @@ -1,10 +1,18 @@ -{ lib, ... }: +{ lib, nixosConfig, ... }: { - programs.mpv = { - enable = lib.mkDefault false; - config = { - hwdec = "auto"; - vo = "gpu"; - }; - }; + config = lib.mkMerge [ + (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + programs.mpv.enable = lib.mkDefault true; + }) + + { + programs.mpv = { + config = { + hwdec = "auto"; + vo = "gpu"; + }; + }; + } + + ]; } diff --git a/modules/home-manager/programs/wezterm.nix b/modules/home-manager/programs/wezterm.nix index 7a5a93c..2282220 100644 --- a/modules/home-manager/programs/wezterm.nix +++ b/modules/home-manager/programs/wezterm.nix @@ -1,32 +1,36 @@ { lib, - config, pkgs, + nixosConfig, ... }: { - options.enableWezterm = lib.mkEnableOption "Wezterm terminal emulator"; - config = { - programs.wezterm = { - enable = config.enableWezterm; - extraConfig = '' - _G.shells = { - fish = '${lib.getExe pkgs.fish}' - }; + config = lib.mkMerge [ + (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + programs.wezterm.enable = lib.mkDefault true; + }) - wezterm.on('gui-startup', function(cmd) - local tab, pane, window = wezterm.mux.spawn_window(cmd or {}) - window:gui_window():maximize() - end) + { + programs.wezterm = { + extraConfig = '' + _G.shells = { + fish = '${lib.getExe pkgs.fish}' + }; + + wezterm.on('gui-startup', function(cmd) + local tab, pane, window = wezterm.mux.spawn_window(cmd or {}) + window:gui_window():maximize() + end) - return { - default_prog = { _G.shells.fish }, - window_decorations = "NONE", - hide_tab_bar_if_only_one_tab = true, - enable_wayland = false, - } - ''; - }; - }; + return { + default_prog = { _G.shells.fish }, + window_decorations = "NONE", + hide_tab_bar_if_only_one_tab = true, + enable_wayland = false, + } + ''; + }; + } + ]; } From ec2587216ca631784deb862e0c32d0faa364bbd7 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 21:20:19 +0300 Subject: [PATCH 1482/1768] fix artemis config --- hosts/nixos/artemis/configuration.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index ccc4c87..42b572d 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -1,12 +1,11 @@ { - config, - lib, + inputs, pkgs, ... }: { imports = [ - (import "${mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) + (import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) ]; # Allow unfree packages (needed for OnePlus firmware) @@ -73,4 +72,6 @@ ]; system.stateVersion = "25.11"; + # set platform to aarch64-linux + nixpkgs.system = "aarch64-linux"; } From d411e9739eeee3492ba4df44f00b7710ae4aee00 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 21:25:31 +0300 Subject: [PATCH 1483/1768] clena --- hosts/nixos/wallfacer/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/wallfacer/hardware-configuration.nix b/hosts/nixos/wallfacer/hardware-configuration.nix index d9c96cf..4677e64 100644 --- a/hosts/nixos/wallfacer/hardware-configuration.nix +++ b/hosts/nixos/wallfacer/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: From eef919ed3a0cf566297707b98a91283699ea4d57 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 21:25:35 +0300 Subject: [PATCH 1484/1768] clean --- modules/nixos/services/cloudflare-dyndns.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixos/services/cloudflare-dyndns.nix b/modules/nixos/services/cloudflare-dyndns.nix index 7816f94..9290980 100644 --- a/modules/nixos/services/cloudflare-dyndns.nix +++ b/modules/nixos/services/cloudflare-dyndns.nix @@ -1,7 +1,6 @@ { lib, config, - pkgs, ... }: { From 3ff2d4d7979c47382b2ef48733b0542a671fd46b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 21:55:35 +0300 Subject: [PATCH 1485/1768] setting substituters like this is bad --- modules/nixos/system/nix-settings.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 8de646c..5554327 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -54,17 +54,6 @@ config.osbmModules.defaultUser ]; - # Binary cache configuration - nix.settings = { - substituters = [ - "https://nix-community.cachix.org" - ]; - - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; - # Optimize store automatically nix.optimise.automatic = true; From 408d64d321959cd329dbce73ef3dd399c0cda275 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 22 Oct 2025 22:03:31 +0300 Subject: [PATCH 1486/1768] add apollo and rekey --- secrets/cloudflare.age | 29 +++++++++++++++++------------ secrets/network-manager.age | Bin 704 -> 814 bytes secrets/secrets.nix | 3 +++ secrets/ssh-key-private.age | Bin 1051 -> 1161 bytes secrets/ssh-key-public.age | Bin 733 -> 843 bytes 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index 71449f1..406ae1c 100644 --- a/secrets/cloudflare.age +++ b/secrets/cloudflare.age @@ -1,13 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ 8lnr11Kwh1J/jI8tlTZTJYQfrB7hjBeHy5OhV1MXf2Q -BqO+83r2fLB3ZFEMFObKk4RbcKhUpqt4ikUbJhoXqjs --> ssh-ed25519 a9zBzw 2TaCU3xA8LiyFEKCTECJeR4ZCVZjaU+O1cINoNtK/XE -KCvDNzGrjxYVIpD6xHi/amAfvGGmXNd9tpwimHuGoiE --> ssh-ed25519 /0F2+A +UYxpGexr/2fgMRyKXlqyXz1qV40YosdfN6gyWlV0zY -XwDQL2toWbRBWXiw/AgipJxqCE0U2tXxwgrZUeN/69A --> ssh-ed25519 cs+R0A HMuQrVzNA53fYlXv14TJbAtDx8twbHfr7LyeCQIdJCI -H3Mk559SukAQBA9JZmomDU2sanYM19XT4b2HmqTkBBc --> ssh-ed25519 Ws1uag vFXa6FwDRkEBfwigdOAmdL7GefbPbAkTiKkn89Vew0g -+QqrYKClcUWMaTzi6A4CvGL2aG3zUK87fDQnIs/t7fA ---- 6R3Wki1NJX6MrhqJKlhRPSzGFrfayKgbuacLyJqIQQ4 -bo_d.(1frkd~4J~,p;VbD*ǧ Y- sO}Ecj8C \ No newline at end of file +-> ssh-ed25519 YVcKMQ m+TzH0uOU2/6ti8oabwOPMBRWC3X2GvY7JojIxvVIUE +mkeLDnnaXmh2E1q9ueYzkstzqRZBVqY1pJ1XYlOC+oo +-> ssh-ed25519 a9zBzw +qk1Gh0ocii1g/C2lDeZr447f9OMzmJM891ruFzoglM +n4kgDIZqDsuUOZqB15DHS7hJCijm+Ee+tlBsdgzdaHc +-> ssh-ed25519 /0F2+A D1s3AcvFmhsxSaRzgsXR4+C/epvCdYVDCA7bmtNmeyA +KqhvU1bsC44PYcBGX9k7ply5YILCIJkVBK2sWKPXUVc +-> ssh-ed25519 cs+R0A 1U34IFVZ/59q3rvTzYpb+fW0OZnbVB31moZzPj7UNXw +fX2eQ+M2nl+RbbKVpOP7N8a6v2zCBorOxmYFWW9gW/0 +-> ssh-ed25519 uTfCrQ vsWkwNohHmWosDB2oNl5OWfaQqz4MvdBo+lPdSzCrS0 +1J1uw5g7vP0zMC3MT/7kuNsSekANW1UAxBetWTMqZZA +-> ssh-ed25519 Ws1uag /9kr4cVp8bcLhZlvn08+6SH5zEKQ9LoLF235qThsJis +g/qs1nTGPk6TH75z7KyMCgimVPAkjSgaWBmgRNdTxWo +--- 1sGduFDJf3DfTO87Q3CecpHJ7A1dVqJWT1uMtBunk+Y +ۇ\[~.@dzLb4YשC +G6x +P +Υ^%zM:4bLf? \ No newline at end of file diff --git a/secrets/network-manager.age b/secrets/network-manager.age index 898fb620e3ed2516392006df377846387e2b4285..c79dfbc3fe2eb75a885615a8edab6230798cd93f 100644 GIT binary patch delta 725 zcmX@Wx{hsvPQ89!d5)n^ZboWGj*&@8fV-<}c8I=fNkwE%RdAU=nYnVw^xK~nTn6r6Kh@n@WOPOC@u2-N>Sb=FpR)uGh1(&X!LUD11 zZfc5=si~o*LZW4rQ&qWwexjw1udhj3T1jr6mtjD9p__hQj*nYnMp|Hgij${Pwx3Cm zZ)Bloa721KSH4AVNN!buNoHQ8K}3bOyRW&wc}bXOeyC?qS#o)~UzLxWVN^tzMY4(O z#E;_PKCV@v#*scI{z;)hS>9FN!4(lvmbvbZ*`6L=Vd2?cC6P&yhUt|iX<5EpF8+?b zfr;)O+PMKP&QWD1sb1RV5g}QbLB+1#ex^mP+HTHej`^7xuI1U2;~B;4LjpqmBF$3V z-NM3>-2;>SqoOR#stlcyqtcv$N}P++O^toDGcA0BDykg0N{fTcT+=IZ(%gOAj6L!y zeG}8PgZ+{s{0$63&3u!by>dd6BAn8E^K(7XL#Z?*&ABL0p(s77AU`o9Gr%t_%q7*l zJi;wErNAxH!Y8WAG~C6+w=z68!!aPst18&pkt@YLBD~zVEIlmDtumv?E8oH~u*}fe z!!pgi%EK)zF*waD*fTNFB{a#(!jzHceCW&9G{fnY_6y(H$T5DUlZ4W2or+>?I2^rB(ESdkGzsZZ?}BUT%VM3 z1OL!)zm!PhY%X10U4@FY0v~?^!^BMeklfrLr)1C4$RP97aOa#HGymXpvm`U8qF7&l zx3W;}3JWgj&cucOM(ySgzg@g$vV=pReWkP2^Xd@UU)d`Qg=dOHKjzMmR8Ktf)i~%O vOL^iXp5MKl-?di@J+7a1LA1v>fAbS2hF{B1)|j(Ro4GP%NnL2Z*qTrPUX1wY delta 633 zcmZ3-c7Sz)PJLczaFU^CdTC&?rFpo1QBJnR|J* z3745mmannDi+7oexut7~N1}dWmPeYlx1nW~zL9ZQP^581m6^Y9zGZltBbTn7LUD11 zZfc5=si~o*LZW4rQ&qWwg}NE$rkg=>VnIoXXP!rRQdvo$UzUGn zXntW z#E;_PWmP_IC2o0M=ALF%2L3_*=23y!=_VE~UfF&wWl4!;1!Zo*#(5cGRe=^<<(@`m zIT7aBMf$1Qp@lvk240y)kttPCrtT@h;ZbQRK~Z5Ad0{0{Ibp?<;~B;4oin^kEh3`A zodZk#O7gP`BHWF#qN=?7OFRst()~*wG(qP0&;!1^4t>hQk_zr41Eo}a{Qb# zEm9)=BXac1&C>G{jh)O({JhMn0#lt#jndN5Ln*x2urx7U!K^T~JS;1!(l5x<(IU^Q z%B|i=JHWBTO~0_P(lW{0FVmtdFfy>bGB6{!n5!tvyF4^Cpd`%4O*_OXH!#34Gf~^A z(8MDwC)qgPJs`5sH8ok^$)h5xm`hhzSD`%7JKfp5z&+VGJ;24&)i*plFxxLM+utkG z$+RphFReJpG$kt6E8o{Wl7fqrMhJPS^l?Xo(j!@zv_~|Ui`m$&yQIj4=0|ks#0F> I^;?V$0A=#u>Hq)$ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 8c79bf6..36b16fd 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,8 +1,10 @@ let + # cat /etc/ssh/ssh_host_ed25519_key.pub on each machine ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFgjjvukAG0RvQfHj5Iy64XOFh9YbdnNAmgFUvzlnAEt"; tartarus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxbIyQnQFA1RFQKH4eHHWcT7Z0tCumerCsRMjlHgSPd"; pochita = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHpE9pf7ZeNvpW1GxLLF8kB0Q8HQO7XSIea1Oe9qubKt"; wallfacer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOr8pQvLsNCHQdsBKWpziYTPjBkEcQy272kZ5Gqoaatt"; + apollo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINsV8e8veX5/weeC8he+31aiNVZfQ82BpvSzARSM1uZF"; osbm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"; @@ -11,6 +13,7 @@ let tartarus pochita wallfacer + apollo ]; in { diff --git a/secrets/ssh-key-private.age b/secrets/ssh-key-private.age index 4ef6990830dfbc1f3b688d393b0935530f2338dd..0ef0ecd70423465f19bbe7240043b9c608720660 100644 GIT binary patch delta 1075 zcmbQu(aAYMr#`WuBG)@5tHdlfFQ?M5IM6vgq|76wJk2}1s?;$zH^kh@H`voP)i^K1 zfXm-3yDHM()Ht*%)hjj1!^FbO(aF_4$D=ezJHW>)wW_Gx)FjZ{Bi$s`mrK`9p}06h zH#Nn`)YQ;YAKd&^h(mT=5Kdm%y z;z#lD+?--B^PtFl!)%M(q_h%mN5k|i5C2T#M8EVL7q>FQ!c>byr(*Lc{YnF_D%0fb zq=F>Rw1PAbLnGJ1ssPWVWT)JSNMApvq(GAtpX{`Pq(B$XihP5~@r>g2IboH>Majm& zA?5n1#eR_~UTI}UC4PY>#Yu^!`Du<$#U3STX=TM;7FFe3!G*MaC8-8JTIGAx=Sl8O~*1VOc?G2L8$Dp;Q`@=3Er0P@a>V9GI8lX<}kj8JOl? zV&N9%ZtR@l>0jXP=3eF(8s?kt6XBcVT<+oI%T-uZXciU`tZ$fOSn89X9T8GmkQ9|x z98l^T8l>;ymaQKd>|^AVXqgu5JNYc5czsb=akjQ$xpP24X-1~6Q%0t#V}-F(fTwqq zYh-DzmYl^v%TdGTCx@%cjQg~HJUZuZz zQc#jnX|6>@GMBEdu0mF2aaE;7aZqSQW@u`Xk5iyuo_m&lXhn##zKNx!PiCcdc)hP< zRc@+Da52~J#DjsXAGukrOkRWrOm#RNW_8!PT-9rCZR+Bl{1sMniq`)W`) zn++Vwo^zczZC{tp?YpAS&p2`AZ7(*?kIvQ7npumVtzBxJnxk-Q+lt2;{4ZWR)$MtH zL^#c2a#2N7ORGuUlh5rGVtlj z2(bz|^;gdAkMr-Uq-|_6usdMMWNe#1>CkzBeP49ju3VFxp6lFK?AZF2>xk0F#_J}N zz8XXd~gV!vq_a7f;uw&|79!hf?xjqE}i`@bd}W`3gb=Yw|Zm*fEc zq~B}4rAOFIKXJ$_Gm3K|mw4uiZR~7sAD-A|9!^;(|v?R+y1ZJ%gB;_HY)D@ z@7|1RA@83TH!eT=dCA!q98qiDb#4vG?l`06?pS!hc1hj}>)vf%uMI@sXsrHt>yZDh z-PdG4JU_8NNa*(q=Gn_iOM_US@_Ia-P($g;S+C_T$DJj2Y>$;r#uIK;ThI6XKjFiSft-$}bNGTqH1Ks(te zl&j3y(%Zm0Ki$p3x3n~+(8VCvG}+f!J0Q}cascr&x|T(GqXw`*Hr&(<3c0n?8pfJ$c((qtdQJ93+HsMK!YSF zOA{Zg2jwzX;Wp0j! zzTU;5`31pwh92&r+F5Qz$=(LudHNPc;boyEp2ZbTNqPBPK3Qo_nE^RoE{2YoIl0N& zLAmML;XY1AX(=AQ1|~rnzD8wbrCDxnp@y#Lp%h+hSelrwP@e7^6r5XC99EF-XQ&@l zYFh7}R_L7)jWL}o+85L3$$Q9%q5M~sfWRhkPRAwG!Y2qAdnjc_b zTH#rk=C5DuWME!t;A>Wtn-%P0!KJIKtKgLq~OvE!>!G(VAYpB*7MH(o^P9f^v%W{cI{K9?_?L|K2%+1W*&Lg>GE-LC6ftSx-)7X z``znUuxrs%(@$;n*4dmdC+b{yJF(<|WZI>Q%g)SqG&*c_3duTS@h@B%3T@#o;&+%licUN4SKbR+dy#YgIUHgWpB3~Xg@eD^Pom{^xN(C zzIaV(chUaRV63M0IIBr*^69uwYr`@OAMLqw{V4N;id`*J-$lQVpQ~7vDEt4Up@DvY zvC_5EJvt5loz_okS$Ax2ePbj~sL5?jF?opd6+wLanXt?Tta^KOeP{NDXF zD>%{Jm_)pZ@#TU3qDvsTkNyx<2Ffi=CEBq zu3A3|cdE&6&ZxZb#=1P?oQu)SS{aXT)qUs68++D3`9CLUD11 zZfc5=si~o*LZW4rQ&qWwTY+1OPmz;lVVZGXuxYZsrCUgTijiArh?A$bUqxw#r*DvH znM+`Rr*Tj^SAjv8S5Qc4vT>3@VrD@>Kt^F+Qb38Xk#T@`VzzURVL+&xad=8um7jU? z#E;_PAt@1_2Bq3j?io?u7Ty*rb{U7bV9!~LQHG7VCkO!QrRTm!PvL#Z?*&ABL0!P&qh!@#^GyfQ!A&)L^0 z+siHA*U&XR-z2jv#Lzse%&jy%*&`*-$uT(0g3C4E)jzAuJ1V2B#G=T>H90xmvnVJ$ z$JfZwSKrIi%+1R**Vj=$&Cx5xVDec;@%mzyP{+{ntRheI68)^~>ja%4D<3P(O41pj6M&Y;7+$ci*x+ zx7;lEP_sOXWG-D@U4>wyh)T0$(iT%(MCJ77te^x%6x~Kj*O7UjMC6&q=SH{_m1Y zYTQ$Xr?o;Ck6VSGyfQz13a6m4vDoz;wv#{SZ#l2R9r9wzoZ24!%i=LrS8Zy`Laesx ahza$ySZ#bE#Wa~K#%YiJ-e=w1&H?}qZUsUB delta 662 zcmX@jc9(U6PJKa!SH5GGYjA0Wflsl2hM8Z!OQ}IbS*m_XW~7IHVpwHxgtvZ0N`!Wv z30GiMWR#<0gim%*dSYHwfv0I$fI&ujNLFEiQ($FYwtsR!Ub=xnPH9qdB$uw8LUD11 zZfc5=si~o*LZW4rQ&qWwSx#<9ra^G3i%EHfc7$n$xm##?c7cgsilKIji=|~=xL3Zf znUkkazJ7T&SAmarVQ!vpaip_BmWg3uNtI8Tlb=assIj4YmAjjA`-%jscbh5k(cr0WPU&Rhh+HE*9ar zMW#vap5`Hm+0KdjPWm36xt3WKEz8y>jw1{Y$H|o%71M$`TW`ORIdnydBF^Omi#D z^Ycy8oCCtbi@f~H9Mi*%@{6<6v-Qi(!UNLLLn*x2urx7Up|r9h(972)z%tM=Ej2%> zFrdCHEw9AfKQPDGC(Fg%G(E({)U3=q-#59^l`GBI#oIM0$0DT4*f7Q1*F!tot1`8` zI4jU8JSj@w(?`Epzsk$CsxYN2l1o=tSHUI9za-Nv%2~fCGs@N6A~DF-DZ?B(SI-c>T>QMFTn&RKrXNYN}1=hRDiJ$n|?Yb#%@BEm161&$f n4^&wC Date: Thu, 23 Oct 2025 09:05:20 +0300 Subject: [PATCH 1487/1768] enable home manager backup --- modules/nixos/system/home-manager.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 15a2e27..b3944cd 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -20,6 +20,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; + backupFileExtension = ".nixbak"; # Pass inputs and outputs to home-manager modules extraSpecialArgs = { From 546bb7bdaa672bce91caa9aaea4af29b7d33642a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 09:12:10 +0300 Subject: [PATCH 1488/1768] disable yakuake --- modules/nixos/system/desktop-environment.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 430316f..6bd8da6 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -18,6 +18,8 @@ in environment.plasma6.excludePackages = with pkgs.kdePackages; [ kate konsole + yakuake + # kfind ?? ]; # Enable printing From 1a0615304da67e5e4c9e573b7dee715c26d6a634 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 10:09:37 +0300 Subject: [PATCH 1489/1768] add apollo recipe --- justfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/justfile b/justfile index f7e9f68..09deb4a 100644 --- a/justfile +++ b/justfile @@ -65,3 +65,11 @@ flash-sd-image-harmonica: nom build -L .#nixosConfigurations.harmonica-sd.config.system.build.sdImage sudo dd if=result/sd-image/nixos-image-sd-card-25.05.20250224.0196c01-aarch64-linux.img of=/dev/sda bs=4M status=progress conv=fsync +setup-apollo-nixos: + nano /tmp/secret.key + sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode destroy,format,mount --flake github:osbm/flake#apollo + + sudo mkdir -p /mnt/etc/ssh + sudo ssh-keygen -t ed25519 -N "" -f /mnt/etc/ssh/initrd + + sudo nixos-install --flake github:osbm/flake#apollo --root /mnt --no-root-passwd From f9a6bccf424bcf71d99bca3d505cfca168d64d11 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:30:19 +0300 Subject: [PATCH 1490/1768] add bluetooth option --- modules/nixos/hardware/bluetooth.nix | 7 +++++++ modules/nixos/hardware/default.nix | 1 + modules/nixos/options.nix | 8 ++++++++ 3 files changed, 16 insertions(+) create mode 100644 modules/nixos/hardware/bluetooth.nix diff --git a/modules/nixos/hardware/bluetooth.nix b/modules/nixos/hardware/bluetooth.nix new file mode 100644 index 0000000..d307d1d --- /dev/null +++ b/modules/nixos/hardware/bluetooth.nix @@ -0,0 +1,7 @@ +{ config, lib, ... }: +{ + config = lib.mkIf config.hardware.bluetooth.enable { + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + }; +} \ No newline at end of file diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix index c803909..f916a3e 100644 --- a/modules/nixos/hardware/default.nix +++ b/modules/nixos/hardware/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./bluetooth.nix ./boot.nix ./sound.nix ./nvidia.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 17dfce3..4e0c973 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -158,6 +158,14 @@ # Hardware hardware = { + bluetooth = { + enable = lib.mkOption { + type = lib.types.bool; + default = config.osbmModules.desktopEnvironment != "none"; + description = "Enable Bluetooth support"; + }; + }; + sound = { enable = lib.mkOption { type = lib.types.bool; From 19a0a6dff62d4742f4d6501ff02e1408c2f0fad1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:31:09 +0300 Subject: [PATCH 1491/1768] de config --- modules/nixos/system/desktop-environment.nix | 51 +++++++++++++++----- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 6bd8da6..d1b02bf 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -25,10 +25,6 @@ in # Enable printing services.printing.enable = true; - # Enable Bluetooth - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - # Desktop packages environment.systemPackages = with pkgs; [ alacritty @@ -46,16 +42,47 @@ in # GNOME Desktop Environment (lib.mkIf (cfg.desktopEnvironment == "gnome") { - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - # Enable printing - services.printing.enable = true; + # Enable GNOME Desktop Environment + services.xserver.enable = true; + services.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + + # Enable GNOME Keyring for password management + services.gnome.gnome-keyring.enable = true; + + # Enable dconf for GNOME settings + programs.dconf.enable = true; + + # Remove unwanted GNOME applications + environment.gnome.excludePackages = with pkgs; [ + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser + simple-scan # document scanner + totem # video player + yelp # help viewer + evince # document viewer + file-roller # archive manager + geary # email client + seahorse # password manager + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + gnome-screenshot + gnome-system-monitor + gnome-weather + gnome-disk-utility + pkgs.gnome-connections + ]; - # Enable Bluetooth - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; }) # Common settings for any desktop environment From d7b69e36c3ceacbb7491831a6af3fc80208de07e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:31:17 +0300 Subject: [PATCH 1492/1768] artemis config --- hosts/nixos/artemis/configuration.nix | 56 +++------------------------ 1 file changed, 6 insertions(+), 50 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 42b572d..d2e1335 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -6,58 +6,14 @@ { imports = [ (import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) + ../../../modules/nixos ]; - # Allow unfree packages (needed for OnePlus firmware) - nixpkgs.config.allowUnfree = true; - - # Enable SSH server (essential for mobile device access) - services.openssh.enable = true; - services.openssh.settings.PermitRootLogin = "yes"; # For initial setup - services.openssh.settings.PasswordAuthentication = true; # For initial setup - - # Set root password for SSH access - users.users.root.password = "nixtheplanet"; - - # Enable GNOME Desktop Environment - services.xserver.enable = true; - services.desktopManager.gnome.enable = true; - services.displayManager.gdm.enable = true; - - # Enable GNOME Keyring for password management - services.gnome.gnome-keyring.enable = true; - - # Enable dconf for GNOME settings - programs.dconf.enable = true; - - # Remove unwanted GNOME applications - environment.gnome.excludePackages = with pkgs; [ - baobab # disk usage analyzer - cheese # photo booth - eog # image viewer - epiphany # web browser - simple-scan # document scanner - totem # video player - yelp # help viewer - evince # document viewer - file-roller # archive manager - geary # email client - seahorse # password manager - gnome-calculator - gnome-calendar - gnome-characters - gnome-clocks - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - gnome-screenshot - gnome-system-monitor - gnome-weather - gnome-disk-utility - pkgs.gnome-connections - ]; + osbmModules = { + desktopEnvironment = "gnome"; + machineType = "mobile"; + hardware.systemd-boot.enable = false; # Mobile devices use different bootloader + }; # Minimal essential packages environment.systemPackages = with pkgs; [ From 8c5a06346f0c80e5ed9877b975aa54c942694047 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:31:59 +0300 Subject: [PATCH 1493/1768] mb --- modules/nixos/hardware/bluetooth.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/hardware/bluetooth.nix b/modules/nixos/hardware/bluetooth.nix index d307d1d..4fc8157 100644 --- a/modules/nixos/hardware/bluetooth.nix +++ b/modules/nixos/hardware/bluetooth.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - config = lib.mkIf config.hardware.bluetooth.enable { + config = lib.mkIf config.osbmModules.hardware.bluetooth.enable { hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; }; From bfeb05e5e33d6669c3283be99e3249b6d9291acc Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:40:45 +0300 Subject: [PATCH 1494/1768] this is super awesome that the nix gives error about this --- modules/nixos/options.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 4e0c973..0c25029 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -5,6 +5,7 @@ desktopEnvironment = lib.mkOption { type = lib.types.enum [ "plasma" + "gnome" "none" ]; default = "none"; From d03ef4a8f469a1b0a372882feeda51d8fc1cfb8b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:59:35 +0300 Subject: [PATCH 1495/1768] Revert "this is super awesome that the nix gives error about this" This reverts commit bfeb05e5e33d6669c3283be99e3249b6d9291acc. --- modules/nixos/options.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 0c25029..4e0c973 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -5,7 +5,6 @@ desktopEnvironment = lib.mkOption { type = lib.types.enum [ "plasma" - "gnome" "none" ]; default = "none"; From 3337820bd710440e72fffd7ba7dcf85d8e020c83 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:59:36 +0300 Subject: [PATCH 1496/1768] Revert "mb" This reverts commit 8c5a06346f0c80e5ed9877b975aa54c942694047. --- modules/nixos/hardware/bluetooth.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/hardware/bluetooth.nix b/modules/nixos/hardware/bluetooth.nix index 4fc8157..d307d1d 100644 --- a/modules/nixos/hardware/bluetooth.nix +++ b/modules/nixos/hardware/bluetooth.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - config = lib.mkIf config.osbmModules.hardware.bluetooth.enable { + config = lib.mkIf config.hardware.bluetooth.enable { hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; }; From a6eb2ef36626b68b062e83e3d4bf508fb545e7e2 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 21:59:38 +0300 Subject: [PATCH 1497/1768] Revert "artemis config" This reverts commit d7b69e36c3ceacbb7491831a6af3fc80208de07e. --- hosts/nixos/artemis/configuration.nix | 56 ++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index d2e1335..42b572d 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -6,14 +6,58 @@ { imports = [ (import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) - ../../../modules/nixos ]; - osbmModules = { - desktopEnvironment = "gnome"; - machineType = "mobile"; - hardware.systemd-boot.enable = false; # Mobile devices use different bootloader - }; + # Allow unfree packages (needed for OnePlus firmware) + nixpkgs.config.allowUnfree = true; + + # Enable SSH server (essential for mobile device access) + services.openssh.enable = true; + services.openssh.settings.PermitRootLogin = "yes"; # For initial setup + services.openssh.settings.PasswordAuthentication = true; # For initial setup + + # Set root password for SSH access + users.users.root.password = "nixtheplanet"; + + # Enable GNOME Desktop Environment + services.xserver.enable = true; + services.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + + # Enable GNOME Keyring for password management + services.gnome.gnome-keyring.enable = true; + + # Enable dconf for GNOME settings + programs.dconf.enable = true; + + # Remove unwanted GNOME applications + environment.gnome.excludePackages = with pkgs; [ + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser + simple-scan # document scanner + totem # video player + yelp # help viewer + evince # document viewer + file-roller # archive manager + geary # email client + seahorse # password manager + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + gnome-screenshot + gnome-system-monitor + gnome-weather + gnome-disk-utility + pkgs.gnome-connections + ]; # Minimal essential packages environment.systemPackages = with pkgs; [ From b808e9e6e7c4d9bd36711ae284b249accd70a4f5 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 22:02:41 +0300 Subject: [PATCH 1498/1768] these are working --- modules/nixos/hardware/bluetooth.nix | 2 +- modules/nixos/options.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixos/hardware/bluetooth.nix b/modules/nixos/hardware/bluetooth.nix index d307d1d..4fc8157 100644 --- a/modules/nixos/hardware/bluetooth.nix +++ b/modules/nixos/hardware/bluetooth.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - config = lib.mkIf config.hardware.bluetooth.enable { + config = lib.mkIf config.osbmModules.hardware.bluetooth.enable { hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; }; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 4e0c973..0c25029 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -5,6 +5,7 @@ desktopEnvironment = lib.mkOption { type = lib.types.enum [ "plasma" + "gnome" "none" ]; default = "none"; From 64f58e8b5fab83d083b9bb18b04b5cda68445e97 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 23 Oct 2025 22:14:43 +0300 Subject: [PATCH 1499/1768] enable module system for artemis --- hosts/nixos/artemis/configuration.nix | 60 ++++++--------------------- 1 file changed, 13 insertions(+), 47 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 42b572d..00e553d 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -1,62 +1,28 @@ { inputs, pkgs, + lib, ... }: { imports = [ (import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "oneplus-enchilada"; }) + ../../../modules/nixos ]; - # Allow unfree packages (needed for OnePlus firmware) - nixpkgs.config.allowUnfree = true; + osbmModules = { + desktopEnvironment = "gnome"; + machineType = "mobile"; + hardware.systemd-boot.enable = false; # Mobile devices use different bootloader + programs.graphical.enable = false; + }; - # Enable SSH server (essential for mobile device access) - services.openssh.enable = true; - services.openssh.settings.PermitRootLogin = "yes"; # For initial setup - services.openssh.settings.PasswordAuthentication = true; # For initial setup + # mobile-nixos needs aliases (uses nettools instead of net-tools) + nixpkgs.config.allowAliases = true; - # Set root password for SSH access - users.users.root.password = "nixtheplanet"; - - # Enable GNOME Desktop Environment - services.xserver.enable = true; - services.desktopManager.gnome.enable = true; - services.displayManager.gdm.enable = true; - - # Enable GNOME Keyring for password management - services.gnome.gnome-keyring.enable = true; - - # Enable dconf for GNOME settings - programs.dconf.enable = true; - - # Remove unwanted GNOME applications - environment.gnome.excludePackages = with pkgs; [ - baobab # disk usage analyzer - cheese # photo booth - eog # image viewer - epiphany # web browser - simple-scan # document scanner - totem # video player - yelp # help viewer - evince # document viewer - file-roller # archive manager - geary # email client - seahorse # password manager - gnome-calculator - gnome-calendar - gnome-characters - gnome-clocks - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - gnome-screenshot - gnome-system-monitor - gnome-weather - gnome-disk-utility - pkgs.gnome-connections + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "oneplus-sdm845-firmware-zstd" + "oneplus-sdm845-firmware" ]; # Minimal essential packages From 0fdc1b1c9ca8910c1902dca1ab4e1636102c25f5 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Oct 2025 08:37:36 +0300 Subject: [PATCH 1500/1768] add impermanent folders for tailscale --- modules/nixos/services/tailscale.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/nixos/services/tailscale.nix b/modules/nixos/services/tailscale.nix index ca26029..ffd19b5 100644 --- a/modules/nixos/services/tailscale.nix +++ b/modules/nixos/services/tailscale.nix @@ -15,5 +15,18 @@ networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ]; environment.systemPackages = [ pkgs.tailscale ]; }) + + # tailscale and impermanence + (lib.mkIf + ( + config.osbmModules.services.tailscale.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + environment.persistence."/persist".directories = [ + "/var/lib/tailscale" + ]; + } + ) ]; } From 9d8b0a8e5a0859898449e192a0cc9d970deffdd6 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Oct 2025 08:37:55 +0300 Subject: [PATCH 1501/1768] formatting --- hosts/nixos/artemis/configuration.nix | 10 +-- modules/nixos/hardware/bluetooth.nix | 2 +- modules/nixos/system/desktop-environment.nix | 72 ++++++++++---------- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 00e553d..f4685e8 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -20,10 +20,12 @@ # mobile-nixos needs aliases (uses nettools instead of net-tools) nixpkgs.config.allowAliases = true; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "oneplus-sdm845-firmware-zstd" - "oneplus-sdm845-firmware" - ]; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "oneplus-sdm845-firmware-zstd" + "oneplus-sdm845-firmware" + ]; # Minimal essential packages environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/hardware/bluetooth.nix b/modules/nixos/hardware/bluetooth.nix index 4fc8157..ec44d02 100644 --- a/modules/nixos/hardware/bluetooth.nix +++ b/modules/nixos/hardware/bluetooth.nix @@ -4,4 +4,4 @@ hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; }; -} \ No newline at end of file +} diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index d1b02bf..2aca4ae 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -43,45 +43,45 @@ in # GNOME Desktop Environment (lib.mkIf (cfg.desktopEnvironment == "gnome") { - # Enable GNOME Desktop Environment - services.xserver.enable = true; - services.desktopManager.gnome.enable = true; - services.displayManager.gdm.enable = true; + # Enable GNOME Desktop Environment + services.xserver.enable = true; + services.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; - # Enable GNOME Keyring for password management - services.gnome.gnome-keyring.enable = true; + # Enable GNOME Keyring for password management + services.gnome.gnome-keyring.enable = true; - # Enable dconf for GNOME settings - programs.dconf.enable = true; + # Enable dconf for GNOME settings + programs.dconf.enable = true; - # Remove unwanted GNOME applications - environment.gnome.excludePackages = with pkgs; [ - baobab # disk usage analyzer - cheese # photo booth - eog # image viewer - epiphany # web browser - simple-scan # document scanner - totem # video player - yelp # help viewer - evince # document viewer - file-roller # archive manager - geary # email client - seahorse # password manager - gnome-calculator - gnome-calendar - gnome-characters - gnome-clocks - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - gnome-screenshot - gnome-system-monitor - gnome-weather - gnome-disk-utility - pkgs.gnome-connections - ]; + # Remove unwanted GNOME applications + environment.gnome.excludePackages = with pkgs; [ + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser + simple-scan # document scanner + totem # video player + yelp # help viewer + evince # document viewer + file-roller # archive manager + geary # email client + seahorse # password manager + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + gnome-screenshot + gnome-system-monitor + gnome-weather + gnome-disk-utility + pkgs.gnome-connections + ]; }) From f645f628afc879bea33c5bcb014e7136857fd844 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 24 Oct 2025 10:23:07 +0300 Subject: [PATCH 1502/1768] add sweep --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index 09deb4a..0f5dab6 100644 --- a/justfile +++ b/justfile @@ -73,3 +73,6 @@ setup-apollo-nixos: sudo ssh-keygen -t ed25519 -N "" -f /mnt/etc/ssh/initrd sudo nixos-install --flake github:osbm/flake#apollo --root /mnt --no-root-passwd + +sweep *args: + nix run github:jzbor/nix-sweep -- {{args}} \ No newline at end of file From 7b31987e01b2c8539b7c1eff6119cad3909c2250 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 16:53:50 +0300 Subject: [PATCH 1503/1768] disable krunner --- modules/nixos/system/desktop-environment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 2aca4ae..583fd09 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -19,7 +19,7 @@ in kate konsole yakuake - # kfind ?? + krunner # fuckass program keeps opening ]; # Enable printing From 13629266643d0bb58a7028dd1b8ad897a0eb8d1a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 17:08:43 +0300 Subject: [PATCH 1504/1768] im a grown ass man --- hosts/nixos/pochita/hardware-configuration.nix | 3 --- hosts/nixos/wallfacer/hardware-configuration.nix | 3 --- 2 files changed, 6 deletions(-) diff --git a/hosts/nixos/pochita/hardware-configuration.nix b/hosts/nixos/pochita/hardware-configuration.nix index 6a94256..c174f0b 100644 --- a/hosts/nixos/pochita/hardware-configuration.nix +++ b/hosts/nixos/pochita/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { lib, modulesPath, diff --git a/hosts/nixos/wallfacer/hardware-configuration.nix b/hosts/nixos/wallfacer/hardware-configuration.nix index 4677e64..87b7ccd 100644 --- a/hosts/nixos/wallfacer/hardware-configuration.nix +++ b/hosts/nixos/wallfacer/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, From d7be077d2358513705cd5300063e21c849a4b116 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 17:09:12 +0300 Subject: [PATCH 1505/1768] nvidia options update --- README.md | 2 +- hosts/nixos/ymir/configuration.nix | 56 ++---------------------------- modules/nixos/hardware/nvidia.nix | 40 ++++++++++++++++----- modules/nixos/options.nix | 2 +- 4 files changed, 36 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index 26e72c5..e654d52 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ osbmModules = { }; hardware = { sound.enable = true; - nvidiaDriver.enable = false; + nvidia.enable = false; hibernation.enable = false; disko = { enable = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 3620632..bec494a 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -1,8 +1,3 @@ -{ - config, - pkgs, - ... -}: { imports = [ ./hardware-configuration.nix @@ -18,6 +13,7 @@ hibernation.enable = false; wakeOnLan.enable = true; sound.enable = true; + nvidia.enable = true; }; services = { jellyfin.enable = true; @@ -36,55 +32,7 @@ # Enable networking networking.networkmanager.enable = true; - hardware.nvidia-container-toolkit.enable = true; - - # Enable OpenGL - programs.nix-required-mounts.enable = true; - programs.nix-required-mounts.presets.nvidia-gpu.enable = true; - - hardware.graphics = { - enable = true; - }; - virtualisation.waydroid.enable = true; - # Load nvidia driver for Xorg and Wayland - services.xserver.videoDrivers = [ "nvidia" ]; - - hardware.nvidia = { - # Modesetting is required. - modesetting.enable = true; - - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. - powerManagement.enable = false; - - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). - powerManagement.finegrained = false; - - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = false; - - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings` - nvidiaSettings = true; - - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.beta; - }; - - environment.systemPackages = with pkgs; [ - nvidia-container-toolkit - ]; - - system.stateVersion = "25.05"; # great taboo of the nixos world + system.stateVersion = "25.05"; # changing this is a great taboo of the nixos world } diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix index e010ea8..f3b992b 100644 --- a/modules/nixos/hardware/nvidia.nix +++ b/modules/nixos/hardware/nvidia.nix @@ -1,6 +1,6 @@ -{ lib, config, ... }: +{ lib, config, pkgs, ... }: { - config = lib.mkIf config.osbmModules.hardware.nvidiaDriver.enable { + config = lib.mkIf config.osbmModules.hardware.nvidia.enable { # Enable OpenGL hardware.graphics = { enable = true; @@ -10,21 +10,45 @@ services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { - # Modesetting is required + # Modesetting is required. modesetting.enable = true; - # Nvidia power management + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. powerManagement.enable = false; + + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). powerManagement.finegrained = false; - # Use the open source kernel module + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. open = false; - # Enable the Nvidia settings menu + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings` nvidiaSettings = true; - # Select appropriate driver version - package = config.boot.kernelPackages.nvidiaPackages.stable; + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.latest; + }; + + environment.systemPackages = [ + pkgs.nvidia-container-toolkit + ]; + + + # TODO explain why this is needed + programs.nix-required-mounts = { + enable = true; + presets.nvidia-gpu.enable = true; }; # Enable nvidia-container-toolkit if virtualization is enabled diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 0c25029..d618394 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -175,7 +175,7 @@ }; }; - nvidiaDriver = { + nvidia = { enable = lib.mkOption { type = lib.types.bool; default = false; From 7cc5c7b38ec86294f01b54b017236c5419c077de Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 17:09:19 +0300 Subject: [PATCH 1506/1768] clean --- hosts/nixos/ymir/hardware-configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/ymir/hardware-configuration.nix b/hosts/nixos/ymir/hardware-configuration.nix index 35232ea..5143b09 100644 --- a/hosts/nixos/ymir/hardware-configuration.nix +++ b/hosts/nixos/ymir/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: From 87817a5ba057e7ec029de3a49624d1cdac678326 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 17:09:27 +0300 Subject: [PATCH 1507/1768] formatting --- modules/nixos/hardware/nvidia.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix index f3b992b..c82105c 100644 --- a/modules/nixos/hardware/nvidia.nix +++ b/modules/nixos/hardware/nvidia.nix @@ -1,4 +1,9 @@ -{ lib, config, pkgs, ... }: +{ + lib, + config, + pkgs, + ... +}: { config = lib.mkIf config.osbmModules.hardware.nvidia.enable { # Enable OpenGL @@ -44,7 +49,6 @@ pkgs.nvidia-container-toolkit ]; - # TODO explain why this is needed programs.nix-required-mounts = { enable = true; From 0da060f14ca3b8676f0b1e7629e48cb7c7be7d1c Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 17:51:08 +0300 Subject: [PATCH 1508/1768] group these options --- hosts/nixos/wallfacer/configuration.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 3a99424..80e702b 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -6,11 +6,13 @@ osbmModules = { desktopEnvironment = "none"; machineType = "server"; - services.nextcloud.enable = true; - services.hydra.enable = true; - # services.caddy.enable = true; - services.atticd.enable = true; - services.cloudflared.enable = true; + services = { + nextcloud.enable = true; + hydra.enable = true; + # caddy.enable = true; + atticd.enable = true; + cloudflared.enable = true; + }; }; networking.hostName = "wallfacer"; From 6064048f496d84e21cd8c6fd0b373be887f79fcc Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 17:51:16 +0300 Subject: [PATCH 1509/1768] add dysk --- modules/nixos/programs/command-line.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index 8311a71..9905fcb 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -47,6 +47,7 @@ fd dust duf + dysk (pkgs.writeShellScriptBin "wake-ymir" '' echo waking up ymir ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 From 3063145a283660bdc354658f5fdd99cbf0e17316 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 17:59:10 +0300 Subject: [PATCH 1510/1768] cleaner --- modules/nixos/programs/command-line.nix | 82 +++++++++++++++---------- 1 file changed, 50 insertions(+), 32 deletions(-) diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index 9905fcb..2bf4d65 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -7,47 +7,65 @@ { config = lib.mkIf config.osbmModules.programs.commandLine.enable { environment.systemPackages = with pkgs; [ + # networking wget + dig + + # text editors nano + + # version control git lazygit - lazysql git-lfs - gnumake - zip - fish - trash-cli - tmux - zoxide - htop - unzip - tlrc - btop - pciutils - cloc - neofetch - pfetch - inxi - jq - dig - onefetch - just - nixd - eza gh - starship - tree + + # nix tools nix-output-monitor - yazi - ripgrep - nh - comma + nixd nix-inspect - bat - fd - dust - duf + comma + nh + + # information and vanity + neofetch + onefetch + pfetch + htop + btop + cloc + inxi + tlrc + pciutils + + # basic quality of life + eza dysk + trash-cli + zoxide + lazysql + jq + ripgrep + dust + bat + just + tree + fd + yazi + duf + + # archives + zip + unzip + + # shell + fish + starship + + # multiplexers + tmux + + (pkgs.writeShellScriptBin "wake-ymir" '' echo waking up ymir ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 From 072b3cb6da1e797d4b7d075e6608953a5b903a57 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:03:25 +0300 Subject: [PATCH 1511/1768] add docker --- hosts/nixos/ymir/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index bec494a..292552e 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -9,6 +9,7 @@ machineType = "desktop"; programs.adbFastboot.enable = true; emulation.aarch64.enable = true; + virtualisation.docker.enable = true; hardware = { hibernation.enable = false; wakeOnLan.enable = true; From b26f6894c75b880619897bdc1465806a90ed07ed Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:09:01 +0300 Subject: [PATCH 1512/1768] remove unused option --- modules/nixos/options.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index d618394..ca78024 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -340,14 +340,7 @@ }; }; - # Virtualization virtualization = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = "Enable virtualization support (libvirt, docker, etc.)"; - }; - docker = { enable = lib.mkOption { type = lib.types.bool; From 5bf8653f9f12379ce500994885d34d71b98189f2 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:10:14 +0300 Subject: [PATCH 1513/1768] change the spelling to match with nixos config spelling --- modules/nixos/hardware/nvidia.nix | 4 ++-- modules/nixos/options.nix | 2 +- modules/nixos/system/default.nix | 2 +- modules/nixos/system/users.nix | 2 +- .../nixos/system/{virtualization.nix => virtualisation.nix} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename modules/nixos/system/{virtualization.nix => virtualisation.nix} (93%) diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix index c82105c..5a26043 100644 --- a/modules/nixos/hardware/nvidia.nix +++ b/modules/nixos/hardware/nvidia.nix @@ -55,7 +55,7 @@ presets.nvidia-gpu.enable = true; }; - # Enable nvidia-container-toolkit if virtualization is enabled - hardware.nvidia-container-toolkit.enable = lib.mkIf config.osbmModules.virtualization.docker.enable true; + # Enable nvidia-container-toolkit if virtualisation is enabled + hardware.nvidia-container-toolkit.enable = lib.mkIf config.osbmModules.virtualisation.docker.enable true; }; } diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index ca78024..d3ec044 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -340,7 +340,7 @@ }; }; - virtualization = { + virtualisation = { docker = { enable = lib.mkOption { type = lib.types.bool; diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index dd01a58..1f653ca 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -5,7 +5,7 @@ ./nix-settings.nix ./agenix.nix ./home-manager.nix - ./virtualization.nix + ./virtualisation.nix ./emulation.nix ./i18n.nix ./impermanence.nix diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index 4bee1a5..e8f3862 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -14,7 +14,7 @@ in "networkmanager" ] ++ lib.optional (username == config.osbmModules.defaultUser) "wheel" - ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" + ++ lib.optional config.osbmModules.virtualisation.docker.enable "docker" ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; })) diff --git a/modules/nixos/system/virtualization.nix b/modules/nixos/system/virtualisation.nix similarity index 93% rename from modules/nixos/system/virtualization.nix rename to modules/nixos/system/virtualisation.nix index cbf4142..29fc84d 100644 --- a/modules/nixos/system/virtualization.nix +++ b/modules/nixos/system/virtualisation.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - cfg = config.osbmModules.virtualization; + cfg = config.osbmModules.virtualisation; in { config = lib.mkMerge [ From 04a58e2687b0810102e160af778d53729032ac48 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:14:18 +0300 Subject: [PATCH 1514/1768] planning to move this to apollo --- modules/nixos/services/glance.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index dec1780..5e23570 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -157,7 +157,7 @@ } ]; name = "Home"; - content = "Welcome to Pochita's home page!"; + content = "Welcome to osbm's home page!"; } ]; }; From 632beb9f82ca4e7d329a229c7c389fb0a277a883 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:53:00 +0300 Subject: [PATCH 1515/1768] dont set the option with default value --- hosts/nixos/apollo/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 6ad7057..5353dea 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -8,7 +8,6 @@ desktopEnvironment = "none"; machineType = "server"; users = [ "osbm" ]; - defaultUser = "osbm"; hardware = { sound.enable = false; From 8c09304d45874edf3fce9312fe47e744efb7c7c6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:53:17 +0300 Subject: [PATCH 1516/1768] useless ass option --- hosts/nixos/apollo/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 5353dea..328c61c 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -53,7 +53,6 @@ # Enable zram swap zramSwap.enable = true; - users.users.osbm.initialPassword = "changeme"; users.mutableUsers = false; # Disable sudo lecture message From 83411ed26d06009b4be3290549922ea81860f03f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:53:33 +0300 Subject: [PATCH 1517/1768] add glance --- hosts/nixos/apollo/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 328c61c..d9f85fd 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -8,6 +8,10 @@ desktopEnvironment = "none"; machineType = "server"; users = [ "osbm" ]; + services = { + glance.enable = true; + }; + hardware = { sound.enable = false; From b87a58c1cfe658792d67d3fb8676209b010e9eae Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:54:14 +0300 Subject: [PATCH 1518/1768] add anubis --- modules/nixos/options.nix | 1 + modules/nixos/services/anubis.nix | 14 ++++++++++++++ modules/nixos/services/default.nix | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 modules/nixos/services/anubis.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index d3ec044..44144c1 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -139,6 +139,7 @@ }; }; + anubis.enable = lib.mkEnableOption "anubis"; syncthing.enable = lib.mkEnableOption "syncthing"; jellyfin.enable = lib.mkEnableOption "jellyfin"; nextcloud.enable = lib.mkEnableOption "nextcloud"; diff --git a/modules/nixos/services/anubis.nix b/modules/nixos/services/anubis.nix new file mode 100644 index 0000000..45c5174 --- /dev/null +++ b/modules/nixos/services/anubis.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: +{ + config = lib.mkMerge [ + (lib.mkIf config.osbmModules.services.anubis.enable { + services.anubis = { + enable = true; + }; + }) + ]; +} \ No newline at end of file diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 26fe647..e6603f5 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./anubis.nix ./atticd.nix ./caddy.nix ./cloudflare-dyndns.nix @@ -11,11 +12,13 @@ ./glance.nix ./hydra.nix ./jellyfin.nix - ./system-logger ./syncthing.nix ./tailscale.nix ./vaultwarden.nix ./vscode-server.nix + + # custom services + ./system-logger ./wanikani-bypass-lessons.nix ./wanikani-fetch-data ./wanikani-stats From 9025b9d5ec8b54cec4ab80ec5eef86f8613bb149 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 18:54:36 +0300 Subject: [PATCH 1519/1768] enable anubis on apollo --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index d9f85fd..29d2def 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -10,6 +10,7 @@ users = [ "osbm" ]; services = { glance.enable = true; + anubis.enable = true; }; From 05da6e9cecd2a2101f8b9b7925c93610f57278f7 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 19:20:26 +0300 Subject: [PATCH 1520/1768] fix anubis empty module --- modules/nixos/services/anubis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/anubis.nix b/modules/nixos/services/anubis.nix index 45c5174..fc813b2 100644 --- a/modules/nixos/services/anubis.nix +++ b/modules/nixos/services/anubis.nix @@ -7,7 +7,7 @@ config = lib.mkMerge [ (lib.mkIf config.osbmModules.services.anubis.enable { services.anubis = { - enable = true; + # enable = true; }; }) ]; From cadcdf74153fcc87718ceb2235998cea6802346a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 19:20:40 +0300 Subject: [PATCH 1521/1768] init nginx --- modules/nixos/options.nix | 1 + modules/nixos/services/default.nix | 1 + modules/nixos/services/nginx.nix | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 modules/nixos/services/nginx.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 44144c1..c0be4eb 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -144,6 +144,7 @@ jellyfin.enable = lib.mkEnableOption "jellyfin"; nextcloud.enable = lib.mkEnableOption "nextcloud"; vaultwarden.enable = lib.mkEnableOption "vaultwarden"; + nginx.enable = lib.mkEnableOption "nginx"; ollama.enable = lib.mkEnableOption "ollama"; forgejo.enable = lib.mkEnableOption "forgejo"; caddy.enable = lib.mkEnableOption "caddy"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index e6603f5..4e5e78c 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -12,6 +12,7 @@ ./glance.nix ./hydra.nix ./jellyfin.nix + ./nginx.nix ./syncthing.nix ./tailscale.nix ./vaultwarden.nix diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix new file mode 100644 index 0000000..11785d4 --- /dev/null +++ b/modules/nixos/services/nginx.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + ... +}: +{ + config = lib.mkMerge [ + (lib.mkIf config.osbmModules.services.nginx.enable { + services.nginx = { + enable = true; + }; + }) + ]; +} \ No newline at end of file From 02e2a720850201be79d47e89c7750533d4101cde Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 19:21:09 +0300 Subject: [PATCH 1522/1768] enable nginx in apollo --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 29d2def..b89cebb 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -11,6 +11,7 @@ services = { glance.enable = true; anubis.enable = true; + nginx.enable = true; }; From 229a15eaf1f2478155419d1ef061ad73052acd60 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 19:59:05 +0300 Subject: [PATCH 1523/1768] formatting --- hosts/nixos/apollo/configuration.nix | 1 - modules/nixos/programs/command-line.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index b89cebb..9639744 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -14,7 +14,6 @@ nginx.enable = true; }; - hardware = { sound.enable = false; hibernation.enable = false; diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index 2bf4d65..b40e663 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -65,7 +65,6 @@ # multiplexers tmux - (pkgs.writeShellScriptBin "wake-ymir" '' echo waking up ymir ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 From bd25936bed9f5fc3c444995047335feceb41f754 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 19:59:15 +0300 Subject: [PATCH 1524/1768] formatting --- modules/nixos/services/anubis.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/anubis.nix b/modules/nixos/services/anubis.nix index fc813b2..0ec8662 100644 --- a/modules/nixos/services/anubis.nix +++ b/modules/nixos/services/anubis.nix @@ -11,4 +11,4 @@ }; }) ]; -} \ No newline at end of file +} From 4067cac4ba180b0a16f8fac909c135a037d4f0d5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 19:59:21 +0300 Subject: [PATCH 1525/1768] formatting --- modules/nixos/services/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index 11785d4..c4a835a 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -11,4 +11,4 @@ }; }) ]; -} \ No newline at end of file +} From b3e07df279072ac01cbabb30df386854a3eb05c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 28 Oct 2025 19:59:39 +0300 Subject: [PATCH 1526/1768] set extra options --- modules/nixos/services/forgejo.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index 550f267..b6b4e88 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -51,5 +51,27 @@ }; } ) + (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.forgejo.enable) { + services.nginx.virtualHosts."${config.services.forgejo.settings.server.DOMAIN}" = { + forceSSL = true; + locations."/".proxyPass = "http://localhost:3000"; + locations."/".proxyWebsockets = true; + }; + }) + + (lib.mkIf + ( + config.osbmModules.services.forgejo.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + environment.persistence."/persist" = { + hideMounts = true; + directories = [ + "/var/lib/forgejo" + ]; + }; + } + ) ]; } From 7c40bc3fc4f46a8919694bdc1491746233e3cd80 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 00:14:54 +0300 Subject: [PATCH 1527/1768] enable forgejo there too --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 9639744..586bc22 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -12,6 +12,7 @@ glance.enable = true; anubis.enable = true; nginx.enable = true; + forgejo.enable = true; }; hardware = { From 21e9275e5ac8e1ff22c051c86bdbc69bec2945ac Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 00:23:33 +0300 Subject: [PATCH 1528/1768] ssl --- modules/nixos/services/forgejo.nix | 1 + modules/nixos/services/nginx.nix | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index b6b4e88..bb77ca1 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -54,6 +54,7 @@ (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.forgejo.enable) { services.nginx.virtualHosts."${config.services.forgejo.settings.server.DOMAIN}" = { forceSSL = true; + enableACME = true; locations."/".proxyPass = "http://localhost:3000"; locations."/".proxyWebsockets = true; }; diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index c4a835a..fcac993 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -9,6 +9,11 @@ services.nginx = { enable = true; }; + + security.acme = { + acceptTerms = true; + defaults.email = "osbm@osbm.dev"; + }; }) ]; } From d5d5af7715e29756a088750a68a5ca9c9d92b28c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 00:51:21 +0300 Subject: [PATCH 1529/1768] set proper initialPasswords --- modules/nixos/system/users.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index e8f3862..643aa4d 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -10,6 +10,7 @@ in (lib.genAttrs regularUsers (username: { isNormalUser = true; description = username; + initialPassword = "changeme"; extraGroups = [ "networkmanager" ] @@ -26,6 +27,16 @@ in ]; }; } + + { + root = { + initialPassword = "changeme"; + openssh.authorizedKeys.keys = lib.mkDefault [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" + ]; + }; + } + ]; }; From b823d5d8fccb256d181a40439e4309e580c609e4 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:19:34 +0300 Subject: [PATCH 1530/1768] set the folder with correct owner --- modules/nixos/services/forgejo.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index bb77ca1..f2c9058 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -67,9 +67,14 @@ ) { environment.persistence."/persist" = { - hideMounts = true; directories = [ - "/var/lib/forgejo" + # "/var/lib/forgejo" + { + directory = "/var/lib/forgejo"; + user = config.services.forgejo.user; + group = config.services.forgejo.group; + # mode = "u=rwx,g=rx,o="; + } ]; }; } From b1827652b0a68ce4a3d598a5bc5c14c8c7ee54e1 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:20:55 +0300 Subject: [PATCH 1531/1768] first disable these --- hosts/nixos/apollo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 586bc22..165664d 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -10,9 +10,9 @@ users = [ "osbm" ]; services = { glance.enable = true; - anubis.enable = true; + # anubis.enable = true; nginx.enable = true; - forgejo.enable = true; + # forgejo.enable = true; }; hardware = { From aff9e19acfae95f450d23daec17d82381767b921 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:21:56 +0300 Subject: [PATCH 1532/1768] enable forgejo again --- hosts/nixos/apollo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 165664d..0629000 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -12,7 +12,7 @@ glance.enable = true; # anubis.enable = true; nginx.enable = true; - # forgejo.enable = true; + forgejo.enable = true; }; hardware = { From 2e9173d447fb4d66bf851c8d55cde56f63c32255 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:33:33 +0300 Subject: [PATCH 1533/1768] set folder permissions --- modules/nixos/services/forgejo.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index f2c9058..60c1cf4 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -68,12 +68,11 @@ { environment.persistence."/persist" = { directories = [ - # "/var/lib/forgejo" { directory = "/var/lib/forgejo"; user = config.services.forgejo.user; group = config.services.forgejo.group; - # mode = "u=rwx,g=rx,o="; + mode = "0750"; } ]; }; From 9379160436f8dce8d49839c4a893a985c0fe344e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:44:37 +0300 Subject: [PATCH 1534/1768] lets see --- modules/nixos/services/forgejo.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index 60c1cf4..e1a835b 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -76,6 +76,12 @@ } ]; }; + + # forgejo-secrets service keep giving error + systemd.services."forgejo-secrets" = { + wants = [ "var-lib-forgejo.mount" ]; + after = [ "var-lib-forgejo.mount" ]; + }; } ) ]; From 6093ee87aa33aac9117c682607dcdda1c00609b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:54:56 +0300 Subject: [PATCH 1535/1768] keep dealing with this --- modules/nixos/services/forgejo.nix | 33 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index e1a835b..65aab17 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -66,22 +66,25 @@ && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot ) { - environment.persistence."/persist" = { - directories = [ - { - directory = "/var/lib/forgejo"; - user = config.services.forgejo.user; - group = config.services.forgejo.group; - mode = "0750"; - } - ]; - }; + # environment.persistence."/persist" = { + # directories = [ + # { + # directory = "/var/lib/forgejo"; + # user = config.services.forgejo.user; + # group = config.services.forgejo.group; + # mode = "0750"; + # } + # ]; + # }; - # forgejo-secrets service keep giving error - systemd.services."forgejo-secrets" = { - wants = [ "var-lib-forgejo.mount" ]; - after = [ "var-lib-forgejo.mount" ]; - }; + # # forgejo-secrets service keep giving error + # systemd.services."forgejo-secrets" = { + # wants = [ "var-lib-forgejo.mount" ]; + # after = [ "var-lib-forgejo.mount" ]; + # }; + + # fuckass thing + services.forgejo.stateDir = "/persist/var/lib/forgejo"; } ) ]; From 6ede350132ccd29e91da715368ec04c13a97baaf Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:56:23 +0300 Subject: [PATCH 1536/1768] disable for a sec --- hosts/nixos/apollo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 0629000..91ce67a 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -11,8 +11,8 @@ services = { glance.enable = true; # anubis.enable = true; - nginx.enable = true; - forgejo.enable = true; + # nginx.enable = true; + # forgejo.enable = true; }; hardware = { From bcdafff55d4b191a0b16eab5713e93ffcca3cdc3 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 17:57:29 +0300 Subject: [PATCH 1537/1768] enable apollo --- hosts/nixos/apollo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 91ce67a..f24d4de 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -12,7 +12,7 @@ glance.enable = true; # anubis.enable = true; # nginx.enable = true; - # forgejo.enable = true; + forgejo.enable = true; }; hardware = { From 6a51147c4fdb901a305b39c3a075838df88226ef Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 18:08:06 +0300 Subject: [PATCH 1538/1768] add nginx --- hosts/nixos/apollo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index f24d4de..0629000 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -11,7 +11,7 @@ services = { glance.enable = true; # anubis.enable = true; - # nginx.enable = true; + nginx.enable = true; forgejo.enable = true; }; From 11edcaae2fe4d1af5ecf4e117c75ea2057027a2c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 18:10:57 +0300 Subject: [PATCH 1539/1768] lame ass mistage --- modules/nixos/services/nginx.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index fcac993..f3f652f 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -10,6 +10,8 @@ enable = true; }; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.acme = { acceptTerms = true; defaults.email = "osbm@osbm.dev"; From 8f5256b7d63f162febe1f4154ae4a42c2dffc24b Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 20:49:56 +0300 Subject: [PATCH 1540/1768] add steam --- hosts/nixos/tartarus/configuration.nix | 1 + hosts/nixos/ymir/configuration.nix | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 4c605d4..c1f654d 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -9,6 +9,7 @@ machineType = "laptop"; emulation.aarch64.enable = true; hardware.sound.enable = true; + programs.steam.enable = true; }; networking.hostName = "tartarus"; # Define your hostname. diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 292552e..ee5aa1b 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -7,7 +7,10 @@ osbmModules = { desktopEnvironment = "plasma"; machineType = "desktop"; - programs.adbFastboot.enable = true; + programs = { + adbFastboot.enable = true; + steam.enable = true; + }; emulation.aarch64.enable = true; virtualisation.docker.enable = true; hardware = { From 2d16ab46158f82557d476b3589f7a1de0947da54 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 20:50:18 +0300 Subject: [PATCH 1541/1768] add glance nginx --- modules/nixos/services/glance.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 5e23570..4ee2ab8 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -180,5 +180,18 @@ }; } ) + + # if nginx and glance are both enabled, set up a reverse proxy + (lib.mkIf + (config.osbmModules.services.nginx.enable && config.osbmModules.services.glance.enable) + { + services.nginx.virtualHosts."home.osbm.dev" = { + forceSSL = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.glance.settings.server.port}"; + }; + }; + } + ) ]; } From c3b7f82a81fef4b02e45443a79eaa431383e3daa Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 20:53:24 +0300 Subject: [PATCH 1542/1768] fix --- modules/nixos/services/glance.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 4ee2ab8..d131585 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -186,9 +186,11 @@ (config.osbmModules.services.nginx.enable && config.osbmModules.services.glance.enable) { services.nginx.virtualHosts."home.osbm.dev" = { - forceSSL = true; - locations."/" = { + forceSSL = true; + enableACME = true; + locations."/" = { proxyPass = "http://localhost:${toString config.services.glance.settings.server.port}"; + proxyWebsockets = true; }; }; } From c47d185e689d8d7c7ef77cf8369a836304f14eea Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 20:55:04 +0300 Subject: [PATCH 1543/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 02d17aa..8c1c467 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760836749, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1761081701, - "narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=", + "lastModified": 1761750844, + "narHash": "sha256-ab6kNHAEP/oWz8qdblnDw7TIwetr4GnmnDyvya0aw/k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315", + "rev": "b8082c6803353456d45e6a8c0d4b36ad33fb7d6a", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1760721282, - "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=", + "lastModified": 1761339987, + "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168", + "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1760846226, - "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", + "lastModified": 1761451000, + "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", + "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1761751191, + "narHash": "sha256-qdFiHCcY8N6HOXcikXCzulyu2T51vacDfp+CgfijKU0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "46f9982c9bb90b715f700495c46654cd8a301e95", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760878510, - "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { From 84fee06732666a487a54aee07d6849fc904cae69 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 20:58:04 +0300 Subject: [PATCH 1544/1768] remove these from pochita --- hosts/nixos/pochita/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 8766e08..3e01efd 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -16,10 +16,7 @@ machineType = "server"; hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader services = { - forgejo.enable = true; - cloudflared.enable = true; vaultwarden.enable = true; - glance.enable = true; wanikani-bypass-lessons.enable = true; wanikani-fetch-data.enable = true; wanikani-stats.enable = true; From 48c63157485a1c20ebc2209043f6e3e5c6fea39f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 22:54:42 +0300 Subject: [PATCH 1545/1768] formatting --- modules/nixos/services/glance.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index d131585..4c0243a 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -182,18 +182,15 @@ ) # if nginx and glance are both enabled, set up a reverse proxy - (lib.mkIf - (config.osbmModules.services.nginx.enable && config.osbmModules.services.glance.enable) - { - services.nginx.virtualHosts."home.osbm.dev" = { + (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.glance.enable) { + services.nginx.virtualHosts."home.osbm.dev" = { forceSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://localhost:${toString config.services.glance.settings.server.port}"; - proxyWebsockets = true; - }; + proxyPass = "http://localhost:${toString config.services.glance.settings.server.port}"; + proxyWebsockets = true; }; - } - ) + }; + }) ]; } From 6a5f2d6e52f1699deb7d72e8fdfdb7b36fa1333c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 22:54:47 +0300 Subject: [PATCH 1546/1768] formatting --- modules/nixos/services/nginx.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index f3f652f..1e5960e 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -10,7 +10,10 @@ enable = true; }; - networking.firewall.allowedTCPPorts = [ 80 443 ]; + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; security.acme = { acceptTerms = true; From b33a5f5925a31803ea9f94bf38c50b17ec21f8a8 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 22:54:55 +0300 Subject: [PATCH 1547/1768] fix alacritty --- modules/home-manager/programs/alacritty.nix | 32 +++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix index 7a60352..4a98495 100644 --- a/modules/home-manager/programs/alacritty.nix +++ b/modules/home-manager/programs/alacritty.nix @@ -1,4 +1,9 @@ -{ lib, nixosConfig, ... }: +{ + lib, + pkgs, + nixosConfig, + ... +}: { config = lib.mkMerge [ (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { @@ -9,16 +14,25 @@ { programs.alacritty = { settings = { - window = { - opacity = 0.95; - padding = { - x = 10; - y = 10; - }; - }; font = { - size = 11.0; + size = 14.0; + normal.family = "Cascadia Code"; }; + terminal.shell = { + args = [ + "new-session" + "-A" + "-s" + "general" + ]; + program = lib.getExe pkgs.tmux; + }; + window = { + decorations = "None"; + opacity = 1; + startup_mode = "Maximized"; + }; + env.TERM = "xterm-256color"; }; }; } From 54965b05bf24f88ef22745fd691050d8e927c9fa Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 29 Oct 2025 23:49:19 +0300 Subject: [PATCH 1548/1768] update vaultwarden --- modules/nixos/services/vaultwarden.nix | 48 +++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 33b758d..a661f24 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -8,7 +8,53 @@ (lib.mkIf config.osbmModules.services.vaultwarden.enable { services.vaultwarden = { enable = true; + backupDir = "/var/local/vaultwarden/backup"; + # in order to avoid having ADMIN_TOKEN in the nix store it can be also set with the help of an environment file + # be aware that this file must be created by hand (or via secrets management like sops) + environmentFile = "/var/lib/vaultwarden/vaultwarden.env"; + config = { + # Refer to https://github.com/dani-garcia/vaultwarden/blob/main/.env.template + DOMAIN = "https://bitwarden.osbm.dev"; + SIGNUPS_ALLOWED = false; + + ROCKET_ADDRESS = "127.0.0.1"; + ROCKET_PORT = 8222; + ROCKET_LOG = "critical"; + + # This example assumes a mailserver running on localhost, + # thus without transport encryption. + # If you use an external mail server, follow: + # https://github.com/dani-garcia/vaultwarden/wiki/SMTP-configuration + SMTP_HOST = "127.0.0.1"; + SMTP_PORT = 25; + SMTP_SSL = false; + + SMTP_FROM = "admin@bitwarden.osbm.dev"; + SMTP_FROM_NAME = "osbm.dev Bitwarden server"; + }; }; }) + + + # vaultwarden reverse proxy via nginx + (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.vaultwarden.enable) { + services.nginx.virtualHosts."bitwarden.osbm.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.vaultwarden.config.ROCKET_PORT}"; + }; + }; + }) + + # impermanence with vaultwarden + (lib.mkIf (config.osbmModules.services.vaultwarden.enable && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot) { + environment.persistence."/persist" = { + directories = [ + "/var/lib/vaultwarden" + "/var/local/vaultwarden" + ]; + }; + }) ]; -} +} \ No newline at end of file From 12bdc4c793202b7b0a1e24a80edfe4adca3b5ebe Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 30 Oct 2025 00:03:39 +0300 Subject: [PATCH 1549/1768] update flake.lock --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 8c1c467..1586164 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1761750844, - "narHash": "sha256-ab6kNHAEP/oWz8qdblnDw7TIwetr4GnmnDyvya0aw/k=", + "lastModified": 1761770832, + "narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8082c6803353456d45e6a8c0d4b36ad33fb7d6a", + "rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761751191, - "narHash": "sha256-qdFiHCcY8N6HOXcikXCzulyu2T51vacDfp+CgfijKU0=", + "lastModified": 1761759700, + "narHash": "sha256-zuiwvKAPwtMmwf44tb7Q7Y5d7JkBeuaF89PISUnkWA8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "46f9982c9bb90b715f700495c46654cd8a301e95", + "rev": "2379bc40992ec29feb1933bb4acd224fa055f3f8", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1758427187, - "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "lastModified": 1761656231, + "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1758665797, - "narHash": "sha256-RIN05AhWIFCXL2OOXGoFdF/k8Q6OBhi/WcRtsYuTF5Q=", + "lastModified": 1761744315, + "narHash": "sha256-OknzyEoI+VEYgk/FWMyx3tvjb/MPPyqS+G/aemDz51w=", "owner": "nix-community", "repo": "nixvim", - "rev": "0c15f88f1fc01c8799c5ce2a432fadc47f20e307", + "rev": "6233fc6b2c3f203d8a5970f4a2c1df5777902717", "type": "github" }, "original": { @@ -572,11 +572,11 @@ ] }, "locked": { - "lastModified": 1758272005, - "narHash": "sha256-1u3xTH+3kaHhztPmWtLAD8LF5pTYLR2CpsPFWTFnVtQ=", + "lastModified": 1761730856, + "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "owner": "NuschtOS", "repo": "search", - "rev": "aa975a3757f28ce862812466c5848787b868e116", + "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "type": "github" }, "original": { @@ -592,11 +592,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1758696474, - "narHash": "sha256-m1su+HZWP116FWQPl4pf1EqPYmHBaGNqdod0+IWtZGU=", + "lastModified": 1761771567, + "narHash": "sha256-EC8Bpx6KIU0fHbhQVM6p8j+ZH56UfZ7mrVTl80d8Vcs=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8efd247c60207bde38a29d6bebb60102aeb9ce17", + "rev": "8f08a58beafbcb94ddd6fb2d24975dd736e236d0", "type": "github" }, "original": { From 18627c078b9d5673a8b71c1419d63a019e5de7dd Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 30 Oct 2025 00:09:20 +0300 Subject: [PATCH 1550/1768] purge caddy --- hosts/nixos/wallfacer/configuration.nix | 1 - modules/nixos/options.nix | 1 - modules/nixos/services/caddy.nix | 59 ------------------------- modules/nixos/services/default.nix | 1 - 4 files changed, 62 deletions(-) delete mode 100644 modules/nixos/services/caddy.nix diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 80e702b..68b4a52 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -9,7 +9,6 @@ services = { nextcloud.enable = true; hydra.enable = true; - # caddy.enable = true; atticd.enable = true; cloudflared.enable = true; }; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index c0be4eb..8ab1281 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -147,7 +147,6 @@ nginx.enable = lib.mkEnableOption "nginx"; ollama.enable = lib.mkEnableOption "ollama"; forgejo.enable = lib.mkEnableOption "forgejo"; - caddy.enable = lib.mkEnableOption "caddy"; atticd.enable = lib.mkEnableOption "atticd"; cloudflared.enable = lib.mkEnableOption "cloudflared"; cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns"; diff --git a/modules/nixos/services/caddy.nix b/modules/nixos/services/caddy.nix deleted file mode 100644 index c20c225..0000000 --- a/modules/nixos/services/caddy.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.services.caddy.enable { - services.caddy = { - enable = true; - # package = pkgs.caddy.withPlugins { - # # update time to time - # # last update: 2025-03-02 - # plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ]; - # hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A="; - # }; - # email = "osbm@osbm.dev"; - # extraConfig = '' - # (cloudflare) { - # tls { - # dns cloudflare {env.CF_API_TOKEN} - # } - # } - # ''; - # globalConfig = '' - # acme_dns cloudflare {env.CF_API_TOKEN} - # ''; - }; - - networking.firewall.allowedTCPPorts = [ - 80 - 443 - 3000 - ]; - - environment.systemPackages = with pkgs; [ - nssTools - ]; - age.secrets.cloudflare = { - file = ../../secrets/cloudflare.age; - path = "/etc/caddy/.env"; - owner = "caddy"; - mode = "0600"; - }; - - systemd.services.caddy.serviceConfig = { - EnvironmentFile = "/etc/caddy/.env"; - }; - - security.acme.acceptTerms = true; - security.acme.defaults = { - email = "osbm@osbm.dev"; - acceptTerms = true; - }; - - }) - ]; -} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 4e5e78c..9be2666 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -2,7 +2,6 @@ imports = [ ./anubis.nix ./atticd.nix - ./caddy.nix ./cloudflare-dyndns.nix ./cloudflared.nix ./nextcloud.nix From 7255df2d92eccd7bbabc714ee6591c046a7ded6a Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 30 Oct 2025 00:10:24 +0300 Subject: [PATCH 1551/1768] purge nextcloud --- hosts/nixos/wallfacer/configuration.nix | 1 - modules/nixos/options.nix | 1 - modules/nixos/services/default.nix | 1 - modules/nixos/services/nextcloud.nix | 25 ------------------------- 4 files changed, 28 deletions(-) delete mode 100644 modules/nixos/services/nextcloud.nix diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 68b4a52..f7a4912 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -7,7 +7,6 @@ desktopEnvironment = "none"; machineType = "server"; services = { - nextcloud.enable = true; hydra.enable = true; atticd.enable = true; cloudflared.enable = true; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 8ab1281..1e4c63f 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -142,7 +142,6 @@ anubis.enable = lib.mkEnableOption "anubis"; syncthing.enable = lib.mkEnableOption "syncthing"; jellyfin.enable = lib.mkEnableOption "jellyfin"; - nextcloud.enable = lib.mkEnableOption "nextcloud"; vaultwarden.enable = lib.mkEnableOption "vaultwarden"; nginx.enable = lib.mkEnableOption "nginx"; ollama.enable = lib.mkEnableOption "ollama"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 9be2666..ee6d2db 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -4,7 +4,6 @@ ./atticd.nix ./cloudflare-dyndns.nix ./cloudflared.nix - ./nextcloud.nix ./ollama.nix ./openssh.nix ./forgejo.nix diff --git a/modules/nixos/services/nextcloud.nix b/modules/nixos/services/nextcloud.nix deleted file mode 100644 index ff30f48..0000000 --- a/modules/nixos/services/nextcloud.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -{ - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.services.nextcloud.enable { - environment.etc."nextcloud-admin-pass".text = "m7eJ4KJ1NK33JE%51"; - services.nextcloud = { - enable = true; - package = pkgs.nextcloud31; - hostName = "localhost/nextcloud"; - config.adminpassFile = "/etc/nextcloud-admin-pass"; - config.dbtype = "sqlite"; - database.createLocally = true; - settings.trusted_domains = [ - "${config.networking.hostName}.curl-boga.ts.net" - "localhost" - ]; - }; - }) - ]; -} From c63afcf1a9007049a715ed7d2398acd5b9203bce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Oct 2025 06:15:33 +0000 Subject: [PATCH 1552/1768] Bump actions/upload-artifact from 4 to 5 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-sd-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index 887aac0..1d51e9f 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -29,7 +29,7 @@ jobs: zip -r sd-image.zip sd-image - name: Upload SD image - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: sd-image From c5bbfc287d20f93747a4f5c99507bc7f7fd80063 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 Oct 2025 06:15:37 +0000 Subject: [PATCH 1553/1768] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build-sd-image.yml | 2 +- .github/workflows/nix.yml | 4 ++-- .github/workflows/test-my-packages.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-sd-image.yml b/.github/workflows/build-sd-image.yml index 887aac0..caef2ee 100644 --- a/.github/workflows/build-sd-image.yml +++ b/.github/workflows/build-sd-image.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install QEMU run: sudo apt-get install qemu-user-static diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index a546bb3..f7a8481 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -19,7 +19,7 @@ jobs: - harmonica runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: cachix/install-nix-action@v31 # TODO: add a binary cache # - uses: cachix/cachix-action@v10 @@ -32,6 +32,6 @@ jobs: check-formatting: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: cachix/install-nix-action@v31 - run: nix run nixpkgs#nixfmt-tree -- --ci diff --git a/.github/workflows/test-my-packages.yml b/.github/workflows/test-my-packages.yml index c2f8b1b..91ec739 100644 --- a/.github/workflows/test-my-packages.yml +++ b/.github/workflows/test-my-packages.yml @@ -23,7 +23,7 @@ jobs: # - python311Packages.fastmri # broken for now steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install Nix uses: cachix/install-nix-action@v31 From 7c961c988fe74ef9c9f6aee40a1880ce7a686149 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 10:08:02 +0300 Subject: [PATCH 1554/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1586164..ea7fd39 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1761770832, - "narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", + "lastModified": 1761878381, + "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", "owner": "nix-community", "repo": "home-manager", - "rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", + "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1759261417, - "narHash": "sha256-TjuoBb8+isL3KTdGgtYh90XPyeUMFbgNAOG9l23CB3A=", + "lastModified": 1761853569, + "narHash": "sha256-miiMKVgC2WVi4ItD8rWD0ngou5WicEDAuZGhI0TfEIw=", "owner": "mobile-nixos", "repo": "mobile-nixos", - "rev": "e6f6d527bf6abf94dd52fbba3143a720cef96431", + "rev": "1e38d4027bbb944f2af1b3241eabd9ad9c950c84", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761759700, - "narHash": "sha256-zuiwvKAPwtMmwf44tb7Q7Y5d7JkBeuaF89PISUnkWA8=", + "lastModified": 1761827175, + "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2379bc40992ec29feb1933bb4acd224fa055f3f8", + "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { From dbf0ba48b79fc527a5b71cd8cc604cff20bb4516 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 10:17:28 +0300 Subject: [PATCH 1555/1768] add curl --- modules/nixos/programs/command-line.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index b40e663..befd242 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -9,6 +9,7 @@ environment.systemPackages = with pkgs; [ # networking wget + curl dig # text editors From 1ee40bc188e184624571af273dd7087b38361006 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 10:24:14 +0300 Subject: [PATCH 1556/1768] disable on pochita --- hosts/nixos/pochita/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 3e01efd..5f0772b 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -16,7 +16,6 @@ machineType = "server"; hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader services = { - vaultwarden.enable = true; wanikani-bypass-lessons.enable = true; wanikani-fetch-data.enable = true; wanikani-stats.enable = true; From 503663c7c0c45f39f5d20e70a9c1b50289defd05 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 10:24:23 +0300 Subject: [PATCH 1557/1768] enable vaultwarden on apollo --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 0629000..bc909f7 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -13,6 +13,7 @@ # anubis.enable = true; nginx.enable = true; forgejo.enable = true; + vaultwarden.enable = true; }; hardware = { From 35a2a758e1f6714e8fe9da55a166830dfeb10df8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 10:46:21 +0300 Subject: [PATCH 1558/1768] add simple-nixos-mailserver --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index 4c98cf9..0f55b88 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,10 @@ url = "github:mobile-nixos/mobile-nixos"; flake = false; }; + simple-nixos-mailserver = { + url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = From 3647d12ed31a7d34cd33c065dac55f68a116c8a8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 11:27:55 +0300 Subject: [PATCH 1559/1768] add mailserver --- modules/nixos/options.nix | 1 + modules/nixos/services/default.nix | 1 + modules/nixos/services/mailserver.nix | 30 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 modules/nixos/services/mailserver.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 1e4c63f..45932c0 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -142,6 +142,7 @@ anubis.enable = lib.mkEnableOption "anubis"; syncthing.enable = lib.mkEnableOption "syncthing"; jellyfin.enable = lib.mkEnableOption "jellyfin"; + mailserver.enable = lib.mkEnableOption "mailserver"; vaultwarden.enable = lib.mkEnableOption "vaultwarden"; nginx.enable = lib.mkEnableOption "nginx"; ollama.enable = lib.mkEnableOption "ollama"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index ee6d2db..bf63669 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -10,6 +10,7 @@ ./glance.nix ./hydra.nix ./jellyfin.nix + ./mailserver.nix ./nginx.nix ./syncthing.nix ./tailscale.nix diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix new file mode 100644 index 0000000..6d38dd7 --- /dev/null +++ b/modules/nixos/services/mailserver.nix @@ -0,0 +1,30 @@ +{ config, inputs, lib, ... }: +{ + imports = [ + inputs.simple-nixos-mailserver.nixosModule + ]; + + config = lib.mkMerge [ + (lib.optionalAttrs config.osbmModules.services.mailserver.enable { + mailserver = { + enable = true; + stateVersion = 3; + fqdn = "mail.osbm.dev"; + domains = [ "osbm.dev" ]; + + # A list of all login accounts. To create the password hashes, use + # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' + loginAccounts = { + "osbm@osbm.dev" = { + hashedPasswordFile = "/persist/osbm.passwd"; # TODO: Make this into agenix secret + aliases = ["postmaster@osbm.dev"]; + }; + }; + + # Use Let's Encrypt certificates. Note that this needs to set up a stripped + # down nginx and opens port 80. + certificateScheme = "acme-nginx"; + }; + }) + ]; +} \ No newline at end of file From 05ab0df0b017d7e1576303a52a984e9c718c00f4 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 11:38:22 +0300 Subject: [PATCH 1560/1768] enable mailserver --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index bc909f7..04ee8fc 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -11,6 +11,7 @@ services = { glance.enable = true; # anubis.enable = true; + mailserver.enable = true; nginx.enable = true; forgejo.enable = true; vaultwarden.enable = true; From 920553092109afc6cb73c405b842a97a617a0ef4 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 11:40:42 +0300 Subject: [PATCH 1561/1768] update flake.lock --- flake.lock | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ea7fd39..2c79c24 100644 --- a/flake.lock +++ b/flake.lock @@ -25,6 +25,22 @@ "type": "github" } }, + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -54,11 +70,11 @@ ] }, "locked": { - "lastModified": 1760701190, - "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", + "lastModified": 1761899396, + "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", "owner": "nix-community", "repo": "disko", - "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", + "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", "type": "github" }, "original": { @@ -67,6 +83,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -107,6 +139,54 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "simple-nixos-mailserver", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "simple-nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758108966, + "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "simple-nixos-mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -390,6 +470,22 @@ "type": "github" } }, + "nixpkgs-25_05": { + "locked": { + "lastModified": 1759143472, + "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-docs": { "locked": { "lastModified": 1705957679, @@ -645,7 +741,8 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "osbm-nvim": "osbm-nvim", - "raspberry-pi-nix": "raspberry-pi-nix" + "raspberry-pi-nix": "raspberry-pi-nix", + "simple-nixos-mailserver": "simple-nixos-mailserver" } }, "rpi-bluez-firmware-src": { @@ -783,6 +880,30 @@ "type": "github" } }, + "simple-nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat", + "git-hooks": "git-hooks", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-25_05": "nixpkgs-25_05" + }, + "locked": { + "lastModified": 1759489698, + "narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "systems": { "locked": { "lastModified": 1681028828, From 19aff29d307df5f29b4ce5ab2fa95f9bca65943a Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 11:43:25 +0300 Subject: [PATCH 1562/1768] mkif --- modules/nixos/services/mailserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 6d38dd7..06393d0 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -5,7 +5,7 @@ ]; config = lib.mkMerge [ - (lib.optionalAttrs config.osbmModules.services.mailserver.enable { + (lib.mkIf config.osbmModules.services.mailserver.enable { mailserver = { enable = true; stateVersion = 3; From 6f96405869ca57fdcfb72346ec0088ed00041907 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 11:55:58 +0300 Subject: [PATCH 1563/1768] fix persist folder --- modules/nixos/services/vaultwarden.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index a661f24..9b42091 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -49,12 +49,17 @@ # impermanence with vaultwarden (lib.mkIf (config.osbmModules.services.vaultwarden.enable && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot) { - environment.persistence."/persist" = { - directories = [ - "/var/lib/vaultwarden" - "/var/local/vaultwarden" - ]; - }; + environment.persistence."/persist" = { + directories = [ + { + directory = "/var/lib/vaultwarden"; + user = config.systemd.services.vaultwarden.serviceConfig.User; + group = config.systemd.services.vaultwarden.serviceConfig.Group; + mode = "0750"; + } + ]; + }; }) ]; -} \ No newline at end of file +} + From 26227941fa740029b8023fd370a92de3a372e855 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:00:01 +0300 Subject: [PATCH 1564/1768] use vaultwarden secret --- modules/nixos/services/vaultwarden.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 9b42091..f7cfaa7 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -11,7 +11,7 @@ backupDir = "/var/local/vaultwarden/backup"; # in order to avoid having ADMIN_TOKEN in the nix store it can be also set with the help of an environment file # be aware that this file must be created by hand (or via secrets management like sops) - environmentFile = "/var/lib/vaultwarden/vaultwarden.env"; + environmentFile = config.age.secrets.vaultwarden-env.file; config = { # Refer to https://github.com/dani-garcia/vaultwarden/blob/main/.env.template DOMAIN = "https://bitwarden.osbm.dev"; From 62d6a5c0df484ca71508b61e8c6b4f32d780dc1c Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:02:40 +0300 Subject: [PATCH 1565/1768] mention the file --- secrets/secrets.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 36b16fd..a5f4648 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -21,4 +21,5 @@ in "ssh-key-private.age".publicKeys = machines ++ [ osbm ]; "ssh-key-public.age".publicKeys = machines ++ [ osbm ]; "cloudflare.age".publicKeys = machines ++ [ osbm ]; + "vaultwarden.age".publicKeys = machines ++ [ osbm ]; } From c755b31329c4a594c8b34b2d92b1e6dad9586791 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:04:59 +0300 Subject: [PATCH 1566/1768] create vaultwarden secret --- secrets/vaultwarden.age | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 secrets/vaultwarden.age diff --git a/secrets/vaultwarden.age b/secrets/vaultwarden.age new file mode 100644 index 0000000..5088edc --- /dev/null +++ b/secrets/vaultwarden.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-ed25519 YVcKMQ 9A4o6YqSMG0WyCquZMCiTxZ13m4HYIsXAkA15SKGeGw +M3m60veZZpKYRJt+kE0cCnYtYVfsOXjyaQ4prYBlcsg +-> ssh-ed25519 a9zBzw UWTlT2YsgPxWQIAq3E6w3IpfQ1+a6jpTjPmheIOewyg +nJlk1ILkiwUapR4++UypLH5BNe+TwmIOZ3LPWZYjM7E +-> ssh-ed25519 /0F2+A K/PPN0iBb76hw5eU1wf9OLmdFVp6A1JlSjL4wdShoxI +sNWcIQTfukRCYaY9lPSZnZRtOZpwpNgWUDbvqe0ha/4 +-> ssh-ed25519 cs+R0A PFz9tm+oeFamg7XjVaUzYf1mFOJttGnqKhjFblShWAA +2O5pCPJnlA8kSUZUjAGzEIwPGPlcJVIYF7oCUI7NAQs +-> ssh-ed25519 uTfCrQ v+fSi0Vi0OzCqB69vpgpbts8FpIVAcFYwpbihZXguwo +BEGzhIxLV3Q6pfe27f2kx8N7W8H4zBPP2tJgyKLzCpQ +-> ssh-ed25519 Ws1uag kkvILCkApOxL2RLaEaT4uOfWBTKPcPlDX1aZwqmJ/Bg +OSUy2BqzP7FlAV1o757Lc+Ww4eO/UfvyiSDrGHMKOj4 +--- 5DwmbdRNElZykXb+HwILIEkcD3VKGkXBKF/uNMSTM4w +{(IF?HE}&:epN+z +hT(ށ[>嫢jh~ǿK8}9R s5cɎuf%ͪTÝx +N ( \ No newline at end of file From 4b9c8b3e80febde432068679ec14e6d83531dec8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:05:30 +0300 Subject: [PATCH 1567/1768] update correct path --- modules/nixos/services/vaultwarden.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index f7cfaa7..cc9c6d0 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -11,7 +11,7 @@ backupDir = "/var/local/vaultwarden/backup"; # in order to avoid having ADMIN_TOKEN in the nix store it can be also set with the help of an environment file # be aware that this file must be created by hand (or via secrets management like sops) - environmentFile = config.age.secrets.vaultwarden-env.file; + environmentFile = config.age.secrets.vaultwarden.path; config = { # Refer to https://github.com/dani-garcia/vaultwarden/blob/main/.env.template DOMAIN = "https://bitwarden.osbm.dev"; From 58e40e58e83ddc8651bececef9c0ca3b9a0b3629 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:07:30 +0300 Subject: [PATCH 1568/1768] mention vaultwarden in here too --- modules/nixos/system/agenix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix index ed6253b..c3e9661 100644 --- a/modules/nixos/system/agenix.nix +++ b/modules/nixos/system/agenix.nix @@ -17,6 +17,7 @@ ]; age.secrets = { + vaultwarden.file = ../../../secrets/vaultwarden.age; network-manager.file = ../../../secrets/network-manager.age; ssh-key-private = { file = ../../../secrets/ssh-key-private.age; From bae69545cdf6c29eb9e149680db6a0a0726b3630 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:14:57 +0300 Subject: [PATCH 1569/1768] formatting --- modules/nixos/services/mailserver.nix | 11 +++- modules/nixos/services/vaultwarden.nix | 81 ++++++++++++++------------ 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 06393d0..110aec9 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -1,4 +1,9 @@ -{ config, inputs, lib, ... }: +{ + config, + inputs, + lib, + ... +}: { imports = [ inputs.simple-nixos-mailserver.nixosModule @@ -17,7 +22,7 @@ loginAccounts = { "osbm@osbm.dev" = { hashedPasswordFile = "/persist/osbm.passwd"; # TODO: Make this into agenix secret - aliases = ["postmaster@osbm.dev"]; + aliases = [ "postmaster@osbm.dev" ]; }; }; @@ -27,4 +32,4 @@ }; }) ]; -} \ No newline at end of file +} diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index cc9c6d0..9f28a52 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -13,53 +13,60 @@ # be aware that this file must be created by hand (or via secrets management like sops) environmentFile = config.age.secrets.vaultwarden.path; config = { - # Refer to https://github.com/dani-garcia/vaultwarden/blob/main/.env.template - DOMAIN = "https://bitwarden.osbm.dev"; - SIGNUPS_ALLOWED = false; + # Refer to https://github.com/dani-garcia/vaultwarden/blob/main/.env.template + DOMAIN = "https://bitwarden.osbm.dev"; + SIGNUPS_ALLOWED = false; - ROCKET_ADDRESS = "127.0.0.1"; - ROCKET_PORT = 8222; - ROCKET_LOG = "critical"; + ROCKET_ADDRESS = "127.0.0.1"; + ROCKET_PORT = 8222; + ROCKET_LOG = "critical"; - # This example assumes a mailserver running on localhost, - # thus without transport encryption. - # If you use an external mail server, follow: - # https://github.com/dani-garcia/vaultwarden/wiki/SMTP-configuration - SMTP_HOST = "127.0.0.1"; - SMTP_PORT = 25; - SMTP_SSL = false; + # This example assumes a mailserver running on localhost, + # thus without transport encryption. + # If you use an external mail server, follow: + # https://github.com/dani-garcia/vaultwarden/wiki/SMTP-configuration + SMTP_HOST = "127.0.0.1"; + SMTP_PORT = 25; + SMTP_SSL = false; - SMTP_FROM = "admin@bitwarden.osbm.dev"; - SMTP_FROM_NAME = "osbm.dev Bitwarden server"; + SMTP_FROM = "admin@bitwarden.osbm.dev"; + SMTP_FROM_NAME = "osbm.dev Bitwarden server"; }; }; }) - # vaultwarden reverse proxy via nginx - (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.vaultwarden.enable) { - services.nginx.virtualHosts."bitwarden.osbm.dev" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:${toString config.services.vaultwarden.config.ROCKET_PORT}"; + (lib.mkIf + (config.osbmModules.services.nginx.enable && config.osbmModules.services.vaultwarden.enable) + { + services.nginx.virtualHosts."bitwarden.osbm.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.vaultwarden.config.ROCKET_PORT}"; + }; }; - }; - }) + } + ) # impermanence with vaultwarden - (lib.mkIf (config.osbmModules.services.vaultwarden.enable && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot) { - environment.persistence."/persist" = { - directories = [ - { - directory = "/var/lib/vaultwarden"; - user = config.systemd.services.vaultwarden.serviceConfig.User; - group = config.systemd.services.vaultwarden.serviceConfig.Group; - mode = "0750"; - } - ]; - }; - }) + (lib.mkIf + ( + config.osbmModules.services.vaultwarden.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + environment.persistence."/persist" = { + directories = [ + { + directory = "/var/lib/vaultwarden"; + user = config.systemd.services.vaultwarden.serviceConfig.User; + group = config.systemd.services.vaultwarden.serviceConfig.Group; + mode = "0750"; + } + ]; + }; + } + ) ]; } - From a97962e2a6d5af01d93e62774020d5ae0baddc53 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:27:45 +0300 Subject: [PATCH 1570/1768] i will kill myself in a gruesome manner --- modules/nixos/services/vaultwarden.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 9f28a52..c9d10d0 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -56,6 +56,8 @@ && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot ) { + systemd.services.vaultwarden.serviceConfig.ReadWritePaths = [ "/var/lib/vaultwarden" ]; + environment.persistence."/persist" = { directories = [ { From 2cedf1a717e6a8396d30c92c15d56d52f88ba5be Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:32:40 +0300 Subject: [PATCH 1571/1768] update backup dir --- modules/nixos/services/vaultwarden.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index c9d10d0..1861a5b 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -8,7 +8,7 @@ (lib.mkIf config.osbmModules.services.vaultwarden.enable { services.vaultwarden = { enable = true; - backupDir = "/var/local/vaultwarden/backup"; + backupDir = "/persist/backup/vaultwarden"; # in order to avoid having ADMIN_TOKEN in the nix store it can be also set with the help of an environment file # be aware that this file must be created by hand (or via secrets management like sops) environmentFile = config.age.secrets.vaultwarden.path; From 900d5ad44e35a0e7593ea2f5c0bd6a167e623fa6 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:32:45 +0300 Subject: [PATCH 1572/1768] todo --- modules/nixos/services/vaultwarden.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 1861a5b..8e4ef95 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -57,6 +57,7 @@ ) { systemd.services.vaultwarden.serviceConfig.ReadWritePaths = [ "/var/lib/vaultwarden" ]; + # TODO try if not using bindMounts fixes this environment.persistence."/persist" = { directories = [ From de54699ce72a5115f0f5dee398df16f51d70b7b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:37:22 +0300 Subject: [PATCH 1573/1768] symlink --- modules/nixos/services/vaultwarden.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 8e4ef95..2017864 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -66,6 +66,7 @@ user = config.systemd.services.vaultwarden.serviceConfig.User; group = config.systemd.services.vaultwarden.serviceConfig.Group; mode = "0750"; + method = "symlink"; } ]; }; From 043f55417947e767015ca635b4b3b87ada8afff9 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 14:38:57 +0300 Subject: [PATCH 1574/1768] Revert "symlink" This reverts commit de54699ce72a5115f0f5dee398df16f51d70b7b7. --- modules/nixos/services/vaultwarden.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 2017864..8e4ef95 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -66,7 +66,6 @@ user = config.systemd.services.vaultwarden.serviceConfig.User; group = config.systemd.services.vaultwarden.serviceConfig.Group; mode = "0750"; - method = "symlink"; } ]; }; From 36d114a84b11c1599f3b201fbebbe72760e7b237 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 21:08:42 +0300 Subject: [PATCH 1575/1768] add thunderbird --- modules/nixos/programs/graphical.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/programs/graphical.nix b/modules/nixos/programs/graphical.nix index 3f4f11d..1dc2359 100644 --- a/modules/nixos/programs/graphical.nix +++ b/modules/nixos/programs/graphical.nix @@ -17,6 +17,7 @@ blender vscode chromium + thunderbird ]; }; } From c52418ea46794bbee046d9f085fd2cc8fbed919f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 21:13:22 +0300 Subject: [PATCH 1576/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2c79c24..0f7f956 100644 --- a/flake.lock +++ b/flake.lock @@ -440,11 +440,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761827175, - "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", + "lastModified": 1761933221, + "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", + "rev": "7467f155fcba189eb088a7601f44fbef7688669b", "type": "github" }, "original": { From c777f9ff4d2216d822846fc4eb7c6ae199c827b0 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 22:12:47 +0300 Subject: [PATCH 1577/1768] i think this addition is very good --- modules/nixos/hardware/nvidia.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix index 5a26043..3104c01 100644 --- a/modules/nixos/hardware/nvidia.nix +++ b/modules/nixos/hardware/nvidia.nix @@ -11,6 +11,11 @@ enable = true; }; + nixpkgs.config = { + cudaSupport = true; + cudaCapabilities = [ "8.9" ]; # 4090 + }; + # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = [ "nvidia" ]; From 09bd0051f9ca01f820a83bf0aad164ac5fb4e8aa Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 22:13:10 +0300 Subject: [PATCH 1578/1768] find out why these packages are used --- modules/nixos/system/nix-settings.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 5554327..9eb9f5c 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -20,13 +20,22 @@ "spotify" "cursor" # NVIDIA related + "libcurand" "nvidia-x11" "cuda_cudart" - "libcublas" - "cuda_cccl" "cuda_nvcc" + "cuda_cccl" + "libcublas" + "libcusparse" + "libnvjitlink" + "libcufft" + "cudnn" + "cuda_nvrtc" + "libnpp" "nvidia-settings" - "cuda-merged" + # blender with cuda is not foss?!? + "blender" + ]; nixpkgs.config.allowAliases = false; From d5331ddd7f6fd9fc2407cdd6e3625e9084dcfdcd Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 22:26:25 +0300 Subject: [PATCH 1579/1768] will this make it faster? --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index 0f5dab6..e985ea2 100644 --- a/justfile +++ b/justfile @@ -16,7 +16,7 @@ switch *args: check-git remove-hm-backup-files if [[ "$(hostname)" == "localhost" ]]; then nix-on-droid switch --flake . {{args}} else - nh os switch . {{args}} + nh os switch . {{args}} --accept-flake-config fi [macos] From 31ec7dd416d93666f9aae5764de5f4b043c6db89 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 31 Oct 2025 22:34:11 +0300 Subject: [PATCH 1580/1768] i dont want jellyfin rightnow --- hosts/nixos/ymir/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index ee5aa1b..a585928 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -20,7 +20,6 @@ nvidia.enable = true; }; services = { - jellyfin.enable = true; ollama.enable = true; }; i18n.enable = true; From 09e38c66d64daf7cc9572ea976e9681c1122c6eb Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Nov 2025 15:20:32 +0300 Subject: [PATCH 1581/1768] update flake.lock --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0f7f956..e794318 100644 --- a/flake.lock +++ b/flake.lock @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { From 6e4208291cb859e04692c9e1a9af10e23d446b75 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 1 Nov 2025 18:09:12 +0300 Subject: [PATCH 1582/1768] cuda terrorizes nixpkgs community --- modules/home-manager/programs/firefox.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index b2e1e86..6c289d7 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -1,6 +1,7 @@ { lib, nixosConfig ? null, # Receive the NixOS config + pkgs, ... }: { @@ -14,6 +15,10 @@ # Firefox configuration { programs.firefox = { + # TODO Firefox fails as the closure contains a reference to stdenv.cc + # Relax this assertion until the underlying issue is fixed + # https://github.com/NixOS/nixpkgs/pull/457424 + package = pkgs.firefox.overrideAttrs { disallowedRequisites = [ ]; }; languagePacks = [ "ja" "tr" From 59d246a23c649e44f77eb0e908941c3bef827dea Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 12:49:37 +0300 Subject: [PATCH 1583/1768] i hope this was the issue --- modules/nixos/services/vaultwarden.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 8e4ef95..046ec8c 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -29,7 +29,7 @@ SMTP_PORT = 25; SMTP_SSL = false; - SMTP_FROM = "admin@bitwarden.osbm.dev"; + SMTP_FROM = "osbm@osbm.dev"; SMTP_FROM_NAME = "osbm.dev Bitwarden server"; }; }; From 8590a6727390f73796e7c13a6a70a0e511a2e55f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 17:06:28 +0300 Subject: [PATCH 1584/1768] add firefox-syncserver --- modules/nixos/options.nix | 1 + modules/nixos/services/default.nix | 1 + modules/nixos/services/firefox-syncserver.nix | 48 +++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 modules/nixos/services/firefox-syncserver.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 45932c0..7e930b9 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -143,6 +143,7 @@ syncthing.enable = lib.mkEnableOption "syncthing"; jellyfin.enable = lib.mkEnableOption "jellyfin"; mailserver.enable = lib.mkEnableOption "mailserver"; + firefox-syncserver.enable = lib.mkEnableOption "firefox-syncserver"; vaultwarden.enable = lib.mkEnableOption "vaultwarden"; nginx.enable = lib.mkEnableOption "nginx"; ollama.enable = lib.mkEnableOption "ollama"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index bf63669..175a34c 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -6,6 +6,7 @@ ./cloudflared.nix ./ollama.nix ./openssh.nix + ./firefox-syncserver.nix ./forgejo.nix ./glance.nix ./hydra.nix diff --git a/modules/nixos/services/firefox-syncserver.nix b/modules/nixos/services/firefox-syncserver.nix new file mode 100644 index 0000000..83f809f --- /dev/null +++ b/modules/nixos/services/firefox-syncserver.nix @@ -0,0 +1,48 @@ +{config, lib, ...}: + +{ + config = lib.mkMerge [ + (lib.mkIf config.osbmModules.services.firefox-syncserver.enable { + services.firefox-syncserver = { + enable = true; + settings.port = 5000; + }; + }) + + # firefox-syncserver and nginx + (lib.mkIf + (config.osbmModules.services.nginx.enable && config.osbmModules.services.firefox-syncserver.enable) + { + services.nginx.virtualHosts."firefox.osbm.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.firefox-syncserver.settings.port}"; + }; + }; + } + ) + + # impermanence and firefox-syncserver + (lib.mkIf + ( + config.osbmModules.services.firefox-syncserver.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + systemd.services.firefox-syncserver.serviceConfig.ReadWritePaths = [ "/var/lib/firefox-syncserver" ]; + + environment.persistence."/persist" = { + directories = [ + { + directory = "/var/lib/firefox-syncserver"; + user = config.systemd.services.firefox-syncserver.serviceConfig.User; + group = config.systemd.services.firefox-syncserver.serviceConfig.Group; + mode = "0750"; + } + ]; + }; + } + ) + ]; +} \ No newline at end of file From b919ce744b344b633c251d84b542a3667495efe0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 17:11:05 +0300 Subject: [PATCH 1585/1768] add bitwarden --- modules/nixos/services/glance.nix | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 4c0243a..14c3fe1 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -110,24 +110,9 @@ url = "https://git.osbm.dev"; } { - icon = "si:ollama"; - title = "Open Webui"; - url = "http://ymir.curl-boga.ts.net:7070/"; - } - { - icon = "sh:jellyfin"; - title = "Jellyfin"; - url = "http://ymir.curl-boga.ts.net:8096/"; - } - { - icon = "sh:nixos"; - title = "Hydra"; - url = "http://wallfacer.curl-boga.ts.net:3000"; - } - { - icon = "sh:nixos"; - title = "Attix Binary Cache"; - url = "https://cache.osbm.dev"; + icon = "sh:bitwarden"; + title = "Bitwarden Vault"; + url = "https://bitwarden.osbm.dev"; } { icon = "sh:visual-studio-code"; From 2a78278295d9fa99489d863700f9cd18157032d0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 17:19:33 +0300 Subject: [PATCH 1586/1768] i dont use this project anymore --- modules/nixos/services/cloudflare-dyndns.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/nixos/services/cloudflare-dyndns.nix b/modules/nixos/services/cloudflare-dyndns.nix index 9290980..9986a73 100644 --- a/modules/nixos/services/cloudflare-dyndns.nix +++ b/modules/nixos/services/cloudflare-dyndns.nix @@ -12,7 +12,6 @@ proxied = false; # TODO please revert domains = [ "git.osbm.dev" - "aifred.osbm.dev" ]; }; }) From bb1ab6be9122a8780e4f8913bbe90997e9369b9b Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 19:10:44 +0300 Subject: [PATCH 1587/1768] formatting --- modules/nixos/services/firefox-syncserver.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/nixos/services/firefox-syncserver.nix b/modules/nixos/services/firefox-syncserver.nix index 83f809f..32f611d 100644 --- a/modules/nixos/services/firefox-syncserver.nix +++ b/modules/nixos/services/firefox-syncserver.nix @@ -1,4 +1,4 @@ -{config, lib, ...}: +{ config, lib, ... }: { config = lib.mkMerge [ @@ -30,7 +30,9 @@ && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot ) { - systemd.services.firefox-syncserver.serviceConfig.ReadWritePaths = [ "/var/lib/firefox-syncserver" ]; + systemd.services.firefox-syncserver.serviceConfig.ReadWritePaths = [ + "/var/lib/firefox-syncserver" + ]; environment.persistence."/persist" = { directories = [ @@ -45,4 +47,4 @@ } ) ]; -} \ No newline at end of file +} From a19dbe018e38b0e0238b72cf8b9e22ccbaa17562 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 19:11:05 +0300 Subject: [PATCH 1588/1768] add immich --- modules/nixos/options.nix | 1 + modules/nixos/services/default.nix | 1 + modules/nixos/services/immich.nix | 43 ++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 modules/nixos/services/immich.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 7e930b9..0286dec 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -153,6 +153,7 @@ cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns"; glance.enable = lib.mkEnableOption "glance"; hydra.enable = lib.mkEnableOption "hydra"; + immich.enable = lib.mkEnableOption "immich"; vscode-server.enable = lib.mkEnableOption "vscode-server"; wanikani-bypass-lessons.enable = lib.mkEnableOption "wanikani-bypass-lessons"; wanikani-fetch-data.enable = lib.mkEnableOption "wanikani-fetch-data"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 175a34c..3143a49 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -10,6 +10,7 @@ ./forgejo.nix ./glance.nix ./hydra.nix + ./immich.nix ./jellyfin.nix ./mailserver.nix ./nginx.nix diff --git a/modules/nixos/services/immich.nix b/modules/nixos/services/immich.nix new file mode 100644 index 0000000..0605114 --- /dev/null +++ b/modules/nixos/services/immich.nix @@ -0,0 +1,43 @@ +{ config, lib, ... }: + +{ + config = lib.mkMerge [ + (lib.mkIf config.osbmModules.services.immich.enable { + services.immich = { + enable = true; + }; + }) + + # immich and nginx + (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.immich.enable) { + services.nginx.virtualHosts."immich.osbm.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.immich.port}"; + proxyWebsockets = true; + }; + }; + }) + + # impermanence and immich + (lib.mkIf + ( + config.osbmModules.services.immich.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + environment.persistence."/persist" = { + directories = [ + { + directory = "/var/lib/immich"; + user = config.services.immich.user; + group = config.services.immich.group; + mode = "0750"; + } + ]; + }; + } + ) + ]; +} From 56449b8b7d4671a739c5e33fde705a043952f7cb Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 19:11:17 +0300 Subject: [PATCH 1589/1768] add seafile --- modules/nixos/options.nix | 1 + modules/nixos/services/default.nix | 1 + modules/nixos/services/seafile.nix | 71 ++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 modules/nixos/services/seafile.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 0286dec..a22712b 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -154,6 +154,7 @@ glance.enable = lib.mkEnableOption "glance"; hydra.enable = lib.mkEnableOption "hydra"; immich.enable = lib.mkEnableOption "immich"; + seafile.enable = lib.mkEnableOption "seafile"; vscode-server.enable = lib.mkEnableOption "vscode-server"; wanikani-bypass-lessons.enable = lib.mkEnableOption "wanikani-bypass-lessons"; wanikani-fetch-data.enable = lib.mkEnableOption "wanikani-fetch-data"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 3143a49..1877f47 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -14,6 +14,7 @@ ./jellyfin.nix ./mailserver.nix ./nginx.nix + ./seafile.nix ./syncthing.nix ./tailscale.nix ./vaultwarden.nix diff --git a/modules/nixos/services/seafile.nix b/modules/nixos/services/seafile.nix new file mode 100644 index 0000000..759bd03 --- /dev/null +++ b/modules/nixos/services/seafile.nix @@ -0,0 +1,71 @@ +{ config, lib, ... }: + +{ + config = lib.mkMerge [ + (lib.mkIf config.osbmModules.services.seafile.enable { + services.seafile = { + enable = true; + adminEmail = "osbm@osbm.dev"; + initialAdminPassword = "changeme"; + seafileSettings = { + fileserver = { + host = "unix:/run/seafile/server.sock"; + }; + }; + }; + }) + + # seafile and nginx + (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.seafile.enable) { + services.nginx.virtualHosts."seafile.osbm.dev" = { + forceSSL = true; + enableACME = true; + locations = { + "/" = { + proxyPass = "http://unix:/run/seahub/gunicorn.sock"; + extraConfig = '' + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $server_name; + proxy_read_timeout 1200s; + client_max_body_size 0; + ''; + }; + "/seafhttp" = { + proxyPass = "http://unix:/run/seafile/server.sock"; + extraConfig = '' + rewrite ^/seafhttp(.*)$ $1 break; + client_max_body_size 0; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_connect_timeout 36000s; + proxy_read_timeout 36000s; + proxy_send_timeout 36000s; + send_timeout 36000s; + ''; + }; + }; + }; + }) + + # impermanence and seafile + (lib.mkIf + ( + config.osbmModules.services.seafile.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + environment.persistence."/persist" = { + directories = [ + { + directory = "/var/lib/seafile"; + user = config.services.seafile.user; + group = config.services.seafile.group; + mode = "0750"; + } + ]; + }; + } + ) + ]; +} From 31cb45c063f76b27a2864f569dd21e040879359c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 19:12:27 +0300 Subject: [PATCH 1590/1768] enable apollo --- hosts/nixos/apollo/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 04ee8fc..51e0710 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -15,6 +15,8 @@ nginx.enable = true; forgejo.enable = true; vaultwarden.enable = true; + immich.enable = true; + seafile.enable = true; }; hardware = { From 65091d8d4c400f9da0ee214355122c47c8b40115 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 19:16:27 +0300 Subject: [PATCH 1591/1768] Revert "add seafile" This reverts commit 56449b8b7d4671a739c5e33fde705a043952f7cb. --- modules/nixos/options.nix | 1 - modules/nixos/services/default.nix | 1 - modules/nixos/services/seafile.nix | 71 ------------------------------ 3 files changed, 73 deletions(-) delete mode 100644 modules/nixos/services/seafile.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index a22712b..0286dec 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -154,7 +154,6 @@ glance.enable = lib.mkEnableOption "glance"; hydra.enable = lib.mkEnableOption "hydra"; immich.enable = lib.mkEnableOption "immich"; - seafile.enable = lib.mkEnableOption "seafile"; vscode-server.enable = lib.mkEnableOption "vscode-server"; wanikani-bypass-lessons.enable = lib.mkEnableOption "wanikani-bypass-lessons"; wanikani-fetch-data.enable = lib.mkEnableOption "wanikani-fetch-data"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 1877f47..3143a49 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -14,7 +14,6 @@ ./jellyfin.nix ./mailserver.nix ./nginx.nix - ./seafile.nix ./syncthing.nix ./tailscale.nix ./vaultwarden.nix diff --git a/modules/nixos/services/seafile.nix b/modules/nixos/services/seafile.nix deleted file mode 100644 index 759bd03..0000000 --- a/modules/nixos/services/seafile.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ config, lib, ... }: - -{ - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.services.seafile.enable { - services.seafile = { - enable = true; - adminEmail = "osbm@osbm.dev"; - initialAdminPassword = "changeme"; - seafileSettings = { - fileserver = { - host = "unix:/run/seafile/server.sock"; - }; - }; - }; - }) - - # seafile and nginx - (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.seafile.enable) { - services.nginx.virtualHosts."seafile.osbm.dev" = { - forceSSL = true; - enableACME = true; - locations = { - "/" = { - proxyPass = "http://unix:/run/seahub/gunicorn.sock"; - extraConfig = '' - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - proxy_read_timeout 1200s; - client_max_body_size 0; - ''; - }; - "/seafhttp" = { - proxyPass = "http://unix:/run/seafile/server.sock"; - extraConfig = '' - rewrite ^/seafhttp(.*)$ $1 break; - client_max_body_size 0; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_connect_timeout 36000s; - proxy_read_timeout 36000s; - proxy_send_timeout 36000s; - send_timeout 36000s; - ''; - }; - }; - }; - }) - - # impermanence and seafile - (lib.mkIf - ( - config.osbmModules.services.seafile.enable - && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot - ) - { - environment.persistence."/persist" = { - directories = [ - { - directory = "/var/lib/seafile"; - user = config.services.seafile.user; - group = config.services.seafile.group; - mode = "0750"; - } - ]; - }; - } - ) - ]; -} From d5b6b8c33549f48ac83be225ed50144f701164b2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 2 Nov 2025 20:32:07 +0300 Subject: [PATCH 1592/1768] seafile is removed --- hosts/nixos/apollo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 51e0710..9b08898 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -16,7 +16,7 @@ forgejo.enable = true; vaultwarden.enable = true; immich.enable = true; - seafile.enable = true; + # seafile.enable = true; }; hardware = { From 6cf06efd6d4e6fa95698d74dd4e5e44eca65a333 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 3 Nov 2025 14:41:59 +0300 Subject: [PATCH 1593/1768] formatting --- modules/nixos/services/wanikani-stats/app.py | 158 +++++++++++-------- 1 file changed, 89 insertions(+), 69 deletions(-) diff --git a/modules/nixos/services/wanikani-stats/app.py b/modules/nixos/services/wanikani-stats/app.py index c9a2f1b..3766221 100644 --- a/modules/nixos/services/wanikani-stats/app.py +++ b/modules/nixos/services/wanikani-stats/app.py @@ -102,34 +102,36 @@ def get_plotly_html(df, column, title, ylabel): """Generate an interactive Plotly HTML for a given DataFrame column.""" fig = go.Figure() - fig.add_trace(go.Scatter( - x=df["date"], - y=df[column], - mode='lines+markers', - name=column.capitalize(), - line=dict(width=2), - marker=dict(size=6) - )) + fig.add_trace( + go.Scatter( + x=df["date"], + y=df[column], + mode="lines+markers", + name=column.capitalize(), + line=dict(width=2), + marker=dict(size=6), + ) + ) fig.update_layout( title=title, xaxis_title="Date", yaxis_title=ylabel, template="plotly_dark", - plot_bgcolor='#151519', - paper_bgcolor='#151519', + plot_bgcolor="#151519", + paper_bgcolor="#151519", width=1200, height=600, - margin=dict(l=50, r=50, t=50, b=50) + margin=dict(l=50, r=50, t=50, b=50), ) # Show every 10th date label for better readability date_indices = list(range(0, len(df), 10)) fig.update_xaxes( - tickmode='array', + tickmode="array", tickvals=[df.iloc[i]["date"] for i in date_indices], ticktext=[df.iloc[i]["date"] for i in date_indices], - tickangle=45 + tickangle=45, ) return fig.to_html(include_plotlyjs=True, div_id=f"plot_{column}") @@ -140,72 +142,74 @@ def get_apprentice_distribution_html(df): fig = go.Figure() # Add stacked area traces - fig.add_trace(go.Scatter( - x=df["date"], - y=df["apprentice_1"], - mode='lines', - name='Apprentice I', - stackgroup='one', - fillcolor='rgba(255, 107, 107, 0.8)', - line=dict(width=0.5, color='#ff6b6b') - )) + fig.add_trace( + go.Scatter( + x=df["date"], + y=df["apprentice_1"], + mode="lines", + name="Apprentice I", + stackgroup="one", + fillcolor="rgba(255, 107, 107, 0.8)", + line=dict(width=0.5, color="#ff6b6b"), + ) + ) - fig.add_trace(go.Scatter( - x=df["date"], - y=df["apprentice_2"], - mode='lines', - name='Apprentice II', - stackgroup='one', - fillcolor='rgba(78, 205, 196, 0.8)', - line=dict(width=0.5, color='#4ecdc4') - )) + fig.add_trace( + go.Scatter( + x=df["date"], + y=df["apprentice_2"], + mode="lines", + name="Apprentice II", + stackgroup="one", + fillcolor="rgba(78, 205, 196, 0.8)", + line=dict(width=0.5, color="#4ecdc4"), + ) + ) - fig.add_trace(go.Scatter( - x=df["date"], - y=df["apprentice_3"], - mode='lines', - name='Apprentice III', - stackgroup='one', - fillcolor='rgba(69, 183, 209, 0.8)', - line=dict(width=0.5, color='#45b7d1') - )) + fig.add_trace( + go.Scatter( + x=df["date"], + y=df["apprentice_3"], + mode="lines", + name="Apprentice III", + stackgroup="one", + fillcolor="rgba(69, 183, 209, 0.8)", + line=dict(width=0.5, color="#45b7d1"), + ) + ) - fig.add_trace(go.Scatter( - x=df["date"], - y=df["apprentice_4"], - mode='lines', - name='Apprentice IV', - stackgroup='one', - fillcolor='rgba(150, 206, 180, 0.8)', - line=dict(width=0.5, color='#96ceb4') - )) + fig.add_trace( + go.Scatter( + x=df["date"], + y=df["apprentice_4"], + mode="lines", + name="Apprentice IV", + stackgroup="one", + fillcolor="rgba(150, 206, 180, 0.8)", + line=dict(width=0.5, color="#96ceb4"), + ) + ) fig.update_layout( title="Apprentice Stage Distribution Over Time", xaxis_title="Date", yaxis_title="Number of Items", template="plotly_dark", - plot_bgcolor='#151519', - paper_bgcolor='#151519', + plot_bgcolor="#151519", + paper_bgcolor="#151519", width=1200, height=600, margin=dict(l=50, r=50, t=50, b=50), - legend=dict( - orientation="h", - yanchor="bottom", - y=1.02, - xanchor="right", - x=1 - ) + legend=dict(orientation="h", yanchor="bottom", y=1.02, xanchor="right", x=1), ) # Show every 10th date label for better readability date_indices = list(range(0, len(df), 10)) fig.update_xaxes( - tickmode='array', + tickmode="array", tickvals=[df.iloc[i]["date"] for i in date_indices], ticktext=[df.iloc[i]["date"] for i in date_indices], - tickangle=45 + tickangle=45, ) return fig.to_html(include_plotlyjs=True, div_id="apprentice_distribution") @@ -214,8 +218,12 @@ def get_apprentice_distribution_html(df): def generate_standalone_html(df, output_path=None): """Generate a completely self-contained HTML file with all charts.""" # Generate all chart HTML - reviews_html = get_plotly_html(df, "num_reviews", "Daily Reviews", "Number of Reviews") - lessons_html = get_plotly_html(df, "num_lessons", "Daily Lessons", "Number of Lessons") + reviews_html = get_plotly_html( + df, "num_reviews", "Daily Reviews", "Number of Reviews" + ) + lessons_html = get_plotly_html( + df, "num_lessons", "Daily Lessons", "Number of Lessons" + ) progression_html = get_plotly_html( df, "progression", "SRS Progression", "Progression (%)" ) @@ -223,7 +231,9 @@ def generate_standalone_html(df, output_path=None): srs_stage_apprentice_html = get_plotly_html( df, "apprentice", "Apprentice Stage", "Number of Subjects" ) - srs_stage_guru_html = get_plotly_html(df, "guru", "Guru Stage", "Number of Subjects") + srs_stage_guru_html = get_plotly_html( + df, "guru", "Guru Stage", "Number of Subjects" + ) srs_stage_master_html = get_plotly_html( df, "master", "Master Stage", "Number of Subjects" ) @@ -295,7 +305,7 @@ def generate_standalone_html(df, output_path=None): # Save to file if output_path is provided if output_path: - with open(output_path, 'w', encoding='utf-8') as f: + with open(output_path, "w", encoding="utf-8") as f: f.write(html_content) print(f"Standalone HTML dashboard saved to: {output_path}") @@ -319,14 +329,20 @@ def download_dashboard(): html_content = generate_standalone_html(df) response = Response(html_content, content_type="text/html") - response.headers["Content-Disposition"] = "attachment; filename=wanikani_dashboard.html" + response.headers["Content-Disposition"] = ( + "attachment; filename=wanikani_dashboard.html" + ) return response def render_html(df): """Render the DataFrame as HTML with interactive Plotly charts.""" - reviews_html = get_plotly_html(df, "num_reviews", "Daily Reviews", "Number of Reviews") - lessons_html = get_plotly_html(df, "num_lessons", "Daily Lessons", "Number of Lessons") + reviews_html = get_plotly_html( + df, "num_reviews", "Daily Reviews", "Number of Reviews" + ) + lessons_html = get_plotly_html( + df, "num_lessons", "Daily Lessons", "Number of Lessons" + ) progression_html = get_plotly_html( df, "progression", "SRS Progression", "Progression (%)" ) @@ -338,7 +354,9 @@ def render_html(df): srs_stage_apprentice_html = get_plotly_html( df, "apprentice", "Apprentice Stage", "Number of Subjects" ) - srs_stage_guru_html = get_plotly_html(df, "guru", "Guru Stage", "Number of Subjects") + srs_stage_guru_html = get_plotly_html( + df, "guru", "Guru Stage", "Number of Subjects" + ) srs_stage_master_html = get_plotly_html( df, "master", "Master Stage", "Number of Subjects" ) @@ -444,7 +462,9 @@ if __name__ == "__main__": generate_standalone_html(df, output_file) print(f"✅ Standalone HTML dashboard generated: {output_file}") - print("📊 You can now open this file in any web browser to view your interactive WaniKani stats!") + print( + "📊 You can now open this file in any web browser to view your interactive WaniKani stats!" + ) else: # Start Flask server From c0ec7a82fa4388200f76cbe170b58581735f9c08 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 14:24:28 +0300 Subject: [PATCH 1594/1768] add explainers --- modules/nixos/system/impermanence.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index c65a043..f5b49d0 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -39,9 +39,16 @@ in environment.persistence."/persist" = { hideMounts = true; directories = [ + # systemd and other machine logs "/var/log" + + # information about nixos users and groups "/var/lib/nixos" + + # systemd coredumps to debug crashes "/var/lib/systemd/coredump" + + # NetworkManager connection profiles and WiFi passwords "/etc/NetworkManager/system-connections" ]; # files = [ # the fuck is this file From 08769690e952764d9f6c3d78e0fd84bb2d7c1e20 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 14:24:39 +0300 Subject: [PATCH 1595/1768] also persist this shadow file --- modules/nixos/system/impermanence.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index f5b49d0..337b7c6 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -50,6 +50,9 @@ in # NetworkManager connection profiles and WiFi passwords "/etc/NetworkManager/system-connections" + + # user passwords + "/etc/shadow" ]; # files = [ # the fuck is this file # "/etc/machine-id" From 22f0a83c225418b56cad0d8b7aea62bd7e2811b1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 14:42:38 +0300 Subject: [PATCH 1596/1768] this is a file --- modules/nixos/system/impermanence.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index 337b7c6..1b8d86e 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -51,12 +51,14 @@ in # NetworkManager connection profiles and WiFi passwords "/etc/NetworkManager/system-connections" + ]; + files = [ + # the fuck is this file + # "/etc/machine-id" + # user passwords "/etc/shadow" ]; - # files = [ # the fuck is this file - # "/etc/machine-id" - # ]; users = userPersistence; }; }) From 490b63c7aa372b34997f2d7e614e9c1541ebab7a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 15:18:50 +0300 Subject: [PATCH 1597/1768] immich uses postgresql --- modules/nixos/services/immich.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/nixos/services/immich.nix b/modules/nixos/services/immich.nix index 0605114..845229e 100644 --- a/modules/nixos/services/immich.nix +++ b/modules/nixos/services/immich.nix @@ -35,6 +35,12 @@ group = config.services.immich.group; mode = "0750"; } + { + directory = "/var/lib/postgresql"; + user = "postgres"; + group = "postgres"; + mode = "0750"; + } ]; }; } From 32800638a120735e963792eb119b353acf538110 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 15:19:00 +0300 Subject: [PATCH 1598/1768] persist mail folders --- modules/nixos/services/mailserver.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 110aec9..12f6049 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -31,5 +31,32 @@ certificateScheme = "acme-nginx"; }; }) + + # mailserver and impermanence + (lib.mkIf + ( + config.osbmModules.services.mailserver.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + environment.persistence."/persist" = { + directories = [ + "/var/lib/dovecot" # owned by root + "/var/lib/postfix" # owned by root + { + path = "/var/lib/rspamd"; + user = "rspamd"; + group = "rspamd"; + mode = "0750"; + } + { + path = "/var/spool/redis-spamd"; + user = "redis-spamd"; + group = "redis-spamd"; + mode = "0750"; + } + ]; + }; + }) ]; } From 366b298239d0f823e2f15c286c189fdeecc08710 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 15:19:18 +0300 Subject: [PATCH 1599/1768] fuck the /etc/shadow file --- modules/nixos/system/impermanence.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index 1b8d86e..337eb89 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -55,9 +55,11 @@ in files = [ # the fuck is this file # "/etc/machine-id" - + # user passwords - "/etc/shadow" + # "/etc/shadow" + # fuck me if i move the shadow file to the persist folder, + # i cant use sudo command to rebuild my system ]; users = userPersistence; }; From ac8edd6665e0bb976cfbfe8c46a59a3d54c77cef Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 15:19:33 +0300 Subject: [PATCH 1600/1768] nginx should take care of the acme folder --- modules/nixos/services/nginx.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index 1e5960e..266c566 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -20,5 +20,24 @@ defaults.email = "osbm@osbm.dev"; }; }) + + (lib.mkIf + ( + config.osbmModules.services.nginx.enable + && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + ) + { + environment.persistence."/persist" = { + directories = [ + { + directory = "/var/lib/acme"; + user = "acme"; + group = "acme"; + mode = "0750"; + } + ]; + }; + } + ) ]; } From 688158796034d5a2060df4bd4cc2f29136b7f9c9 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 15:20:32 +0300 Subject: [PATCH 1601/1768] fix --- modules/nixos/services/mailserver.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 12f6049..3322e69 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -44,13 +44,13 @@ "/var/lib/dovecot" # owned by root "/var/lib/postfix" # owned by root { - path = "/var/lib/rspamd"; + directory = "/var/lib/rspamd"; user = "rspamd"; group = "rspamd"; mode = "0750"; } { - path = "/var/spool/redis-spamd"; + directory = "/var/spool/redis-spamd"; user = "redis-spamd"; group = "redis-spamd"; mode = "0750"; From 8648149a62dfec292bf92a04a5a88e6812088c72 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 4 Nov 2025 15:24:22 +0300 Subject: [PATCH 1602/1768] fix the folder name --- modules/nixos/services/mailserver.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 3322e69..5c2da7d 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -50,9 +50,9 @@ mode = "0750"; } { - directory = "/var/spool/redis-spamd"; - user = "redis-spamd"; - group = "redis-spamd"; + directory = "/var/spool/redis-rspamd"; + user = "redis-rspamd"; + group = "redis-rspamd"; mode = "0750"; } ]; From 91d1fae83a694764aa1875ac7893b36c450a40db Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 09:22:17 +0300 Subject: [PATCH 1603/1768] fucking how many folders does this service use --- modules/nixos/services/mailserver.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 5c2da7d..7070aef 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -41,6 +41,7 @@ { environment.persistence."/persist" = { directories = [ + # TODO write justifications for each of these "/var/lib/dovecot" # owned by root "/var/lib/postfix" # owned by root { @@ -55,6 +56,25 @@ group = "redis-rspamd"; mode = "0750"; } + { + directory = "/var/sieve"; + user = "virtualMail"; + group = "virtualMail"; + mode = "0770"; + } + { + directory = "/var/vmail"; + user = "virtualMail"; + group = "virtualMail"; + mode = "0700"; + } + { + directory = "/var/dkim"; + user = "rspamd"; + group = "rspamd"; + mode = "0755"; + } + "/var/spool" ]; }; }) From fbc2d08de8bfb4fc900c3297de0467c47fb4cd3e Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 09:27:56 +0300 Subject: [PATCH 1604/1768] dont need with statement for this one func --- modules/home-manager/programs/firefox.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 6c289d7..d97aef2 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -45,7 +45,6 @@ # DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on" # SearchBar = "unified"; # alternat ExtensionSettings = - with builtins; let extension = shortId: uuid: { name = uuid; @@ -55,7 +54,7 @@ }; }; in - listToAttrs [ + builtins.listToAttrs [ (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp") (extension "ublock-origin" "uBlock0@raymondhill.net") (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") From 14cd08a66afef61afca947ab81c2789d34bb585f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 09:28:12 +0300 Subject: [PATCH 1605/1768] imma do sum about it --- modules/home-manager/programs/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index d97aef2..1c29340 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -50,7 +50,7 @@ name = uuid; value = { install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; + installation_mode = "normal_installed"; # i dont want to get the packages from a non-open source source }; }; in From e381437b735f157b875e1d898d87095731365663 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 09:32:01 +0300 Subject: [PATCH 1606/1768] update flake.lock --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index e794318..cbfc521 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1761899396, - "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -86,11 +86,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762296971, + "narHash": "sha256-Jyv3L5rrUYpecON+9zyFz2VqgTSTsIG35fXuCyuCQv0=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "34fe48801d2a5301b814eaa1efb496499d06cebc", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1761339987, - "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", + "lastModified": 1762304480, + "narHash": "sha256-ikVIPB/ea/BAODk6aksgkup9k2jQdrwr4+ZRXtBgmSs=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", + "rev": "b8c7ac030211f18bd1f41eae0b815571853db7a2", "type": "github" }, "original": { @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1761451000, - "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "lastModified": 1762055842, + "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1762267440, + "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -472,11 +472,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -891,11 +891,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1759489698, - "narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", + "lastModified": 1762302830, + "narHash": "sha256-f3xe6CRPT51vCQFZotJOXi/JpGOiukz0WIa86arJSE8=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", + "rev": "58659fbdfd8aba9bd8f4517d3e5c388c4d8266c4", "type": "gitlab" }, "original": { From 55e476540d4435355d6896fbad0a007f9c0c1859 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 10:44:34 +0300 Subject: [PATCH 1607/1768] fix clock --- hosts/nixos/apollo/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 9b08898..447ccb9 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -70,6 +70,9 @@ Defaults lecture = never ''; + # server is in germany + time.timeZone = "Europe/Berlin"; # or "Europe/Amsterdam" + # Network configuration networking = { useDHCP = false; From ed03174ce88a7070943f29a27b65edeeee8f5842 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 10:44:45 +0300 Subject: [PATCH 1608/1768] default option --- modules/nixos/system/i18n.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix index a3819e8..10a8ca8 100644 --- a/modules/nixos/system/i18n.nix +++ b/modules/nixos/system/i18n.nix @@ -6,7 +6,7 @@ }: { config = lib.mkIf config.osbmModules.i18n.enable { - time.timeZone = "Europe/Istanbul"; + time.timeZone = lib.mkDefault "Europe/Istanbul"; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; From 649b84782ee39010c7ebc8d9debc1cb1b2fde224 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 11:18:03 +0300 Subject: [PATCH 1609/1768] will this fix the error? --- modules/nixos/services/nginx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index 266c566..f93d896 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -32,7 +32,7 @@ { directory = "/var/lib/acme"; user = "acme"; - group = "acme"; + group = "nginx"; mode = "0750"; } ]; From a75dc9f0d28e466fdecbb8bbcc01c904f39daf61 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 13:58:18 +0300 Subject: [PATCH 1610/1768] lets encrypt my ass --- modules/nixos/services/nginx.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index f93d896..1858650 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -8,6 +8,15 @@ (lib.mkIf config.osbmModules.services.nginx.enable { services.nginx = { enable = true; + + # Ensure ACME challenge directory is accessible for all domains + commonHttpConfig = '' + # Allow access to ACME challenge directory + location /.well-known/acme-challenge { + root /var/lib/acme/acme-challenge; + allow all; + } + ''; }; networking.firewall.allowedTCPPorts = [ From 714cfb9c0e041f6ec1323aacc0acb0c2dc0f1c40 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 14:02:00 +0300 Subject: [PATCH 1611/1768] fix --- modules/nixos/services/nginx.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index 1858650..45416d7 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -9,14 +9,12 @@ services.nginx = { enable = true; - # Ensure ACME challenge directory is accessible for all domains - commonHttpConfig = '' - # Allow access to ACME challenge directory - location /.well-known/acme-challenge { - root /var/lib/acme/acme-challenge; - allow all; - } - ''; + # Add virtual host for mail.osbm.dev to handle ACME challenges + virtualHosts."mail.osbm.dev" = lib.mkIf config.osbmModules.services.mailserver.enable { + locations."/.well-known/acme-challenge" = { + root = "/var/lib/acme/acme-challenge"; + }; + }; }; networking.firewall.allowedTCPPorts = [ From 356142e3852e77b3504cd3047fb7cd7c612f51dd Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 14:06:27 +0300 Subject: [PATCH 1612/1768] i am so sick of this shit --- hosts/nixos/apollo/configuration.nix | 2 +- modules/nixos/services/mailserver.nix | 76 +++++++++++++-------------- modules/nixos/services/nginx.nix | 27 ++++------ 3 files changed, 49 insertions(+), 56 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 447ccb9..8a7b4d1 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -11,7 +11,7 @@ services = { glance.enable = true; # anubis.enable = true; - mailserver.enable = true; + # mailserver.enable = true; nginx.enable = true; forgejo.enable = true; vaultwarden.enable = true; diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 7070aef..fa17b06 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -39,44 +39,44 @@ && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot ) { - environment.persistence."/persist" = { - directories = [ - # TODO write justifications for each of these - "/var/lib/dovecot" # owned by root - "/var/lib/postfix" # owned by root - { - directory = "/var/lib/rspamd"; - user = "rspamd"; - group = "rspamd"; - mode = "0750"; - } - { - directory = "/var/spool/redis-rspamd"; - user = "redis-rspamd"; - group = "redis-rspamd"; - mode = "0750"; - } - { - directory = "/var/sieve"; - user = "virtualMail"; - group = "virtualMail"; - mode = "0770"; - } - { - directory = "/var/vmail"; - user = "virtualMail"; - group = "virtualMail"; - mode = "0700"; - } - { - directory = "/var/dkim"; - user = "rspamd"; - group = "rspamd"; - mode = "0755"; - } - "/var/spool" - ]; - }; + # environment.persistence."/persist" = { + # directories = [ + # # TODO write justifications for each of these + # "/var/lib/dovecot" # owned by root + # "/var/lib/postfix" # owned by root + # { + # directory = "/var/lib/rspamd"; + # user = "rspamd"; + # group = "rspamd"; + # mode = "0750"; + # } + # { + # directory = "/var/spool/redis-rspamd"; + # user = "redis-rspamd"; + # group = "redis-rspamd"; + # mode = "0750"; + # } + # { + # directory = "/var/sieve"; + # user = "virtualMail"; + # group = "virtualMail"; + # mode = "0770"; + # } + # { + # directory = "/var/vmail"; + # user = "virtualMail"; + # group = "virtualMail"; + # mode = "0700"; + # } + # { + # directory = "/var/dkim"; + # user = "rspamd"; + # group = "rspamd"; + # mode = "0755"; + # } + # "/var/spool" + # ]; + # }; }) ]; } diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index 45416d7..ec48e47 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -8,13 +8,6 @@ (lib.mkIf config.osbmModules.services.nginx.enable { services.nginx = { enable = true; - - # Add virtual host for mail.osbm.dev to handle ACME challenges - virtualHosts."mail.osbm.dev" = lib.mkIf config.osbmModules.services.mailserver.enable { - locations."/.well-known/acme-challenge" = { - root = "/var/lib/acme/acme-challenge"; - }; - }; }; networking.firewall.allowedTCPPorts = [ @@ -34,16 +27,16 @@ && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot ) { - environment.persistence."/persist" = { - directories = [ - { - directory = "/var/lib/acme"; - user = "acme"; - group = "nginx"; - mode = "0750"; - } - ]; - }; + # environment.persistence."/persist" = { + # directories = [ + # { + # directory = "/var/lib/acme"; + # user = "acme"; + # group = "nginx"; + # mode = "0750"; + # } + # ]; + # }; } ) ]; From 7137c32889e30dbf3f9621440f7dbf032dfefd83 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 14:10:57 +0300 Subject: [PATCH 1613/1768] stop nginx for a sec --- hosts/nixos/apollo/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 8a7b4d1..3dd670b 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -12,7 +12,7 @@ glance.enable = true; # anubis.enable = true; # mailserver.enable = true; - nginx.enable = true; + # nginx.enable = true; forgejo.enable = true; vaultwarden.enable = true; immich.enable = true; From e9b8c048935d12eee7852831eff3ced2ee1c2ec7 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 14:26:55 +0300 Subject: [PATCH 1614/1768] use the configuration options --- modules/nixos/services/mailserver.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index fa17b06..d456785 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -57,19 +57,19 @@ # mode = "0750"; # } # { - # directory = "/var/sieve"; + # directory = config.mailserver.sieveDirectory; # user = "virtualMail"; # group = "virtualMail"; # mode = "0770"; # } # { - # directory = "/var/vmail"; - # user = "virtualMail"; - # group = "virtualMail"; + # directory = config.mailserver.mailDirectory; + # user = config.mailserver.vmailUserName; + # group = config.mailserver.vmailGroupName; # mode = "0700"; # } # { - # directory = "/var/dkim"; + # directory = config.mailserver.dkimKeyDirectory; # user = "rspamd"; # group = "rspamd"; # mode = "0755"; From df13519296cec66fabc07266897ab9cc11f12050 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 14:28:03 +0300 Subject: [PATCH 1615/1768] reenable the services --- hosts/nixos/apollo/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 3dd670b..447ccb9 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -11,8 +11,8 @@ services = { glance.enable = true; # anubis.enable = true; - # mailserver.enable = true; - # nginx.enable = true; + mailserver.enable = true; + nginx.enable = true; forgejo.enable = true; vaultwarden.enable = true; immich.enable = true; From 892b368c3a2b6e77996ef65a631063a349d14b46 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 14:38:03 +0300 Subject: [PATCH 1616/1768] show me group --- modules/home-manager/programs/fish.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/programs/fish.nix b/modules/home-manager/programs/fish.nix index ec567e8..609fa0a 100644 --- a/modules/home-manager/programs/fish.nix +++ b/modules/home-manager/programs/fish.nix @@ -6,8 +6,8 @@ ''; shellAliases = { c = "code ."; - l = "eza --all --long --git --icons --sort size --header --group-directories-first"; - ll = "eza --all --long --git --icons --sort name --header --group-directories-first"; + l = "eza --all --long --git --icons --group --sort size --header --group-directories-first"; + ll = "eza --all --long --git --icons --group --sort name --header --group-directories-first"; free = "free -h"; df = "df -h"; du = "du -h"; From 93c243b0d35804e0d49b1dfb786b2cb294827e42 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 14:51:36 +0300 Subject: [PATCH 1617/1768] add global shell aliases --- modules/home-manager/default.nix | 11 +++++++++++ modules/home-manager/programs/fish.nix | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 406de61..aea89a7 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -13,6 +13,17 @@ EDITOR = lib.mkDefault "nvim"; }; + home.shellAliases = { + c = "code ."; + l = "eza --all --long --git --icons --group --sort size --header --group-directories-first"; + ll = "eza --all --long --git --icons --group --sort name --header --group-directories-first"; + free = "free -h"; + df = "df -h"; + du = "du -h"; + lg = "lazygit"; + onefetch = "onefetch -T prose -T programming -T data"; + }; + # Don't set stateVersion here - let it be set by the system configuration # home.stateVersion should be set in the system's home-manager configuration diff --git a/modules/home-manager/programs/fish.nix b/modules/home-manager/programs/fish.nix index 609fa0a..f6311f5 100644 --- a/modules/home-manager/programs/fish.nix +++ b/modules/home-manager/programs/fish.nix @@ -4,16 +4,6 @@ interactiveShellInit = '' set -g fish_greeting ''; - shellAliases = { - c = "code ."; - l = "eza --all --long --git --icons --group --sort size --header --group-directories-first"; - ll = "eza --all --long --git --icons --group --sort name --header --group-directories-first"; - free = "free -h"; - df = "df -h"; - du = "du -h"; - lg = "lazygit"; - onefetch = "onefetch -T prose -T programming -T data"; - }; functions = { gitu = '' git add --all From eeb92b85bdaabe3d3a9501c4534d6853629c4d5c Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 17:01:01 +0300 Subject: [PATCH 1618/1768] add comment --- modules/nixos/services/mailserver.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index d456785..63f7784 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -42,6 +42,8 @@ # environment.persistence."/persist" = { # directories = [ # # TODO write justifications for each of these + # Dovecot is an open source IMAP and POP3 server + # which means it handles email retrieval for users. # "/var/lib/dovecot" # owned by root # "/var/lib/postfix" # owned by root # { From bbae79fd0d5af42545f931059dfb081b0ca828f8 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 19:45:44 +0300 Subject: [PATCH 1619/1768] dovecot enable --- modules/nixos/services/mailserver.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 63f7784..08cd795 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -39,12 +39,12 @@ && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot ) { - # environment.persistence."/persist" = { - # directories = [ - # # TODO write justifications for each of these + environment.persistence."/persist" = { + directories = [ + # TODO write justifications for each of these # Dovecot is an open source IMAP and POP3 server # which means it handles email retrieval for users. - # "/var/lib/dovecot" # owned by root + "/var/lib/dovecot" # owned by root # "/var/lib/postfix" # owned by root # { # directory = "/var/lib/rspamd"; @@ -77,8 +77,8 @@ # mode = "0755"; # } # "/var/spool" - # ]; - # }; + ]; + }; }) ]; } From a80eeb2a16edbba6bb81744597eff61da2992a4a Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 5 Nov 2025 20:18:51 +0300 Subject: [PATCH 1620/1768] folders --- modules/nixos/services/mailserver.nix | 71 ++++++++++++++------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 08cd795..6114e01 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -41,42 +41,47 @@ { environment.persistence."/persist" = { directories = [ - # TODO write justifications for each of these # Dovecot is an open source IMAP and POP3 server # which means it handles email retrieval for users. "/var/lib/dovecot" # owned by root - # "/var/lib/postfix" # owned by root - # { - # directory = "/var/lib/rspamd"; - # user = "rspamd"; - # group = "rspamd"; - # mode = "0750"; - # } - # { - # directory = "/var/spool/redis-rspamd"; - # user = "redis-rspamd"; - # group = "redis-rspamd"; - # mode = "0750"; - # } - # { - # directory = config.mailserver.sieveDirectory; - # user = "virtualMail"; - # group = "virtualMail"; - # mode = "0770"; - # } - # { - # directory = config.mailserver.mailDirectory; - # user = config.mailserver.vmailUserName; - # group = config.mailserver.vmailGroupName; - # mode = "0700"; - # } - # { - # directory = config.mailserver.dkimKeyDirectory; - # user = "rspamd"; - # group = "rspamd"; - # mode = "0755"; - # } - # "/var/spool" + # Postfix is a open-source mail transfer agent (MTA) + "/var/lib/postfix" # owned by root + # Rspamd is a open-source spam filtering system. + { + directory = "/var/lib/rspamd"; + user = "rspamd"; + group = "rspamd"; + mode = "0700"; + } + # redis-rspamd is just a redis instance used by rspamd for caching + # TODO: what is the /var/spool folder? + { + directory = "/var/spool/redis-rspamd"; + user = "redis-rspamd"; + group = "redis-rspamd"; + mode = "0750"; + } + # Sieve is a scripting language for filtering email messages. + { + directory = config.mailserver.sieveDirectory; # /var/sieve by default + user = "virtualMail"; + group = "virtualMail"; + mode = "0770"; + } + # Mail folder + { + directory = config.mailserver.mailDirectory; # /var/vmail by default + user = config.mailserver.vmailUserName; + group = config.mailserver.vmailGroupName; + mode = "0700"; + } + # DKIM is used to sign outgoing emails to verify they are from the claimed domain. + { + directory = config.mailserver.dkimKeyDirectory; # /var/dkim by default + user = "rspamd"; + group = "rspamd"; + mode = "0755"; + } ]; }; }) From aa6bbc2b481a023d8cfe0f0b220a6555fd72f899 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 08:48:01 +0300 Subject: [PATCH 1621/1768] lean --- modules/nixos/system/nix-settings.nix | 105 +++++++++++++------------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 9eb9f5c..c0a0b0c 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -7,66 +7,65 @@ { config = lib.mkIf config.osbmModules.nixSettings.enable { # Allow unfree packages - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "vscode" - "discord" - "obsidian" - "steam" - "steam-unwrapped" - "open-webui" - "vscode-extension-github-copilot" - "spotify" - "cursor" - # NVIDIA related - "libcurand" - "nvidia-x11" - "cuda_cudart" - "cuda_nvcc" - "cuda_cccl" - "libcublas" - "libcusparse" - "libnvjitlink" - "libcufft" - "cudnn" - "cuda_nvrtc" - "libnpp" - "nvidia-settings" - # blender with cuda is not foss?!? - "blender" - - ]; - - nixpkgs.config.allowAliases = false; + nixpkgs = { + config = { + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "vscode" + "discord" + "obsidian" + "steam" + "steam-unwrapped" + "open-webui" + "vscode-extension-github-copilot" + "spotify" + "cursor" + # NVIDIA related + "libcurand" + "nvidia-x11" + "cuda_cudart" + "cuda_nvcc" + "cuda_cccl" + "libcublas" + "libcusparse" + "libnvjitlink" + "libcufft" + "cudnn" + "cuda_nvrtc" + "libnpp" + "nvidia-settings" + # blender with cuda is not foss?!? + "blender" + ]; + allowAliases = false + }; # Enable Nix flakes - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; + nix = { + settings = { + experimental-features = [ + "nix-command" + "flakes" + ]; + trusted-users = [ + "root" + config.osbmModules.defaultUser + ]; + }; - nix.channel.enable = false; + optimise.automatic = true; - # Nix registry configuration - nix.registry = lib.mkIf (inputs ? self && inputs ? nixpkgs) { - self.flake = inputs.self; - nixpkgs.flake = inputs.nixpkgs; - osbm-nvim = lib.mkIf (inputs ? osbm-nvim) { - flake = inputs.osbm-nvim; + channel.enable = false; + + registry = lib.mkIf (inputs ? self && inputs ? nixpkgs) { + self.flake = inputs.self; + nixpkgs.flake = inputs.nixpkgs; + osbm-nvim = lib.mkIf (inputs ? osbm-nvim) { + flake = inputs.osbm-nvim; + }; }; }; - # Trusted users - nix.settings.trusted-users = [ - "root" - config.osbmModules.defaultUser - ]; - - # Optimize store automatically - nix.optimise.automatic = true; - system.configurationRevision = inputs.self.rev or "dirty"; - }; } From c0173e7920f77fba216e6cefe4f5d64bb082ac8d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 08:50:02 +0300 Subject: [PATCH 1622/1768] fix syntax errors --- modules/nixos/system/nix-settings.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index c0a0b0c..91b6204 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -37,8 +37,9 @@ # blender with cuda is not foss?!? "blender" ]; - allowAliases = false + allowAliases = false; }; + }; # Enable Nix flakes nix = { From 9e348f4bbb44cfd7ae4551f36bda28e93cf52c27 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 11:51:03 +0300 Subject: [PATCH 1623/1768] add actual --- modules/nixos/options.nix | 1 + modules/nixos/services/actual.nix | 49 ++++++++++++++++++++++++++++++ modules/nixos/services/default.nix | 1 + 3 files changed, 51 insertions(+) create mode 100644 modules/nixos/services/actual.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 0286dec..e487931 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -139,6 +139,7 @@ }; }; + actual = lib.mkEnableOption "actual"; anubis.enable = lib.mkEnableOption "anubis"; syncthing.enable = lib.mkEnableOption "syncthing"; jellyfin.enable = lib.mkEnableOption "jellyfin"; diff --git a/modules/nixos/services/actual.nix b/modules/nixos/services/actual.nix new file mode 100644 index 0000000..a10c29a --- /dev/null +++ b/modules/nixos/services/actual.nix @@ -0,0 +1,49 @@ +{ config, lib, ... }: + +{ + config = lib.mkMerge [ + (lib.mkIf config.osbmModules.services.actual.enable { + services.actual = { + enable = true; + }; + }) + + # actual and nginx + (lib.mkIf (config.osbmModules.services.nginx.enable && config.osbmModules.services.actual.enable) { + services.nginx.virtualHosts."actual.osbm.dev" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://localhost:${toString config.services.actual.settings.port}"; + proxyWebsockets = true; + }; + }; + }) + + # # impermanence and immich + # (lib.mkIf + # ( + # config.osbmModules.services.immich.enable + # && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot + # ) + # { + # environment.persistence."/persist" = { + # directories = [ + # { + # directory = "/var/lib/immich"; + # user = config.services.immich.user; + # group = config.services.immich.group; + # mode = "0750"; + # } + # { + # directory = "/var/lib/postgresql"; + # user = "postgres"; + # group = "postgres"; + # mode = "0750"; + # } + # ]; + # }; + # } + # ) + ]; +} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 3143a49..3ad6689 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./actual.nix ./anubis.nix ./atticd.nix ./cloudflare-dyndns.nix From 1f54efabf8988921d8939bdac7b4bacfb16098a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 11:56:06 +0300 Subject: [PATCH 1624/1768] enable actual --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 447ccb9..21a2ca3 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -16,6 +16,7 @@ forgejo.enable = true; vaultwarden.enable = true; immich.enable = true; + actual.enable = true; # seafile.enable = true; }; From 53ac5bba69b3ea4892d4255040d8db88a9b3b947 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 12:00:52 +0300 Subject: [PATCH 1625/1768] fix --- modules/nixos/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index e487931..ff33971 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -139,7 +139,7 @@ }; }; - actual = lib.mkEnableOption "actual"; + actual.enable = lib.mkEnableOption "actual"; anubis.enable = lib.mkEnableOption "anubis"; syncthing.enable = lib.mkEnableOption "syncthing"; jellyfin.enable = lib.mkEnableOption "jellyfin"; From a2ba53b574d94907384a6d528d58937697492777 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 13:07:49 +0300 Subject: [PATCH 1626/1768] change port --- modules/nixos/services/actual.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nixos/services/actual.nix b/modules/nixos/services/actual.nix index a10c29a..956e6f9 100644 --- a/modules/nixos/services/actual.nix +++ b/modules/nixos/services/actual.nix @@ -5,6 +5,11 @@ (lib.mkIf config.osbmModules.services.actual.enable { services.actual = { enable = true; + settings = { + port = 51514; + + # dataDir = "/var/lib/actual" + }; }; }) From 68572a13628da1ec7440904d220f18b2c7850226 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 15:06:05 +0300 Subject: [PATCH 1627/1768] formatting --- hosts/nixos/apollo/configuration.nix | 2 +- modules/home-manager/programs/firefox.nix | 2 +- modules/nixos/services/actual.nix | 2 +- modules/nixos/services/mailserver.nix | 3 ++- modules/nixos/system/impermanence.nix | 2 +- modules/nixos/system/nix-settings.nix | 5 +++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 21a2ca3..c0edca2 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -72,7 +72,7 @@ ''; # server is in germany - time.timeZone = "Europe/Berlin"; # or "Europe/Amsterdam" + time.timeZone = "Europe/Berlin"; # or "Europe/Amsterdam" # Network configuration networking = { diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 1c29340..76f315c 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -50,7 +50,7 @@ name = uuid; value = { install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; - installation_mode = "normal_installed"; # i dont want to get the packages from a non-open source source + installation_mode = "normal_installed"; # i dont want to get the packages from a non-open source source }; }; in diff --git a/modules/nixos/services/actual.nix b/modules/nixos/services/actual.nix index 956e6f9..628c2c8 100644 --- a/modules/nixos/services/actual.nix +++ b/modules/nixos/services/actual.nix @@ -7,7 +7,7 @@ enable = true; settings = { port = 51514; - + # dataDir = "/var/lib/actual" }; }; diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 6114e01..c4a2457 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -84,6 +84,7 @@ } ]; }; - }) + } + ) ]; } diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index 337eb89..9342a42 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -45,7 +45,7 @@ in # information about nixos users and groups "/var/lib/nixos" - # systemd coredumps to debug crashes + # systemd coredumps to debug crashes "/var/lib/systemd/coredump" # NetworkManager connection profiles and WiFi passwords diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 91b6204..f210346 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -9,7 +9,8 @@ # Allow unfree packages nixpkgs = { config = { - allowUnfreePredicate = pkg: + allowUnfreePredicate = + pkg: builtins.elem (lib.getName pkg) [ "vscode" "discord" @@ -36,7 +37,7 @@ "nvidia-settings" # blender with cuda is not foss?!? "blender" - ]; + ]; allowAliases = false; }; }; From a93f497b32cd46aa2d55ba4aa6fed44ffd27cdfc Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 15:06:10 +0300 Subject: [PATCH 1628/1768] init --- hosts/nixOnDroidHosts/luoji/configuration.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hosts/nixOnDroidHosts/luoji/configuration.nix diff --git a/hosts/nixOnDroidHosts/luoji/configuration.nix b/hosts/nixOnDroidHosts/luoji/configuration.nix new file mode 100644 index 0000000..e69de29 From 62c56fb24297a7184d58f37b35e15b3d318398cf Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 15:06:21 +0300 Subject: [PATCH 1629/1768] this should be fixed --- hosts/nixOnDroidHosts/atreus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix index 5b2ef4e..25a9333 100644 --- a/hosts/nixOnDroidHosts/atreus/configuration.nix +++ b/hosts/nixOnDroidHosts/atreus/configuration.nix @@ -4,7 +4,7 @@ ... }: { - user.userName = lib.mkForce "osbm"; # fuck i hate unmaintained projects + user.userName = "osbm"; environment.packages = with pkgs; [ vim # or some other editor, e.g. nano or neovim From 610b580437f785dafd29261494c158f83f75f8d4 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 15:38:14 +0300 Subject: [PATCH 1630/1768] no need for extra file --- hosts/nixos/apollo/configuration.nix | 2 +- hosts/nixos/apollo/hardware-configuration.nix | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 hosts/nixos/apollo/hardware-configuration.nix diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index c0edca2..03958ea 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -1,6 +1,5 @@ { imports = [ - ./hardware-configuration.nix ../../../modules/nixos ]; @@ -105,4 +104,5 @@ # Override initrd kernel params for static IP boot.kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::eth0:none" ]; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hosts/nixos/apollo/hardware-configuration.nix b/hosts/nixos/apollo/hardware-configuration.nix deleted file mode 100644 index 2ff3542..0000000 --- a/hosts/nixos/apollo/hardware-configuration.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, ... }: -{ - # Disko configuration is now managed by osbmModules.hardware.disko - # All disk configuration moved to configuration.nix - - # Required for ZFS - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} From 7a2ff22c363a2ef17d8932abc10c2d096ab439bb Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 15:42:46 +0300 Subject: [PATCH 1631/1768] enable --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 03958ea..80abd9a 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -16,6 +16,7 @@ vaultwarden.enable = true; immich.enable = true; actual.enable = true; + firefox-syncserver.enable = true; # seafile.enable = true; }; From 3bc692f5ccc25dc39703a85d7d345df959a01328 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 15:44:35 +0300 Subject: [PATCH 1632/1768] fix --- hosts/nixos/apollo/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 80abd9a..9f34390 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -1,3 +1,4 @@ +{ lib, ... }: { imports = [ ../../../modules/nixos From f29fab63572fdbcc45e56f2b80b7128d1958347e Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 15:59:33 +0300 Subject: [PATCH 1633/1768] fix firefox sync --- modules/nixos/services/firefox-syncserver.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/firefox-syncserver.nix b/modules/nixos/services/firefox-syncserver.nix index 32f611d..ea2591a 100644 --- a/modules/nixos/services/firefox-syncserver.nix +++ b/modules/nixos/services/firefox-syncserver.nix @@ -3,9 +3,17 @@ { config = lib.mkMerge [ (lib.mkIf config.osbmModules.services.firefox-syncserver.enable { + services.mysql.package = pkgs.mariadb; # Use MariaDB as the database backend services.firefox-syncserver = { enable = true; - settings.port = 5000; + secrets = "/persist/firefox-syncserver-secrets.env"; # TODO: Make this into agenix secret + logLevel = "trace"; + singleNode = { + enable = true; + url = "https://firefox.osbm.dev"; + capacity = 1; + }; + settings.host = "0.0.0.0"; }; }) From 08b1b46674f8c9be063054b587e1cffd504f62cf Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 16:00:03 +0300 Subject: [PATCH 1634/1768] fix --- modules/nixos/services/firefox-syncserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/firefox-syncserver.nix b/modules/nixos/services/firefox-syncserver.nix index ea2591a..3b5fa2f 100644 --- a/modules/nixos/services/firefox-syncserver.nix +++ b/modules/nixos/services/firefox-syncserver.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: { config = lib.mkMerge [ From c53ad0decdbf6ae668cb1e37deece619fd626b24 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 16:28:52 +0300 Subject: [PATCH 1635/1768] fix firefox sync --- modules/nixos/services/firefox-syncserver.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/firefox-syncserver.nix b/modules/nixos/services/firefox-syncserver.nix index 3b5fa2f..d283d6c 100644 --- a/modules/nixos/services/firefox-syncserver.nix +++ b/modules/nixos/services/firefox-syncserver.nix @@ -13,7 +13,13 @@ url = "https://firefox.osbm.dev"; capacity = 1; }; - settings.host = "0.0.0.0"; + settings = { + host = "0.0.0.0"; + # Override database URLs to use Unix socket for authentication + # This allows the firefox-syncserver user to authenticate via unix_socket + syncstorage.database_url = "mysql://firefox-syncserver@localhost/firefox_syncserver?socket=%2Frun%2Fmysqld%2Fmysqld.sock"; + tokenserver.database_url = "mysql://firefox-syncserver@localhost/firefox_syncserver?socket=%2Frun%2Fmysqld%2Fmysqld.sock"; + }; }; }) From a9c081c0c79fd3ed6359f546c7d6eada1a44a3f3 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 6 Nov 2025 16:50:39 +0300 Subject: [PATCH 1636/1768] add to firefox --- modules/home-manager/programs/firefox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 76f315c..4e1a9f1 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -86,6 +86,7 @@ ''; settings = { # "Open previous windows and tabs" + "identity.sync.tokenserver.uri" = "https://firefox.osbm.dev/1.0/sync/1.5"; "browser.startup.page" = 3; "browser.contentblocking.category" = true; "extensions.pocket.enabled" = false; From 039de96dfa79a5b23ca0568b10bb93928c67bffd Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:17:49 +0300 Subject: [PATCH 1637/1768] define type at prometheus --- hosts/darwinHosts/prometheus/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 1b952d1..2b30813 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -13,6 +13,8 @@ ]; osbmModules = { + desktopEnvironment = "none"; # fuckass darwin defaults + machineType = "laptop"; programs.neovim.enable = true; }; From f2d662d035b642676d11aec794c8440697d87e1c Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:18:59 +0300 Subject: [PATCH 1638/1768] formatting --- modules/nixos/services/firefox-syncserver.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/firefox-syncserver.nix b/modules/nixos/services/firefox-syncserver.nix index d283d6c..aafd39d 100644 --- a/modules/nixos/services/firefox-syncserver.nix +++ b/modules/nixos/services/firefox-syncserver.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { config = lib.mkMerge [ From 9de4a36981363a02a024b1bd6606887918350934 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:19:45 +0300 Subject: [PATCH 1639/1768] contents --- hosts/nixOnDroidHosts/luoji/configuration.nix | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/hosts/nixOnDroidHosts/luoji/configuration.nix b/hosts/nixOnDroidHosts/luoji/configuration.nix index e69de29..25a9333 100644 --- a/hosts/nixOnDroidHosts/luoji/configuration.nix +++ b/hosts/nixOnDroidHosts/luoji/configuration.nix @@ -0,0 +1,105 @@ +{ + lib, + pkgs, + ... +}: +{ + user.userName = "osbm"; + environment.packages = with pkgs; [ + vim # or some other editor, e.g. nano or neovim + + # Some common stuff that people expect to have + procps + #killall + #diffutils + inetutils + findutils + utillinux + tzdata + hostname + man + gnugrep + #gnupg + #gnused + #gnutar + #bzip2 + #gzip + #xz + zip + unzip + fish + tmux + nano + ripgrep + git + openssh + just + nh + (pkgs.writeShellScriptBin "lg-rerouting" '' + ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting + '') + (pkgs.writeShellScriptBin "sshd-start" '' + echo "Starting sshd on port 8022" + ${pkgs.openssh}/bin/sshd + '') + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') + # obsidian tools + # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin + # (pkgs.writeShellScriptBin "rerouting-sync-start" '' + # cd /storage/emulated/0/Documents/rerouting + # git pull + # git add --all + # git commit -m "Android sync" + # git push + # '') + (pkgs.writeShellScriptBin "rerouting-status" '' + cd /storage/emulated/0/Documents/rerouting + git fetch + git status + '') + (pkgs.writeShellScriptBin "rerouting-pull" '' + cd /storage/emulated/0/Documents/rerouting + git pull + '') + (pkgs.writeShellScriptBin "rerouting-push" '' + cd /storage/emulated/0/Documents/rerouting + git add --all + git commit -m "Android sync" + git push + '') + ani-cli + ]; + + # Backup etc files instead of failing to activate generation if a file already exists in /etc + environment.etcBackupExtension = ".bak"; + + # Read the changelog before changing this value + system.stateVersion = "24.05"; + # Set up nix for flakes + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + + build.activation.sshd = '' + if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then + $VERBOSE_ECHO "Generating host keys..." + $DRY_RUN_CMD ${pkgs.openssh}/bin/ssh-keygen -t ed25519 -a 32 -f "/etc/ssh/ssh_host_ed25519_key" -N "" + fi + ''; + + environment.etc."ssh/sshd_config".text = '' + AcceptEnv LANG LC_* + KbdInteractiveAuthentication no + PasswordAuthentication no + PermitRootLogin no + Port 8022 + PrintMotd no + AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u + ''; + environment.etc."ssh/authorized_keys.d/osbm".text = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k + ''; +} From e5849f79d6e42546960a403abdfca9bbab607652 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:20:53 +0300 Subject: [PATCH 1640/1768] deadnix suggestions --- hosts/nixOnDroidHosts/atreus/configuration.nix | 1 - hosts/nixOnDroidHosts/luoji/configuration.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/hosts/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix index 25a9333..e6aaeef 100644 --- a/hosts/nixOnDroidHosts/atreus/configuration.nix +++ b/hosts/nixOnDroidHosts/atreus/configuration.nix @@ -1,5 +1,4 @@ { - lib, pkgs, ... }: diff --git a/hosts/nixOnDroidHosts/luoji/configuration.nix b/hosts/nixOnDroidHosts/luoji/configuration.nix index 25a9333..e6aaeef 100644 --- a/hosts/nixOnDroidHosts/luoji/configuration.nix +++ b/hosts/nixOnDroidHosts/luoji/configuration.nix @@ -1,5 +1,4 @@ { - lib, pkgs, ... }: From 570a3f106ac8448f0bc6d03cc8bcf3b47a0225f6 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:23:40 +0300 Subject: [PATCH 1641/1768] cleaner --- modules/nixos/system/home-manager.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index b3944cd..3f881cd 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -12,11 +12,11 @@ config = lib.mkMerge [ # Enable FUSE user_allow_other when impermanence is used - (lib.mkIf (config.osbmModules.hardware.disko.zfs.root.impermanenceRoot) { + (lib.mkIf config.osbmModules.hardware.disko.zfs.root.impermanenceRoot { programs.fuse.userAllowOther = true; }) - (lib.mkIf (config.osbmModules.homeManager.enable) { + (lib.mkIf config.osbmModules.homeManager.enable { home-manager = { useGlobalPkgs = true; useUserPackages = true; From d43a4d046134316df0711f3653d632922da6e703 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:23:45 +0300 Subject: [PATCH 1642/1768] no need --- modules/home-manager/programs/ssh.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index 3960332..f24ad16 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -1,4 +1,3 @@ -{ ... }: let # define a block that just takes a hostname and returns attrset to not repeat the same fields sshBlock = hostname: { From 4d1c3b848de67d015ec956b0735c59b82d94aa6b Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:41:25 +0300 Subject: [PATCH 1643/1768] formatting --- .../nixOnDroidHosts/atreus/configuration.nix | 157 +++++++++-------- hosts/nixOnDroidHosts/luoji/configuration.nix | 159 +++++++++--------- 2 files changed, 151 insertions(+), 165 deletions(-) diff --git a/hosts/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix index e6aaeef..28c4c0f 100644 --- a/hosts/nixOnDroidHosts/atreus/configuration.nix +++ b/hosts/nixOnDroidHosts/atreus/configuration.nix @@ -4,76 +4,6 @@ }: { user.userName = "osbm"; - environment.packages = with pkgs; [ - vim # or some other editor, e.g. nano or neovim - - # Some common stuff that people expect to have - procps - #killall - #diffutils - inetutils - findutils - utillinux - tzdata - hostname - man - gnugrep - #gnupg - #gnused - #gnutar - #bzip2 - #gzip - #xz - zip - unzip - fish - tmux - nano - ripgrep - git - openssh - just - nh - (pkgs.writeShellScriptBin "lg-rerouting" '' - ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting - '') - (pkgs.writeShellScriptBin "sshd-start" '' - echo "Starting sshd on port 8022" - ${pkgs.openssh}/bin/sshd - '') - (pkgs.writeShellScriptBin "wake-ymir" '' - echo waking up ymir - ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 - '') - # obsidian tools - # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin - # (pkgs.writeShellScriptBin "rerouting-sync-start" '' - # cd /storage/emulated/0/Documents/rerouting - # git pull - # git add --all - # git commit -m "Android sync" - # git push - # '') - (pkgs.writeShellScriptBin "rerouting-status" '' - cd /storage/emulated/0/Documents/rerouting - git fetch - git status - '') - (pkgs.writeShellScriptBin "rerouting-pull" '' - cd /storage/emulated/0/Documents/rerouting - git pull - '') - (pkgs.writeShellScriptBin "rerouting-push" '' - cd /storage/emulated/0/Documents/rerouting - git add --all - git commit -m "Android sync" - git push - '') - ani-cli - ]; - - # Backup etc files instead of failing to activate generation if a file already exists in /etc - environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value system.stateVersion = "24.05"; @@ -89,16 +19,79 @@ fi ''; - environment.etc."ssh/sshd_config".text = '' - AcceptEnv LANG LC_* - KbdInteractiveAuthentication no - PasswordAuthentication no - PermitRootLogin no - Port 8022 - PrintMotd no - AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u - ''; - environment.etc."ssh/authorized_keys.d/osbm".text = '' - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k - ''; + environment = { + packages = with pkgs; [ + vim # or some other editor, e.g. nano or neovim + procps + inetutils + findutils + utillinux + tzdata + hostname + man + gnugrep + zip + unzip + fish + tmux + nano + ripgrep + git + openssh + just + nh + (pkgs.writeShellScriptBin "lg-rerouting" '' + ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting + '') + (pkgs.writeShellScriptBin "sshd-start" '' + echo "Starting sshd on port 8022" + ${pkgs.openssh}/bin/sshd + '') + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') + # obsidian tools + # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin + # (pkgs.writeShellScriptBin "rerouting-sync-start" '' + # cd /storage/emulated/0/Documents/rerouting + # git pull + # git add --all + # git commit -m "Android sync" + # git push + # '') + (pkgs.writeShellScriptBin "rerouting-status" '' + cd /storage/emulated/0/Documents/rerouting + git fetch + git status + '') + (pkgs.writeShellScriptBin "rerouting-pull" '' + cd /storage/emulated/0/Documents/rerouting + git pull + '') + (pkgs.writeShellScriptBin "rerouting-push" '' + cd /storage/emulated/0/Documents/rerouting + git add --all + git commit -m "Android sync" + git push + '') + ani-cli + ]; + + # Backup etc files instead of failing to activate generation if a file already exists in /etc + etcBackupExtension = ".bak"; + + etc."ssh/sshd_config".text = '' + AcceptEnv LANG LC_* + KbdInteractiveAuthentication no + PasswordAuthentication no + PermitRootLogin no + Port 8022 + PrintMotd no + AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u + ''; + etc."ssh/authorized_keys.d/osbm".text = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k + ''; + }; } diff --git a/hosts/nixOnDroidHosts/luoji/configuration.nix b/hosts/nixOnDroidHosts/luoji/configuration.nix index e6aaeef..3e1025d 100644 --- a/hosts/nixOnDroidHosts/luoji/configuration.nix +++ b/hosts/nixOnDroidHosts/luoji/configuration.nix @@ -4,79 +4,9 @@ }: { user.userName = "osbm"; - environment.packages = with pkgs; [ - vim # or some other editor, e.g. nano or neovim - - # Some common stuff that people expect to have - procps - #killall - #diffutils - inetutils - findutils - utillinux - tzdata - hostname - man - gnugrep - #gnupg - #gnused - #gnutar - #bzip2 - #gzip - #xz - zip - unzip - fish - tmux - nano - ripgrep - git - openssh - just - nh - (pkgs.writeShellScriptBin "lg-rerouting" '' - ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting - '') - (pkgs.writeShellScriptBin "sshd-start" '' - echo "Starting sshd on port 8022" - ${pkgs.openssh}/bin/sshd - '') - (pkgs.writeShellScriptBin "wake-ymir" '' - echo waking up ymir - ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 - '') - # obsidian tools - # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin - # (pkgs.writeShellScriptBin "rerouting-sync-start" '' - # cd /storage/emulated/0/Documents/rerouting - # git pull - # git add --all - # git commit -m "Android sync" - # git push - # '') - (pkgs.writeShellScriptBin "rerouting-status" '' - cd /storage/emulated/0/Documents/rerouting - git fetch - git status - '') - (pkgs.writeShellScriptBin "rerouting-pull" '' - cd /storage/emulated/0/Documents/rerouting - git pull - '') - (pkgs.writeShellScriptBin "rerouting-push" '' - cd /storage/emulated/0/Documents/rerouting - git add --all - git commit -m "Android sync" - git push - '') - ani-cli - ]; - - # Backup etc files instead of failing to activate generation if a file already exists in /etc - environment.etcBackupExtension = ".bak"; # Read the changelog before changing this value - system.stateVersion = "24.05"; + system.stateVersion = "25.11"; # Set up nix for flakes nix.extraOptions = '' experimental-features = nix-command flakes @@ -89,16 +19,79 @@ fi ''; - environment.etc."ssh/sshd_config".text = '' - AcceptEnv LANG LC_* - KbdInteractiveAuthentication no - PasswordAuthentication no - PermitRootLogin no - Port 8022 - PrintMotd no - AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u - ''; - environment.etc."ssh/authorized_keys.d/osbm".text = '' - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k - ''; + environment = { + packages = with pkgs; [ + vim # or some other editor, e.g. nano or neovim + procps + inetutils + findutils + utillinux + tzdata + hostname + man + gnugrep + zip + unzip + fish + tmux + nano + ripgrep + git + openssh + just + nh + (pkgs.writeShellScriptBin "lg-rerouting" '' + ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting + '') + (pkgs.writeShellScriptBin "sshd-start" '' + echo "Starting sshd on port 8022" + ${pkgs.openssh}/bin/sshd + '') + (pkgs.writeShellScriptBin "wake-ymir" '' + echo waking up ymir + ${pkgs.wakeonlan}/bin/wakeonlan 04:7c:16:e6:d9:13 + '') + # obsidian tools + # i need a background process that can just keep pulling and pushing changes just like the obsidian git plugin + # (pkgs.writeShellScriptBin "rerouting-sync-start" '' + # cd /storage/emulated/0/Documents/rerouting + # git pull + # git add --all + # git commit -m "Android sync" + # git push + # '') + (pkgs.writeShellScriptBin "rerouting-status" '' + cd /storage/emulated/0/Documents/rerouting + git fetch + git status + '') + (pkgs.writeShellScriptBin "rerouting-pull" '' + cd /storage/emulated/0/Documents/rerouting + git pull + '') + (pkgs.writeShellScriptBin "rerouting-push" '' + cd /storage/emulated/0/Documents/rerouting + git add --all + git commit -m "Android sync" + git push + '') + ani-cli + ]; + + # Backup etc files instead of failing to activate generation if a file already exists in /etc + etcBackupExtension = ".bak"; + + etc."ssh/sshd_config".text = '' + AcceptEnv LANG LC_* + KbdInteractiveAuthentication no + PasswordAuthentication no + PermitRootLogin no + Port 8022 + PrintMotd no + AuthorizedKeysFile /etc/ssh/authorized_keys.d/%u + ''; + etc."ssh/authorized_keys.d/osbm".text = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k + ''; + }; } From 5ea5fbba3d1d496ef60dc8754019fe9a267ddcf2 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:47:23 +0300 Subject: [PATCH 1644/1768] fix --- modules/nixos/services/wanikani-stats/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/wanikani-stats/default.nix b/modules/nixos/services/wanikani-stats/default.nix index 6c9a58a..f0a8510 100644 --- a/modules/nixos/services/wanikani-stats/default.nix +++ b/modules/nixos/services/wanikani-stats/default.nix @@ -31,7 +31,7 @@ let name = "wanikani-stats-flask"; runtimeInputs = [ (python.withPackages ( - ppkgs: with python.pkgs; [ + ppkgs: with ppkgs; [ flask pandas numpy From 7cf40592d7ec2b3523e1d39a26f970c9220e9179 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:47:39 +0300 Subject: [PATCH 1645/1768] lets see if this is causing mass rebuilds --- .../nixos/services/wanikani-stats/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/nixos/services/wanikani-stats/default.nix b/modules/nixos/services/wanikani-stats/default.nix index f0a8510..0731dda 100644 --- a/modules/nixos/services/wanikani-stats/default.nix +++ b/modules/nixos/services/wanikani-stats/default.nix @@ -6,25 +6,25 @@ }: let python = - let - packageOverrides = self: super: { - imageio = super.imageio.overridePythonAttrs (old: { - disabledTests = [ - "test_read_stream" - "test_uri_reading" - "test_trim_filter" - "test_process_termination" - ]; - }); - plotly = super.plotly.overridePythonAttrs (old: { - disabledTestPaths = (old.disabledTestPaths or [ ]) ++ [ - "tests/test_optional/test_kaleido/test_kaleido.py" - ]; - }); - }; - in - pkgs.python313.override { - inherit packageOverrides; + # let + # packageOverrides = self: super: { + # imageio = super.imageio.overridePythonAttrs (old: { + # disabledTests = [ + # "test_read_stream" + # "test_uri_reading" + # "test_trim_filter" + # "test_process_termination" + # ]; + # }); + # plotly = super.plotly.overridePythonAttrs (old: { + # disabledTestPaths = (old.disabledTestPaths or [ ]) ++ [ + # "tests/test_optional/test_kaleido/test_kaleido.py" + # ]; + # }); + # }; + # in + pkgs.python3.override { + # inherit packageOverrides; self = python; }; wanikani-stats-flask = pkgs.writeShellApplication { From 05042e578d27b0b114cda2f4b8a37f1420b2b6c4 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:49:39 +0300 Subject: [PATCH 1646/1768] cleaner --- modules/nixos/hardware/boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/hardware/boot.nix b/modules/nixos/hardware/boot.nix index 1a497bd..0fdbd96 100644 --- a/modules/nixos/hardware/boot.nix +++ b/modules/nixos/hardware/boot.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { - config = lib.mkIf (config.osbmModules.hardware.systemd-boot.enable) { + config = lib.mkIf config.osbmModules.hardware.systemd-boot.enable { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; }; From fccf1a060980634a3116b1d0fc594d671d17aab9 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:49:51 +0300 Subject: [PATCH 1647/1768] inherit is nice --- modules/nixos/services/immich.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/nixos/services/immich.nix b/modules/nixos/services/immich.nix index 845229e..1a67f90 100644 --- a/modules/nixos/services/immich.nix +++ b/modules/nixos/services/immich.nix @@ -31,8 +31,7 @@ directories = [ { directory = "/var/lib/immich"; - user = config.services.immich.user; - group = config.services.immich.group; + inherit (config.services.immich) user group; mode = "0750"; } { From 8d24cb910330f075049d75d8f89fbe055ea55cdf Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:49:59 +0300 Subject: [PATCH 1648/1768] cleaner --- modules/nixos/services/vscode-server.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/nixos/services/vscode-server.nix b/modules/nixos/services/vscode-server.nix index 0c51e62..f7411f9 100644 --- a/modules/nixos/services/vscode-server.nix +++ b/modules/nixos/services/vscode-server.nix @@ -5,8 +5,7 @@ ... }: { - config = ( - lib.mkIf config.osbmModules.services.vscode-server.enable { + config = lib.mkIf config.osbmModules.services.vscode-server.enable { services.code-server = { # only true if the machine is not pochita enable = config.networking.hostName != "pochita"; @@ -53,6 +52,5 @@ }; }; networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; - } - ); + }; } From 9531572ca6009e34f04b65d8c1df04acf7f8edd7 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 08:51:19 +0300 Subject: [PATCH 1649/1768] formatting --- modules/nixos/services/vscode-server.nix | 90 ++++++++++++------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/modules/nixos/services/vscode-server.nix b/modules/nixos/services/vscode-server.nix index f7411f9..7bad2a6 100644 --- a/modules/nixos/services/vscode-server.nix +++ b/modules/nixos/services/vscode-server.nix @@ -6,51 +6,51 @@ }: { config = lib.mkIf config.osbmModules.services.vscode-server.enable { - services.code-server = { - # only true if the machine is not pochita - enable = config.networking.hostName != "pochita"; - port = 4444; - disableTelemetry = true; - disableUpdateCheck = true; - user = "osbm"; - group = "users"; - # auth = "none"; - host = "${config.networking.hostName}.curl-boga.ts.net"; - hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; - package = pkgs.vscode-with-extensions.override { - vscode = pkgs.code-server; - vscodeExtensions = - with pkgs.vscode-extensions; - [ - bbenoist.nix - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons - charliermarsh.ruff - davidanson.vscode-markdownlint - esbenp.prettier-vscode - foxundermoon.shell-format - github.copilot - github.vscode-github-actions - github.vscode-pull-request-github - jnoortheen.nix-ide - kamadorueda.alejandra - ms-azuretools.vscode-docker - ms-python.python - # ms-vscode-remote.remote-ssh - timonwong.shellcheck - tyriar.sort-lines - ] - ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - # Available in nixpkgs, but outdated (0.4.0) at the time of adding - name = "vscode-tailscale"; - publisher = "tailscale"; - sha256 = "sha256-MKiCZ4Vu+0HS2Kl5+60cWnOtb3udyEriwc+qb/7qgUg="; - version = "1.0.0"; - } - ]; - }; + services.code-server = { + # only true if the machine is not pochita + enable = config.networking.hostName != "pochita"; + port = 4444; + disableTelemetry = true; + disableUpdateCheck = true; + user = "osbm"; + group = "users"; + # auth = "none"; + host = "${config.networking.hostName}.curl-boga.ts.net"; + hashedPassword = "$argon2i$v=19$m=4096,t=3,p=1$dGc0TStGMDNzSS9JRkJYUFp3d091Q2p0bXlzPQ$zvdE9BkclkJmyFaenzPy2E99SEqsyDMt4IQNZfcfFFQ"; + package = pkgs.vscode-with-extensions.override { + vscode = pkgs.code-server; + vscodeExtensions = + with pkgs.vscode-extensions; + [ + bbenoist.nix + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + charliermarsh.ruff + davidanson.vscode-markdownlint + esbenp.prettier-vscode + foxundermoon.shell-format + github.copilot + github.vscode-github-actions + github.vscode-pull-request-github + jnoortheen.nix-ide + kamadorueda.alejandra + ms-azuretools.vscode-docker + ms-python.python + # ms-vscode-remote.remote-ssh + timonwong.shellcheck + tyriar.sort-lines + ] + ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ + { + # Available in nixpkgs, but outdated (0.4.0) at the time of adding + name = "vscode-tailscale"; + publisher = "tailscale"; + sha256 = "sha256-MKiCZ4Vu+0HS2Kl5+60cWnOtb3udyEriwc+qb/7qgUg="; + version = "1.0.0"; + } + ]; }; - networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; }; + networking.firewall.allowedTCPPorts = [ config.services.code-server.port ]; + }; } From 505f960a53f8fe91c9cdc8adc060272fb6db7143 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 09:06:37 +0300 Subject: [PATCH 1650/1768] inherit hell yeah --- modules/home-manager/programs/ssh.nix | 4 ++-- modules/nixos/hardware/disko.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index f24ad16..fcfeaa1 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -1,7 +1,7 @@ let # define a block that just takes a hostname and returns attrset to not repeat the same fields sshBlock = hostname: { - hostname = hostname; + inherit hostname; user = "osbm"; identityFile = "~/.ssh/id_ed25519"; extraOptions = { @@ -14,7 +14,7 @@ let }; # sshBlockAtreus is the same as sshBlock but with 8090 as the port sshBlockAtreus = hostname: { - hostname = hostname; + inherit hostname; user = "osbm"; identityFile = "~/.ssh/id_ed25519"; port = 8022; diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix index cba32d1..13aaf3a 100644 --- a/modules/nixos/hardware/disko.nix +++ b/modules/nixos/hardware/disko.nix @@ -35,7 +35,7 @@ in enable = true; port = 2222; # different port to avoid conflicts shell = "/bin/cryptsetup-askpass"; - authorizedKeys = authorizedKeys; + inherit authorizedKeys; hostKeys = [ "/etc/ssh/initrd" ]; }; boot.initrd.secrets = { @@ -208,7 +208,7 @@ in options = { canmount = "off"; mountpoint = "none"; - reservation = cfg.zfs.root.reservation; + inherit (cfg.zfs.root) reservation; }; }; @@ -288,7 +288,7 @@ in options = { canmount = "off"; mountpoint = "none"; - reservation = cfg.zfs.storage.reservation; + inherit (cfg.zfs.storage) reservation; }; }; From e7676fe824326d21efad4aac715cab8a13aff569 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 09:06:41 +0300 Subject: [PATCH 1651/1768] cleaner --- modules/nixos/system/impermanence.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index 9342a42..e8ec8fb 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -35,7 +35,7 @@ in config = lib.mkMerge [ # Enable impermanence root if configured - (lib.mkIf (config.osbmModules.hardware.disko.zfs.root.impermanenceRoot) { + (lib.mkIf config.osbmModules.hardware.disko.zfs.root.impermanenceRoot { environment.persistence."/persist" = { hideMounts = true; directories = [ From f157a26c25aa27cbc8eb34dcd4b8613aaf274cff Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 09:06:52 +0300 Subject: [PATCH 1652/1768] reduction --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 0f55b88..34b0a22 100644 --- a/flake.nix +++ b/flake.nix @@ -74,7 +74,7 @@ "x86_64-darwin" "aarch64-darwin" ]; - forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system); + forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems f; makePkgs = system: import nixpkgs { inherit system; }; makeNixosConfig = configName: @@ -85,7 +85,7 @@ nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos); in { - nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames (name: makeNixosConfig name); + nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames makeNixosConfig; nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { extraSpecialArgs = { inherit inputs outputs; }; pkgs = import nixpkgs { system = "aarch64-linux"; }; From 9f1f3c26147d26a41b1cf9aa3469c93f97e9f5d9 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 09:25:03 +0300 Subject: [PATCH 1653/1768] cleaner --- hosts/nixos/artemis/configuration.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index f4685e8..8261289 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -18,15 +18,18 @@ }; # mobile-nixos needs aliases (uses nettools instead of net-tools) - nixpkgs.config.allowAliases = true; - - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "oneplus-sdm845-firmware-zstd" - "oneplus-sdm845-firmware" - ]; - + nixpkgs = { + config = { + allowAliases = true; + allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "oneplus-sdm845-firmware-zstd" + "oneplus-sdm845-firmware" + ]; + }; + system = "aarch64-linux"; + }; # Minimal essential packages environment.systemPackages = with pkgs; [ git @@ -40,6 +43,4 @@ ]; system.stateVersion = "25.11"; - # set platform to aarch64-linux - nixpkgs.system = "aarch64-linux"; } From 642ca932b791b9a2ee2395c337e663ded61e4b73 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:15:58 +0300 Subject: [PATCH 1654/1768] group pochita --- .../nixos/pochita/hardware-configuration.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/hosts/nixos/pochita/hardware-configuration.nix b/hosts/nixos/pochita/hardware-configuration.nix index c174f0b..530fa03 100644 --- a/hosts/nixos/pochita/hardware-configuration.nix +++ b/hosts/nixos/pochita/hardware-configuration.nix @@ -8,23 +8,29 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; + boot = { + initrd = { + availableKernelModules = [ ]; + kernelModules = [ ]; + }; + kernelModules = [ ]; + extraModulePackages = [ ]; }; - fileSystems."/boot/firmware" = { - device = "/dev/disk/by-uuid/2178-694E"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + fsType = "ext4"; + }; + + "/boot/firmware" = { + device = "/dev/disk/by-uuid/2178-694E"; + fsType = "vfat"; + options = [ + "fmask=0022" + "dmask=0022" + ]; + }; }; swapDevices = [ ]; From 5671c7997d5a7ee0d2c6d530854b761b298b4806 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:16:08 +0300 Subject: [PATCH 1655/1768] group tartarus --- .../nixos/tartarus/hardware-configuration.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/hosts/nixos/tartarus/hardware-configuration.nix b/hosts/nixos/tartarus/hardware-configuration.nix index 45f3b93..56ed1cc 100644 --- a/hosts/nixos/tartarus/hardware-configuration.nix +++ b/hosts/nixos/tartarus/hardware-configuration.nix @@ -9,16 +9,18 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot = { + initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usb_storage" + "sd_mod" + ]; + initrd.kernelModules = [ ]; + kernelModules = [ "kvm-intel" ]; + extraModulePackages = [ ]; + }; fileSystems."/" = { device = "/dev/disk/by-uuid/246d3df7-3578-44b2-8aee-c1ed33581184"; From ed558593c0cc91b74b1678814fe699d1dc839767 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:16:18 +0300 Subject: [PATCH 1656/1768] group wallfacer --- .../wallfacer/hardware-configuration.nix | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/hosts/nixos/wallfacer/hardware-configuration.nix b/hosts/nixos/wallfacer/hardware-configuration.nix index 87b7ccd..08d8270 100644 --- a/hosts/nixos/wallfacer/hardware-configuration.nix +++ b/hosts/nixos/wallfacer/hardware-configuration.nix @@ -9,47 +9,50 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ - "ahci" - "ehci_pci" - "megaraid_sas" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/8270dba5-6d89-438a-90bd-d9f29b20cb5b"; - fsType = "ext4"; + boot = { + initrd.availableKernelModules = [ + "ahci" + "ehci_pci" + "megaraid_sas" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + initrd.kernelModules = [ ]; + kernelModules = [ "kvm-intel" ]; + extraModulePackages = [ ]; }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/A1EB-43F8"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/8270dba5-6d89-438a-90bd-d9f29b20cb5b"; + fsType = "ext4"; + }; + + "/boot" = { + device = "/dev/disk/by-uuid/A1EB-43F8"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + "/data/atreus" = { + device = "/dev/disk/by-uuid/1840c2af-fdb2-48b6-8555-2cecd1afb106"; + fsType = "ext4"; + }; + # 500 gb nvme pcie + "/data/kasio" = { + device = "/dev/disk/by-uuid/af74aa48-8513-4e31-a4b7-9fdd138e0002"; + fsType = "ext4"; + }; }; swapDevices = [ { device = "/dev/disk/by-uuid/534ea30c-2664-498b-915f-41b037eba01b"; } ]; - # 2 tb mini hdd - fileSystems."/data/atreus" = { - device = "/dev/disk/by-uuid/1840c2af-fdb2-48b6-8555-2cecd1afb106"; - fsType = "ext4"; - }; - # 500 gb nvme pcie - fileSystems."/data/kasio" = { - device = "/dev/disk/by-uuid/af74aa48-8513-4e31-a4b7-9fdd138e0002"; - fsType = "ext4"; - }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction From 224beca86f594f133bb58814ed0c2f8aaf50c61f Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:16:27 +0300 Subject: [PATCH 1657/1768] group ymir --- hosts/nixos/ymir/hardware-configuration.nix | 49 ++++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/hosts/nixos/ymir/hardware-configuration.nix b/hosts/nixos/ymir/hardware-configuration.nix index 5143b09..c056897 100644 --- a/hosts/nixos/ymir/hardware-configuration.nix +++ b/hosts/nixos/ymir/hardware-configuration.nix @@ -12,30 +12,35 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/fd6792b4-d1ec-493c-a686-64dbeaac3371"; - fsType = "ext4"; + boot = { + initrd = { + availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + kernelModules = [ ]; + }; + kernelModules = [ "kvm-intel" ]; + extraModulePackages = [ ]; }; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/fd6792b4-d1ec-493c-a686-64dbeaac3371"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/383D-1E8A"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; + "/boot" = { + device = "/dev/disk/by-uuid/383D-1E8A"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; }; swapDevices = [ From cef8b3ee81d7fbf74ee40e21bc8c2db770ec5b97 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:16:40 +0300 Subject: [PATCH 1658/1768] group i18n --- modules/nixos/system/i18n.nix | 45 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix index 10a8ca8..b053b2a 100644 --- a/modules/nixos/system/i18n.nix +++ b/modules/nixos/system/i18n.nix @@ -9,19 +9,31 @@ time.timeZone = lib.mkDefault "Europe/Istanbul"; # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; + i18n = { + defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "tr_TR.UTF-8"; - LC_IDENTIFICATION = "tr_TR.UTF-8"; - LC_MEASUREMENT = "tr_TR.UTF-8"; - LC_MONETARY = "tr_TR.UTF-8"; - LC_NAME = "tr_TR.UTF-8"; - LC_NUMERIC = "tr_TR.UTF-8"; - LC_PAPER = "tr_TR.UTF-8"; - LC_TELEPHONE = "tr_TR.UTF-8"; - LC_TIME = "ja_JP.UTF-8"; - # LC_ALL = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "tr_TR.UTF-8"; + LC_IDENTIFICATION = "tr_TR.UTF-8"; + LC_MEASUREMENT = "tr_TR.UTF-8"; + LC_MONETARY = "tr_TR.UTF-8"; + LC_NAME = "tr_TR.UTF-8"; + LC_NUMERIC = "tr_TR.UTF-8"; + LC_PAPER = "tr_TR.UTF-8"; + LC_TELEPHONE = "tr_TR.UTF-8"; + LC_TIME = "ja_JP.UTF-8"; + # LC_ALL = "en_US.UTF-8"; + }; + + inputMethod = { + type = "fcitx5"; + enable = config.osbmModules.desktopEnvironment != "none"; + fcitx5.addons = with pkgs; [ + fcitx5-mozc + fcitx5-gtk + fcitx5-nord # a color theme + ]; + }; }; services.xserver.xkb = { @@ -29,14 +41,5 @@ variant = ""; }; - i18n.inputMethod = { - type = "fcitx5"; - enable = config.osbmModules.desktopEnvironment != "none"; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-gtk - fcitx5-nord # a color theme - ]; - }; }; } From ddd7b729df368714de2cc36d56ef4a133dcdf2f8 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:17:06 +0300 Subject: [PATCH 1659/1768] group gnome --- modules/nixos/system/desktop-environment.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 583fd09..b0e89f9 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -44,12 +44,12 @@ in (lib.mkIf (cfg.desktopEnvironment == "gnome") { # Enable GNOME Desktop Environment - services.xserver.enable = true; - services.desktopManager.gnome.enable = true; - services.displayManager.gdm.enable = true; - - # Enable GNOME Keyring for password management - services.gnome.gnome-keyring.enable = true; + services = { + xserver.enable = true; + desktopManager.gnome.enable = true; + displayManager.gdm.enable = true; + gnome.gnome-keyring.enable = true; + }; # Enable dconf for GNOME settings programs.dconf.enable = true; From 30d30415764bc87633f8c41871b03a8d8fb1bd6c Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:17:24 +0300 Subject: [PATCH 1660/1768] group plasma --- modules/nixos/system/desktop-environment.nix | 50 ++++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index b0e89f9..0e06e5b 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -11,33 +11,31 @@ in config = lib.mkMerge [ # Plasma Desktop Environment (lib.mkIf (cfg.desktopEnvironment == "plasma") { - services.xserver.enable = true; - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + services = { + xserver.enable = true; + displayManager.sddm.enable = true; + desktopManager.plasma6.enable = true; + printing.enable = true; + }; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ - kate - konsole - yakuake - krunner # fuckass program keeps opening - ]; - - # Enable printing - services.printing.enable = true; - - # Desktop packages - environment.systemPackages = with pkgs; [ - alacritty - ghostty - obsidian - mpv - kitty - qbittorrent - element-desktop - ]; - - # Wayland support - environment.sessionVariables.NIXOS_OZONE_WL = "1"; + environment = { + plasma6.excludePackages = with pkgs.kdePackages; [ + kate + konsole + yakuake + krunner # fuckass program keeps opening + ]; + systemPackages = with pkgs; [ + alacritty + ghostty + obsidian + mpv + kitty + qbittorrent + element-desktop + ]; + sessionVariables.NIXOS_OZONE_WL = "1"; + }; }) # GNOME Desktop Environment From c880d48b71e5e7073958ff16a60823bebe98f954 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:17:55 +0300 Subject: [PATCH 1661/1768] group initrd zfs --- modules/nixos/hardware/disko.nix | 41 ++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/modules/nixos/hardware/disko.nix b/modules/nixos/hardware/disko.nix index 13aaf3a..d342c90 100644 --- a/modules/nixos/hardware/disko.nix +++ b/modules/nixos/hardware/disko.nix @@ -28,18 +28,22 @@ in config = lib.mkMerge [ # Initrd SSH for remote unlocking (lib.mkIf (cfg.enable && cfg.initrd-ssh.enable) { - boot.initrd.network.enable = true; - boot.initrd.availableKernelModules = cfg.initrd-ssh.ethernetDrivers; - boot.kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::eth0:none" ]; - boot.initrd.network.ssh = { - enable = true; - port = 2222; # different port to avoid conflicts - shell = "/bin/cryptsetup-askpass"; - inherit authorizedKeys; - hostKeys = [ "/etc/ssh/initrd" ]; - }; - boot.initrd.secrets = { - "/etc/ssh/initrd" = "/etc/ssh/initrd"; + boot = { + kernelParams = [ "ip=152.53.152.129::152.53.152.1:255.255.252.0::eth0:none" ]; + initrd = { + network.enable = true; + availableKernelModules = cfg.initrd-ssh.ethernetDrivers; + network.ssh = { + enable = true; + port = 2222; # different port to avoid conflicts + shell = "/bin/cryptsetup-askpass"; + inherit authorizedKeys; + hostKeys = [ "/etc/ssh/initrd" ]; + }; + secrets = { + "/etc/ssh/initrd" = "/etc/ssh/initrd"; + }; + }; }; }) @@ -318,12 +322,13 @@ in }; }; - # Needed for agenix - SSH keys must be available before ZFS mounts - fileSystems."/etc/ssh".neededForBoot = true; - - # Needed for impermanence - fileSystems."/persist".neededForBoot = true; - fileSystems."/persist/save".neededForBoot = true; + fileSystems = { + # Needed for agenix - SSH keys must be available before ZFS mounts + "/etc/ssh".neededForBoot = true; + # Needed for impermanence + "/persist".neededForBoot = true; + "/persist/save".neededForBoot = true; + }; }) # Impermanence: wipe root on boot From 01e9729a355de823e649085411895c7a5305f93d Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:18:05 +0300 Subject: [PATCH 1662/1768] group this --- modules/nixos/hardware/hibernation.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/nixos/hardware/hibernation.nix b/modules/nixos/hardware/hibernation.nix index 6b5e247..d52208f 100644 --- a/modules/nixos/hardware/hibernation.nix +++ b/modules/nixos/hardware/hibernation.nix @@ -2,9 +2,11 @@ { config = lib.mkIf (!config.osbmModules.hardware.hibernation.enable) { # Disable hibernation/suspend - systemd.targets.sleep.enable = false; - systemd.targets.suspend.enable = false; - systemd.targets.hibernate.enable = false; - systemd.targets.hybrid-sleep.enable = false; + systemd.targets = { + sleep.enable = false; + suspend.enable = false; + hibernate.enable = false; + hybrid-sleep.enable = false; + }; }; } From 4adc8da5976910314f180bfaced487d4e1983217 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:18:22 +0300 Subject: [PATCH 1663/1768] will statix ever be happy --- modules/nixos/hardware/nvidia.nix | 56 ++++++++++++++++--------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix index 3104c01..2762885 100644 --- a/modules/nixos/hardware/nvidia.nix +++ b/modules/nixos/hardware/nvidia.nix @@ -19,35 +19,39 @@ # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = [ "nvidia" ]; - hardware.nvidia = { - # Modesetting is required. - modesetting.enable = true; + hardware = { + nvidia = { + # Modesetting is required. + modesetting.enable = true; - # Nvidia power management. Experimental, and can cause sleep/suspend to fail. - # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead - # of just the bare essentials. - powerManagement.enable = false; + # Nvidia power management. Experimental, and can cause sleep/suspend to fail. + # Enable this if you have graphical corruption issues or application crashes after waking + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # of just the bare essentials. + powerManagement = { + enable = false; - # Fine-grained power management. Turns off GPU when not in use. - # Experimental and only works on modern Nvidia GPUs (Turing or newer). - powerManagement.finegrained = false; + # Fine-grained power management. Turns off GPU when not in use. + # Experimental and only works on modern Nvidia GPUs (Turing or newer). + finegrained = false; + }; + # Use the NVidia open source kernel module (not to be confused with the + # independent third-party "nouveau" open source driver). + # Support is limited to the Turing and later architectures. Full list of + # supported GPUs is at: + # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus + # Only available from driver 515.43.04+ + # Currently alpha-quality/buggy, so false is currently the recommended setting. + open = false; - # Use the NVidia open source kernel module (not to be confused with the - # independent third-party "nouveau" open source driver). - # Support is limited to the Turing and later architectures. Full list of - # supported GPUs is at: - # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus - # Only available from driver 515.43.04+ - # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = false; + # Enable the Nvidia settings menu, + # accessible via `nvidia-settings` + nvidiaSettings = true; - # Enable the Nvidia settings menu, - # accessible via `nvidia-settings` - nvidiaSettings = true; - - # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.latest; + # Optionally, you may need to select the appropriate driver version for your specific GPU. + package = config.boot.kernelPackages.nvidiaPackages.latest; + }; + nvidia-container-toolkit.enable = lib.mkIf config.osbmModules.virtualisation.docker.enable true; }; environment.systemPackages = [ @@ -60,7 +64,5 @@ presets.nvidia-gpu.enable = true; }; - # Enable nvidia-container-toolkit if virtualisation is enabled - hardware.nvidia-container-toolkit.enable = lib.mkIf config.osbmModules.virtualisation.docker.enable true; }; } From 0c675599655580d536b3f1299fb4f9e84465c23a Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:18:33 +0300 Subject: [PATCH 1664/1768] cleaner systemd --- .../nixos/services/wanikani-stats/default.nix | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/modules/nixos/services/wanikani-stats/default.nix b/modules/nixos/services/wanikani-stats/default.nix index 0731dda..efbac49 100644 --- a/modules/nixos/services/wanikani-stats/default.nix +++ b/modules/nixos/services/wanikani-stats/default.nix @@ -74,37 +74,41 @@ in config.services.wanikani-stats.port ]; - systemd.services.wanikani-stats = { - description = "WaniKani Stats Service"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${lib.getExe wanikani-stats-flask}"; - StateDirectory = "/var/lib/wanikani-stats"; - Restart = "on-failure"; - User = "root"; - Group = "root"; - }; - }; + systemd = { + services = { + wanikani-stats = { + description = "WaniKani Stats Service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${lib.getExe wanikani-stats-flask}"; + StateDirectory = "/var/lib/wanikani-stats"; + Restart = "on-failure"; + User = "root"; + Group = "root"; + }; + }; - # Timer to restart the service every 12 hours - systemd.services.wanikani-stats-restart = { - description = "Restart WaniKani Stats Service"; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.systemd}/bin/systemctl restart wanikani-stats.service"; - User = "root"; + # Timer to restart the service every 12 hours + wanikani-stats-restart = { + description = "Restart WaniKani Stats Service"; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.systemd}/bin/systemctl restart wanikani-stats.service"; + User = "root"; + }; + }; }; - }; - systemd.timers.wanikani-stats-restart = { - description = "Timer to restart WaniKani Stats Service every 12 hours"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = "*-*-* 00,12:00:00"; - Persistent = true; - RandomizedDelaySec = "5m"; + timers.wanikani-stats-restart = { + description = "Timer to restart WaniKani Stats Service every 12 hours"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "*-*-* 00,12:00:00"; + Persistent = true; + RandomizedDelaySec = "5m"; + }; }; }; }; From dcf2aeeee165c2419dd3f4794fc6dbc45bd89389 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:18:46 +0300 Subject: [PATCH 1665/1768] group systemd --- hosts/nixos/ymir/configuration.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index a585928..c261256 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -25,15 +25,17 @@ i18n.enable = true; }; - networking.hostName = "ymir"; # Define your hostname. + networking = { + hostName = "ymir"; # Define your hostname. - networking.firewall.allowedTCPPorts = [ - 8889 - 8000 - ]; + firewall.allowedTCPPorts = [ + 8889 + 8000 + ]; - # Enable networking - networking.networkmanager.enable = true; + # Enable networking + networkmanager.enable = true; + }; virtualisation.waydroid.enable = true; From 6cc7853d1dac18cfb94f51020fc272e85702b387 Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:21:58 +0300 Subject: [PATCH 1666/1768] deadnix --- hosts/nixos/harmonica-sd/hardware-configuration.nix | 2 +- hosts/nixos/harmonica/hardware-configuration.nix | 2 +- modules/nixos/system/home-manager.nix | 2 +- modules/nixos/system/impermanence.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/nixos/harmonica-sd/hardware-configuration.nix b/hosts/nixos/harmonica-sd/hardware-configuration.nix index faa2820..cc3ed25 100644 --- a/hosts/nixos/harmonica-sd/hardware-configuration.nix +++ b/hosts/nixos/harmonica-sd/hardware-configuration.nix @@ -6,7 +6,7 @@ { # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 nixpkgs.overlays = [ - (final: super: { + (_final: super: { makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); }) ]; diff --git a/hosts/nixos/harmonica/hardware-configuration.nix b/hosts/nixos/harmonica/hardware-configuration.nix index 3d492ca..e1489ad 100644 --- a/hosts/nixos/harmonica/hardware-configuration.nix +++ b/hosts/nixos/harmonica/hardware-configuration.nix @@ -6,7 +6,7 @@ { # Some packages (ahci fail... this bypasses that) https://discourse.nixos.org/t/does-pkgs-linuxpackages-rpi3-build-all-required-kernel-modules/42509 nixpkgs.overlays = [ - (final: super: { + (_final: super: { makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); }) ]; diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 3f881cd..9eda20c 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -35,7 +35,7 @@ # Capture the NixOS system config before entering the home-manager scope systemConfig = config; in - lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: { + lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (_username: { # Use the system's stateVersion for home-manager home.stateVersion = lib.mkDefault systemConfig.system.stateVersion; imports = [ diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index e8ec8fb..c97f947 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -10,7 +10,7 @@ let regularUsers = builtins.filter (u: u != "root") config.osbmModules.users; # Generate user persistence configuration - userPersistence = lib.genAttrs regularUsers (username: { + userPersistence = lib.genAttrs regularUsers (_username: { directories = [ "Documents" { From e86c579c938b370bf5ea6a2028d743523fc782be Mon Sep 17 00:00:00 2001 From: osbm Date: Fri, 7 Nov 2025 10:35:22 +0300 Subject: [PATCH 1667/1768] Revert "add to firefox" This reverts commit a9c081c0c79fd3ed6359f546c7d6eada1a44a3f3. --- modules/home-manager/programs/firefox.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 4e1a9f1..76f315c 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -86,7 +86,6 @@ ''; settings = { # "Open previous windows and tabs" - "identity.sync.tokenserver.uri" = "https://firefox.osbm.dev/1.0/sync/1.5"; "browser.startup.page" = 3; "browser.contentblocking.category" = true; "extensions.pocket.enabled" = false; From 3e3ffcac745f3fa0bdc96ee8fe53bfe6247103f2 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Nov 2025 14:47:15 +0300 Subject: [PATCH 1668/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cbfc521..ce1f775 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1762296971, - "narHash": "sha256-Jyv3L5rrUYpecON+9zyFz2VqgTSTsIG35fXuCyuCQv0=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "34fe48801d2a5301b814eaa1efb496499d06cebc", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1762304480, - "narHash": "sha256-ikVIPB/ea/BAODk6aksgkup9k2jQdrwr4+ZRXtBgmSs=", + "lastModified": 1762501326, + "narHash": "sha256-QbhsksHaIN6qU3oXhwUFbYycKX1GRxObpQSWAM5fhRY=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "b8c7ac030211f18bd1f41eae0b815571853db7a2", + "rev": "e2b82ebd0f990a5d1b68fcc761b3d6383c86ccfd", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762267440, - "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { From bbbfc44193b66410fde93b3585eecea526a9f8e7 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Nov 2025 10:07:33 +0300 Subject: [PATCH 1669/1768] please tell me this is the problem --- hosts/nixos/pochita/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 5f0772b..000c804 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -34,6 +34,7 @@ # The board and wanted kernel version raspberry-pi-nix = { board = "bcm2712"; + libcamera-overlay.enable = false; #kernel-version = "v6_10_12"; }; From ffd11ff0a9dc462d65a60ebe248cf647abd3b40b Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Nov 2025 10:08:59 +0300 Subject: [PATCH 1670/1768] fuck all result files --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5177d89..438ab28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -result +/result* .DS_Store .direnv -*.old \ No newline at end of file +*.old + From 0ffa1fadc48d23cc5ef6f5cd1ad003287326cc96 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 10 Nov 2025 10:43:44 +0300 Subject: [PATCH 1671/1768] check for more --- .github/workflows/nix.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index f7a8481..dd1b691 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -35,3 +35,5 @@ jobs: - uses: actions/checkout@v5 - uses: cachix/install-nix-action@v31 - run: nix run nixpkgs#nixfmt-tree -- --ci + - run: nix run nixpkgs#deadnix -- --fail + - run: nix run nixpkgs#statix -- check From 5040ec799d9a4d99fc2696b07f94b8cbea5ef54b Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Nov 2025 21:25:59 +0300 Subject: [PATCH 1672/1768] add secrets --- secrets/forgejo-mail.age | 15 +++++++++++++++ secrets/noreply-mail.age | 16 ++++++++++++++++ secrets/osbm-mail.age | 15 +++++++++++++++ secrets/secrets.nix | 4 ++++ secrets/vaultwarden-mail.age | 15 +++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 secrets/forgejo-mail.age create mode 100644 secrets/noreply-mail.age create mode 100644 secrets/osbm-mail.age create mode 100644 secrets/vaultwarden-mail.age diff --git a/secrets/forgejo-mail.age b/secrets/forgejo-mail.age new file mode 100644 index 0000000..6bb289a --- /dev/null +++ b/secrets/forgejo-mail.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 YVcKMQ fB1e9Vef8KAN7+bQTYhhmhPDRXFGNKuwx2XePcHQWTs +ZKnl/YZVE7PHwgrkXSiyw+p7EzxPPb2EYk3q3IISHsk +-> ssh-ed25519 a9zBzw L0V8yU3x4UYCfOOznBPM5Ls4BkxgmgV8ZbG7AyqJrQQ +oHx2XSqRd2LMlHyucv4RuReNgsATDAV1SZHUk51whfE +-> ssh-ed25519 /0F2+A YryrcK2spRGO7WWarf6VbBVkDFeoZyjBLPVf6mMKonc +RlB8w3OvOOrFr0Q1FB4HfOlzjuwPREtnhedcoFWkuBQ +-> ssh-ed25519 cs+R0A dRcTD8GbPj5c95SYEZEvxJUxXg96dDkYP1hlGurBdAs +cezru8j9OlkR6wzelfN4bGY/SM9GB2ktCJNRiPjzDuE +-> ssh-ed25519 uTfCrQ FraMU2qD5FVKRzPz+sQg65JqV79EF+q9jdbvAtisox4 +gL6CDNm8KPiFZ6NkrVHN2nR4O7BpUA2jGDTSf/hyUFM +-> ssh-ed25519 Ws1uag cYjmGrTNlRFiuNBDiQrXmPTu9G6V5v72muwWGJ8w8yk +VN5kfbyHnxkcWJlsIBVRw6bdUJa3TtrZ5l7TR6iUO7I +--- cByQ6nHhBovw3oLm3s3f/DqwH+blXJuw4iS49r2nTV8 +B.f2SMى xV16|_aEa)* ,1hesuj't} :n?>lUъpa \ No newline at end of file diff --git a/secrets/noreply-mail.age b/secrets/noreply-mail.age new file mode 100644 index 0000000..e61b338 --- /dev/null +++ b/secrets/noreply-mail.age @@ -0,0 +1,16 @@ +age-encryption.org/v1 +-> ssh-ed25519 YVcKMQ gvHiH6XLSdc7l70IkLA8jGv3TD0WOzDMeifTSRXfiyo +pzRrnvkjc8JJj7XqdWqw4q4CXLswREGQDLVo6CZQDks +-> ssh-ed25519 a9zBzw TnFaVLa/ve8716uXJUY9wQ7+Akq4YXDyaEJw0wqlim4 +BGrVLHVnJ9BUFwm6vS+83pEhonfW5CKY40IanSeUwkg +-> ssh-ed25519 /0F2+A DV0pBwSTHbWHZ3I6dzxZs0zlKk4cfNVTXwVwiG1WUQk +AZ5nxL6LeRN1M0I8WlUdB/blq3M+ZC96QDTYj1+eALE +-> ssh-ed25519 cs+R0A Aqqtjv1JyrbC7jF66ff4juXRCe1uL+9RMchN66fIC00 +on+5kDexf2IzZUuWFD3OvgDObwX9wnY9HRvi2bwlO5w +-> ssh-ed25519 uTfCrQ DHr+SFyihKsc9iPZwn1f2rTo8bxLIy9yqPjiMVCtLiQ +Rntyppg6sXc89Un4+LZOS9K4SQL+dwXvZ8d90Z6Ij6M +-> ssh-ed25519 Ws1uag E4Nxamb9B+B9M6vlj4NxL4YE5ZKrsyLenfcKwVhA/Fg +XXSxM3z1XMbK4e8VS1UQ/z63qo+o4jVcE1VjLKaXIdg +--- c8c09M9t+o1pxFwW/r6mOcG37fM+DT8ppVtoGk1NPUI +:D ĥZ0Qcs:U54:MN +hp¿[c[A6 >d=yq;8@"5{?0*ut'< \ No newline at end of file diff --git a/secrets/osbm-mail.age b/secrets/osbm-mail.age new file mode 100644 index 0000000..4791d48 --- /dev/null +++ b/secrets/osbm-mail.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 YVcKMQ UfA5sApJC8HAj7S2jPObgqn5v1UzsTyxwzkxFq+F5Vo +ctp9CZ1nYjFOsSfbWYe3j/fMB9nW3wyybteD5WwvyvY +-> ssh-ed25519 a9zBzw QCMJ3NTLYpnIb/OzASbgY9uYcNAnCqybLS0/zu+YmBw +SXrKXEnKNMM7AsvmbO2SQ6sbUbui40hgCAjkiEwmNBk +-> ssh-ed25519 /0F2+A qYQCQcd9yK0VichuwkkUxN43D3rytrG0B4eqqjqnIXc +86+MD4nOkVWbt+DUF7YK6EEXacgoLHK4fC1c05bMjUo +-> ssh-ed25519 cs+R0A W5qcrqK5sEzzs+V/ZQ2zwNaJZ9JHH65pB0FZbuz9KiA +RqXJ0prCczFYCS6BSFoYtSh/bSxcq3W3tRwNRPmmo04 +-> ssh-ed25519 uTfCrQ YEbgvhhjyxZQxfujV/GydY2b4G3QwdbEbbT1HPVOsi8 +MB/G6DsGbGQtNZ6xjwHttrDlVmSBkn3DTzDXMyZ9sOs +-> ssh-ed25519 Ws1uag hj/Vb5MKpNLfNuJREGkjoRbFhlmTTbjFqBOFg+461ko +HfQk4fmZXSCylHylKAJ5sczn5WDSPrg8VkDnIA198fc +--- +TMMBk6On89Puoisv0ezfLW3erpOwkScq+qTdC5pYBE +hcE<!P7iEo-[[FQY-6Pnn|܁e23 CM>mpҐ0 mFD-y{[Hħ]' \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a5f4648..3306cf5 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -22,4 +22,8 @@ in "ssh-key-public.age".publicKeys = machines ++ [ osbm ]; "cloudflare.age".publicKeys = machines ++ [ osbm ]; "vaultwarden.age".publicKeys = machines ++ [ osbm ]; + "osbm-mail.age".publicKeys = machines ++ [ osbm ]; + "forgejo-mail.age".publicKeys = machines ++ [ osbm ]; + "vaultwarden-mail.age".publicKeys = machines ++ [ osbm ]; + "noreply-mail.age".publicKeys = machines ++ [ osbm ]; } diff --git a/secrets/vaultwarden-mail.age b/secrets/vaultwarden-mail.age new file mode 100644 index 0000000..6193851 --- /dev/null +++ b/secrets/vaultwarden-mail.age @@ -0,0 +1,15 @@ +age-encryption.org/v1 +-> ssh-ed25519 YVcKMQ oBBngYGNvEC5xlACfIGI9oUI/X/neRIcNghh8+kvE1w +rrAI8G0QbcfWqKq0GglxnpgqGhuvz3C+FxXWw1G0jUk +-> ssh-ed25519 a9zBzw gG0lBSmuXbeE1ssuZMn8EOfHScEnl003/DwQIa7EqiQ +V9QuW6dc03x8+ND4ML2c71/I97xm9492sAT62NVziCM +-> ssh-ed25519 /0F2+A RIaiksHNboEa8EtJ4PIvyT1IP89LnSjHtdSmhvEjS3c +Jyu0pBEfGvjAavne18ZaMfp4Zq/nw5MDO2TZAJKK52s +-> ssh-ed25519 cs+R0A FTXal1b4M+mU8iGSE7SIHBrKmhMo2NtOghbZHFhpvhU +eYO9MCXCpNPx9uYY4RH+35bpEo8x8iK/H7xC4gwtoYA +-> ssh-ed25519 uTfCrQ Id5gpDnSp2JnGzACOiT1MevVD2ndOfjIc7jTOtVF7kY +s2JG1tI2MhVvsCtm9Wcu0C+RIoBoZ6PHCB8+3eZpnFs +-> ssh-ed25519 Ws1uag R7pyFYkd0nvAvz1ldBYNOlPJvgORpZSc0MRlLlPAHis +lBCX+5TPqf+b5Mh/8wTeN8GoGlV61xUk63TSi36E9ig +--- f13Jb/FHHcXgbY7YKxdRYFbzaR9fVfq6vo6fxf+M5Xs +5,4o7yàimBǺ$N /S߆lؼPáN5"qmyxyx$cXQN \ No newline at end of file From b81b78bcd3d9817ad41712ff6d276c38d6f4dab6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Nov 2025 21:28:02 +0300 Subject: [PATCH 1673/1768] mention passwords --- modules/nixos/system/agenix.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix index c3e9661..3d9b0cc 100644 --- a/modules/nixos/system/agenix.nix +++ b/modules/nixos/system/agenix.nix @@ -19,6 +19,10 @@ age.secrets = { vaultwarden.file = ../../../secrets/vaultwarden.age; network-manager.file = ../../../secrets/network-manager.age; + osbm-mail.file = ../../../secrets/osbm-mail.age; + forgejo-mail.file = ../../../secrets/forgejo-mail.age; + vaultwarden-mail.file = ../../../secrets/vaultwarden-mail.age; + noreply-mail.file = ../../../secrets/noreply-mail.age; ssh-key-private = { file = ../../../secrets/ssh-key-private.age; path = "/home/osbm/.ssh/id_ed25519"; From cb3dce87c839c14241b65c910a3b392b21217d07 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Nov 2025 21:28:11 +0300 Subject: [PATCH 1674/1768] use correct mail --- modules/nixos/services/vaultwarden.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index 046ec8c..948f812 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -29,7 +29,7 @@ SMTP_PORT = 25; SMTP_SSL = false; - SMTP_FROM = "osbm@osbm.dev"; + SMTP_FROM = "vaultwarden@osbm.dev"; SMTP_FROM_NAME = "osbm.dev Bitwarden server"; }; }; From b5e4575ccb9d7b1b0fddde02a9efe1ce89bd0b35 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Nov 2025 21:28:19 +0300 Subject: [PATCH 1675/1768] add mails --- modules/nixos/services/mailserver.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index c4a2457..42b7cde 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -17,12 +17,31 @@ fqdn = "mail.osbm.dev"; domains = [ "osbm.dev" ]; + # Set all no-reply addresses + rejectRecipients = [ "noreply@osbm.dev" ]; + # A list of all login accounts. To create the password hashes, use # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' loginAccounts = { "osbm@osbm.dev" = { - hashedPasswordFile = "/persist/osbm.passwd"; # TODO: Make this into agenix secret - aliases = [ "postmaster@osbm.dev" ]; + hashedPasswordFile = config.age.secrets."osbm-mail".path; + aliases = [ + "osbm" + "osman@osbm.dev" + "postmaster@osbm.dev" + "root@osbm.dev" + "mastercontrol@osbm.dev" + "admin@osbm.dev" + ]; + }; + "forgejo@osbm.dev" = { + hashedPasswordFile = config.age.secrets."forgejo-mail".path; + }; + "vaultwarden@osbm.dev" = { + hashedPasswordFile = config.age.secrets."vaultwarden-mail".path; + }; + "noreply@osbm.dev" = { + hashedPasswordFile = config.age.secrets."noreply-mail".path; }; }; From fadb6a5eace017c22f49d89eb1809f05741e18a3 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Nov 2025 21:34:16 +0300 Subject: [PATCH 1676/1768] add mail support for forgejo --- modules/nixos/services/forgejo.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index 65aab17..76b9720 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -9,6 +9,7 @@ services.forgejo = { enable = true; lfs.enable = true; + secrets.mailer.PASSWD = config.age.secrets."forgejo-mail".path; dump = { enable = true; type = "zip"; @@ -31,6 +32,12 @@ DISABLE_REGISTRATION = true; LANDING_PAGE = "/osbm"; }; + mailer = { + ENABLED = true; + PROTOCOL = "smtps"; + SMTP_ADDR = "osbm.dev"; + USER = "forgejo@osbm.dev"; + }; }; }; }) From d7f3604976692b78ecf20c78ec3493d026800d85 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Nov 2025 21:34:24 +0300 Subject: [PATCH 1677/1768] purge --- modules/nixos/services/forgejo.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index 76b9720..1050891 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -32,6 +32,11 @@ DISABLE_REGISTRATION = true; LANDING_PAGE = "/osbm"; }; + other = { + SHOW_FOOTER_VERSION = false; + SHOW_FOOTER_TEMPLATE_LOAD_TIME = false; + ENABLE_FEED = false; + }; mailer = { ENABLED = true; PROTOCOL = "smtps"; From 75516ec3438e1675165923e2de551670f97aea4a Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 11 Nov 2025 21:35:42 +0300 Subject: [PATCH 1678/1768] update flake.lock --- flake.lock | 67 ++++++++++++++++++++---------------------------------- 1 file changed, 25 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index ce1f775..4fc1199 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761656077, - "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1762501326, - "narHash": "sha256-QbhsksHaIN6qU3oXhwUFbYycKX1GRxObpQSWAM5fhRY=", + "lastModified": 1762627886, + "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "e2b82ebd0f990a5d1b68fcc761b3d6383c86ccfd", + "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", "type": "github" }, "original": { @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1762055842, - "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", + "lastModified": 1762660502, + "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", + "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -470,22 +470,6 @@ "type": "github" } }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-docs": { "locked": { "lastModified": 1705957679, @@ -887,15 +871,14 @@ "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-25_05": "nixpkgs-25_05" + ] }, "locked": { - "lastModified": 1762302830, - "narHash": "sha256-f3xe6CRPT51vCQFZotJOXi/JpGOiukz0WIa86arJSE8=", + "lastModified": 1762740199, + "narHash": "sha256-B8aMgLj5moqKVDlgxo29Ef2jX9SsUkAQhJalpI9MNgA=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "58659fbdfd8aba9bd8f4517d3e5c388c4d8266c4", + "rev": "b633223a33f6aa2a81a8f65ed056be4234bd0822", "type": "gitlab" }, "original": { From ec36705158195f4baf3a8036a5c3e5f94fdda334 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Nov 2025 07:10:12 +0100 Subject: [PATCH 1679/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 4fc1199..c0a676b 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1762787259, - "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { From 299c5dcd147d49fbfcae88f4215e1f9de0ee95d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Nov 2025 10:08:29 +0300 Subject: [PATCH 1680/1768] add immich --- modules/nixos/services/glance.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 14c3fe1..9ec811f 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -114,6 +114,11 @@ title = "Bitwarden Vault"; url = "https://bitwarden.osbm.dev"; } + { + icon = "sh:immich"; + title = "Immich Photo Server"; + url = "https://photos.osbm.dev"; + } { icon = "sh:visual-studio-code"; title = "Ymir Remote VSCode"; From 9df5fa584417e3933d80db8f15783d0ec1ee907c Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Nov 2025 10:08:42 +0300 Subject: [PATCH 1681/1768] add actual budget --- modules/nixos/services/glance.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 9ec811f..1481400 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -119,6 +119,11 @@ title = "Immich Photo Server"; url = "https://photos.osbm.dev"; } + { + icon = "sh:actual-budget"; + title = "Actual Budget"; + url = "https://actual.osbm.dev"; # todo migrate to budget.osbm.dev + } { icon = "sh:visual-studio-code"; title = "Ymir Remote VSCode"; From c3556f595daee88c3e2ae46485822153e9463648 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Nov 2025 10:21:12 +0300 Subject: [PATCH 1682/1768] disable syncserver --- hosts/nixos/apollo/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 9f34390..09c9b1b 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -17,7 +17,6 @@ vaultwarden.enable = true; immich.enable = true; actual.enable = true; - firefox-syncserver.enable = true; # seafile.enable = true; }; From df2dfd6e84ceda441a59220173dcb0041aa54f94 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Nov 2025 10:23:03 +0300 Subject: [PATCH 1683/1768] purge syncserver --- modules/nixos/options.nix | 1 - modules/nixos/services/default.nix | 1 - modules/nixos/services/firefox-syncserver.nix | 69 ------------------- 3 files changed, 71 deletions(-) delete mode 100644 modules/nixos/services/firefox-syncserver.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index ff33971..8f35738 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -144,7 +144,6 @@ syncthing.enable = lib.mkEnableOption "syncthing"; jellyfin.enable = lib.mkEnableOption "jellyfin"; mailserver.enable = lib.mkEnableOption "mailserver"; - firefox-syncserver.enable = lib.mkEnableOption "firefox-syncserver"; vaultwarden.enable = lib.mkEnableOption "vaultwarden"; nginx.enable = lib.mkEnableOption "nginx"; ollama.enable = lib.mkEnableOption "ollama"; diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 3ad6689..3b8a395 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -7,7 +7,6 @@ ./cloudflared.nix ./ollama.nix ./openssh.nix - ./firefox-syncserver.nix ./forgejo.nix ./glance.nix ./hydra.nix diff --git a/modules/nixos/services/firefox-syncserver.nix b/modules/nixos/services/firefox-syncserver.nix deleted file mode 100644 index aafd39d..0000000 --- a/modules/nixos/services/firefox-syncserver.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.services.firefox-syncserver.enable { - services.mysql.package = pkgs.mariadb; # Use MariaDB as the database backend - services.firefox-syncserver = { - enable = true; - secrets = "/persist/firefox-syncserver-secrets.env"; # TODO: Make this into agenix secret - logLevel = "trace"; - singleNode = { - enable = true; - url = "https://firefox.osbm.dev"; - capacity = 1; - }; - settings = { - host = "0.0.0.0"; - # Override database URLs to use Unix socket for authentication - # This allows the firefox-syncserver user to authenticate via unix_socket - syncstorage.database_url = "mysql://firefox-syncserver@localhost/firefox_syncserver?socket=%2Frun%2Fmysqld%2Fmysqld.sock"; - tokenserver.database_url = "mysql://firefox-syncserver@localhost/firefox_syncserver?socket=%2Frun%2Fmysqld%2Fmysqld.sock"; - }; - }; - }) - - # firefox-syncserver and nginx - (lib.mkIf - (config.osbmModules.services.nginx.enable && config.osbmModules.services.firefox-syncserver.enable) - { - services.nginx.virtualHosts."firefox.osbm.dev" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://localhost:${toString config.services.firefox-syncserver.settings.port}"; - }; - }; - } - ) - - # impermanence and firefox-syncserver - (lib.mkIf - ( - config.osbmModules.services.firefox-syncserver.enable - && config.osbmModules.hardware.disko.zfs.root.impermanenceRoot - ) - { - systemd.services.firefox-syncserver.serviceConfig.ReadWritePaths = [ - "/var/lib/firefox-syncserver" - ]; - - environment.persistence."/persist" = { - directories = [ - { - directory = "/var/lib/firefox-syncserver"; - user = config.systemd.services.firefox-syncserver.serviceConfig.User; - group = config.systemd.services.firefox-syncserver.serviceConfig.Group; - mode = "0750"; - } - ]; - }; - } - ) - ]; -} From c42a4dec3e021ec577a97a2b3bc74aefeffe21e9 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 13 Nov 2025 15:01:13 +0300 Subject: [PATCH 1684/1768] everything is broken --- modules/nixos/system/desktop-environment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 0e06e5b..24e95a9 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -32,7 +32,7 @@ in mpv kitty qbittorrent - element-desktop + # element-desktop # TODO: add another matrix client ]; sessionVariables.NIXOS_OZONE_WL = "1"; }; From fe00c7148196473911ff93ff4fd4f6f1bb58d1d6 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Nov 2025 06:19:11 +0100 Subject: [PATCH 1685/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c0a676b..f3f07b9 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -310,11 +310,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1761853569, - "narHash": "sha256-miiMKVgC2WVi4ItD8rWD0ngou5WicEDAuZGhI0TfEIw=", + "lastModified": 1763065138, + "narHash": "sha256-46lJeUYH8YrfTccAoKQbO9lprq4dlo9VVLk+StPBSWM=", "owner": "mobile-nixos", "repo": "mobile-nixos", - "rev": "1e38d4027bbb944f2af1b3241eabd9ad9c950c84", + "rev": "1943b7b06fcd1a2c87f4b89df58231915cc2ca44", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1762627886, - "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", + "lastModified": 1763136804, + "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", + "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f", "type": "github" }, "original": { @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1762660502, - "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", + "lastModified": 1763265660, + "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", + "rev": "469ef53571ea80890c9497952787920c79c1ee6e", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -874,11 +874,11 @@ ] }, "locked": { - "lastModified": 1762740199, - "narHash": "sha256-B8aMgLj5moqKVDlgxo29Ef2jX9SsUkAQhJalpI9MNgA=", + "lastModified": 1763317756, + "narHash": "sha256-7CD7BQR3RVKllDWfqIwAicgs2j4jzpaugxvkLU8cGgI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "b633223a33f6aa2a81a8f65ed056be4234bd0822", + "rev": "cbdf90f639660981a55bbf6af86e6cc5f13d2752", "type": "gitlab" }, "original": { From 33951aa72e6e4f6b7f8b4bee3f07d315bf8c0e31 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Nov 2025 13:21:02 +0300 Subject: [PATCH 1686/1768] add anki --- modules/nixos/system/desktop-environment.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 24e95a9..9a5cd6d 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -32,6 +32,7 @@ in mpv kitty qbittorrent + anki # element-desktop # TODO: add another matrix client ]; sessionVariables.NIXOS_OZONE_WL = "1"; From 3325d64aa13f9454126b03add4b65915ab4e0312 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Nov 2025 13:21:41 +0300 Subject: [PATCH 1687/1768] add anki --- hosts/darwinHosts/prometheus/configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 2b30813..d9c395a 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -48,8 +48,9 @@ vscode git lazygit + anki # blender - # libreoffice + libreoffice # ungoogled-chromium code-cursor ollama From 893e89cc373a7b5b43a3795d68af8280c5d84b45 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 18 Nov 2025 13:23:39 +0300 Subject: [PATCH 1688/1768] fuck --- hosts/darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index d9c395a..9b183a9 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -48,7 +48,7 @@ vscode git lazygit - anki + # anki # blender libreoffice # ungoogled-chromium From e7f5849afcd3b37389e2ca5faabe81411352ac15 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 22 Nov 2025 23:18:21 +0300 Subject: [PATCH 1689/1768] add claude code --- modules/nixos/programs/graphical.nix | 1 + modules/nixos/system/nix-settings.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/nixos/programs/graphical.nix b/modules/nixos/programs/graphical.nix index 1dc2359..02ffd76 100644 --- a/modules/nixos/programs/graphical.nix +++ b/modules/nixos/programs/graphical.nix @@ -18,6 +18,7 @@ vscode chromium thunderbird + claude-code ]; }; } diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index f210346..0c26ad2 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -21,6 +21,7 @@ "vscode-extension-github-copilot" "spotify" "cursor" + "claude-code" # NVIDIA related "libcurand" "nvidia-x11" From 17e0ff33a0085fef97c63b1956d506ba385d32d7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 10:43:42 +0300 Subject: [PATCH 1690/1768] update readme --- README.md | 146 ++++++++++-------------------------------------------- 1 file changed, 26 insertions(+), 120 deletions(-) diff --git a/README.md b/README.md index e654d52..b212fc5 100644 --- a/README.md +++ b/README.md @@ -1,136 +1,42 @@ -# nixos is life -The nix configuration of mine. My intentions are just to maintain my configuration and to contribute to the nix community. - -Here i have 4 machines and 1 sd card image that i maintain. -- Laptop **tartarus** (faulty hardware, nvidia gpu doesnt work) -- Desktop **ymir** (beast, my most prized possession as of now) -- Raspberry Pi 5 **pochita** (a server that i experiment with) -- Raspberry Pi 5 SD image **pochita-sd** (produces an sd image that could be used to flash the sd card of a rpi-5) -- Phone **atreus** (unrooted, nix-on-droid) - -I didnt get these setup yet. -- Raspberry Pi Zero 2W **harmonica** (small machine for small tasks and cronjobs) (not setup yet) -- Android phone (termux) **android** (not setup yet) - -My options: - -I implemented a module system for my configurations. Each machine has its own set of options that can be enabled or disabled. The options are defined in the `modules/options.nix` file. Each option is a module that can be imported into the machine configuration. - -I am containing my options in the `osbmModules` attribute set. I dont like to interfere with the global configuration namespace. Here is all the available options: - -```nix -osbmModules = { - desktopEnvironment = "plasma"; # options: "plasma", "none" - homeManager.enable = true; - machineType = "desktop"; # options: "desktop", "laptop", "server", "embedded", "mobile" - users = [ "osbm" "bayram" ]; - defaultUser = "osbm"; - agenix.enable = true; - nixSettings.enable = true; - programs = { - steam.enable = true; - graphical.enable = true; - commandLine.enable = true; - neovim.enable = true; - arduino.enable = true; - adbFastboot.enable = true; - }; - services = { - # list services to enable - }; - hardware = { - sound.enable = true; - nvidia.enable = false; - hibernation.enable = false; - disko = { - enable = true; - fileSystem = "zfs"; # options: "zfs", "ext4" - initrd-ssh = { - enable = true; - ethernetDrivers = [ "igc" ]; - }; - zfs = { - enable = true; - hostID = "49e95c43"; - root = { - disk1 = "nvme0n1"; - disk2 = "nvme1n1"; - reservation = "200G"; - impermanenceRoot = true; - }; - storage = { - enable = true; - disks = [ - "sda" - "sdb" - ]; - reservation = "1500G"; - mirror = true; - #amReinstalling = true; - }; - }; - }; - } -}; -``` +
+

osbm's nix flake

+
- How to bootstrap raspberry pi 5 +Hosts -## How to use raspberry pi 5 +I may have some tendency on naming my hosts after mythological figures... -I have 2 configurations for the raspberry pi 5. One is for the sd card (basically bootstraps the system) and the other is for my customized system itself. +| Name | Description | Architecture | Status | +|------|-------------|--------------|--------| +| ymir | Desktop workstation | x86_64-linux | ✅ | +| tartarus | Personal laptop | x86_64-linux | ✅ | +| pochita | Raspberry Pi 5 | aarch64-linux | ✅ | +| wallfacer | Dell Enterprise server | x86_64-linux | ✅ | +| atreus | Work Phone (nix-on-droid) | aarch64-linux | ✅ | +| luoji | Personal Phone (nix-on-droid) | aarch64-linux | ✅ | +| prometheus | Work Laptop | x86_64-linux | ✅ | +| artemis | Oneplus 6 (mobile nixos) | aarch64-linux | ✅ | +| harmonica | Raspberry Pi Zero 2 | aarch64-linux | ✅ | +| ares | Valve Steam Deck | aarch64-linux | ❌ | +| apollo | netcup VPS | x86_64-linux | ✅ | -build the image first (this took about 4 hours on ymir (binfmt for aarch64 needs to be enabled if you are building on x86_64)) -```sh -$ nix build -L '.#nixosConfigurations.pochita-sd.config.system.build.sdImage' -``` - -then to flash the image to the sd card enable zstd -```sh -$ nix-shell -p zstd -``` - -then flash the image to the sd card -```sh -$ zstdcat nixos-sd-image-24.05.20241116.e8c38b7-aarch64-linux.img.zst | dd of=/dev/sda status=progress -``` - -and voila! when you plug the sd card to the raspberry pi 5 it will boot up with the configuration that you have built. And then you can ssh into it and further configure it.
-build iso with: - nix build .#nixosConfigurations.myISO.config.system.build.isoImage -# To-do list +
+Options -- [x] iso image generator for nixos - - Basically the original nixos iso with added packages and tweaks. -- [ ] build custom android rom - - Or how to run nixos on the phone. -- [ ] build android apps using nix - - [ ] lichess - - [ ] termux -- [ ] build my qmk keyboard with nix -- agenix - - [ ] add my gpg keys - - [x] add ssh keys so that machines can connect to each other -- [x] module system with options -- [ ] see which derivations will be built and which will be downloaded from cache or which is already present in the nix store. -- [ ] see which python packages are giving build errors. -- [x] home-manager setup -- [ ] make a development environment nix repository -- [ ] enable swap on pochita -- [ ] learnis it possible to enable swap with sd-image? +TODO i want to make all my options documented here +
-nano /tmp/secret.key -sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- --mode destroy,format,mount --flake github:osbm/flake#apollo +
+Development Environments -sudo mkdir -p /mnt/etc/ssh -sudo ssh-keygen -t ed25519 -N "" -f /mnt/etc/ssh/initrd +Currently all my development environments are defined under the devshells repository: https://github.com/osbm/devshells -sudo nixos-install --flake github:osbm/flake#apollo --root /mnt --no-root-passwd +
From f8b6dd5e7c65f80e0a3b767c436098a3d9ecf54c Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 11:49:34 +0300 Subject: [PATCH 1691/1768] turn string option into the many sub options This enables me to enable multiple desktop environments at the same time. --- .../darwinHosts/prometheus/configuration.nix | 1 - hosts/nixos/apollo/configuration.nix | 1 - hosts/nixos/artemis/configuration.nix | 2 +- hosts/nixos/harmonica-sd/configuration.nix | 1 - hosts/nixos/harmonica/configuration.nix | 1 - hosts/nixos/pochita/configuration.nix | 1 - hosts/nixos/tartarus/configuration.nix | 2 +- hosts/nixos/wallfacer/configuration.nix | 1 - hosts/nixos/ymir/configuration.nix | 2 +- modules/home-manager/programs/alacritty.nix | 2 +- modules/home-manager/programs/firefox.nix | 2 +- modules/home-manager/programs/ghostty.nix | 2 +- modules/home-manager/programs/mpv.nix | 2 +- modules/home-manager/programs/wezterm.nix | 2 +- modules/nixos/options.nix | 29 ++++++++++++------- modules/nixos/system/desktop-environment.nix | 6 ++-- modules/nixos/system/i18n.nix | 2 +- 17 files changed, 30 insertions(+), 29 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 9b183a9..680e5b1 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -13,7 +13,6 @@ ]; osbmModules = { - desktopEnvironment = "none"; # fuckass darwin defaults machineType = "laptop"; programs.neovim.enable = true; }; diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 09c9b1b..6977a0b 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -5,7 +5,6 @@ ]; osbmModules = { - desktopEnvironment = "none"; machineType = "server"; users = [ "osbm" ]; services = { diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 8261289..be03b9e 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -11,7 +11,7 @@ ]; osbmModules = { - desktopEnvironment = "gnome"; + desktopEnvironment.gnome.enable = true; machineType = "mobile"; hardware.systemd-boot.enable = false; # Mobile devices use different bootloader programs.graphical.enable = false; diff --git a/hosts/nixos/harmonica-sd/configuration.nix b/hosts/nixos/harmonica-sd/configuration.nix index e3a84f7..db65a33 100644 --- a/hosts/nixos/harmonica-sd/configuration.nix +++ b/hosts/nixos/harmonica-sd/configuration.nix @@ -11,7 +11,6 @@ ]; osbmModules = { - desktopEnvironment = "none"; fonts.enable = false; services.tailscale.enable = true; hardware.systemd-boot.enable = false; # SD card uses extlinux diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index 4bb24af..c4d855d 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -5,7 +5,6 @@ ]; osbmModules = { - desktopEnvironment = "none"; machineType = "server"; hardware.systemd-boot.enable = false; # Uses extlinux bootloader }; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 000c804..25ac796 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -12,7 +12,6 @@ ]; osbmModules = { - desktopEnvironment = "none"; machineType = "server"; hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader services = { diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index c1f654d..f0eba85 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -5,7 +5,7 @@ ]; osbmModules = { - desktopEnvironment = "plasma"; + desktopEnvironment.plasma.enable = true; machineType = "laptop"; emulation.aarch64.enable = true; hardware.sound.enable = true; diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index f7a4912..f9c1487 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -4,7 +4,6 @@ ../../../modules/nixos ]; osbmModules = { - desktopEnvironment = "none"; machineType = "server"; services = { hydra.enable = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index c261256..539f10c 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -5,7 +5,7 @@ ]; osbmModules = { - desktopEnvironment = "plasma"; + desktopEnvironment.plasma.enable = true; machineType = "desktop"; programs = { adbFastboot.enable = true; diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix index 4a98495..6b72830 100644 --- a/modules/home-manager/programs/alacritty.nix +++ b/modules/home-manager/programs/alacritty.nix @@ -6,7 +6,7 @@ }: { config = lib.mkMerge [ - (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { # Set enableAlacritty to true by default when there's a desktop environment programs.alacritty.enable = lib.mkDefault true; }) diff --git a/modules/home-manager/programs/firefox.nix b/modules/home-manager/programs/firefox.nix index 76f315c..2024842 100644 --- a/modules/home-manager/programs/firefox.nix +++ b/modules/home-manager/programs/firefox.nix @@ -7,7 +7,7 @@ { config = lib.mkMerge [ # Auto-enable Firefox if system has a desktop environment - (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { # Set enableFirefox to true by default when there's a desktop environment programs.firefox.enable = lib.mkDefault true; }) diff --git a/modules/home-manager/programs/ghostty.nix b/modules/home-manager/programs/ghostty.nix index 6c50f2e..f40fbf9 100644 --- a/modules/home-manager/programs/ghostty.nix +++ b/modules/home-manager/programs/ghostty.nix @@ -1,7 +1,7 @@ { lib, nixosConfig, ... }: { config = lib.mkMerge [ - (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { # Set enableGhostty to true by default when there's a desktop environment programs.ghostty.enable = lib.mkDefault true; }) diff --git a/modules/home-manager/programs/mpv.nix b/modules/home-manager/programs/mpv.nix index 0353ae2..e19abe5 100644 --- a/modules/home-manager/programs/mpv.nix +++ b/modules/home-manager/programs/mpv.nix @@ -1,7 +1,7 @@ { lib, nixosConfig, ... }: { config = lib.mkMerge [ - (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { programs.mpv.enable = lib.mkDefault true; }) diff --git a/modules/home-manager/programs/wezterm.nix b/modules/home-manager/programs/wezterm.nix index 2282220..479613d 100644 --- a/modules/home-manager/programs/wezterm.nix +++ b/modules/home-manager/programs/wezterm.nix @@ -6,7 +6,7 @@ }: { config = lib.mkMerge [ - (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") { + (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { programs.wezterm.enable = lib.mkDefault true; }) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 8f35738..5a8d68c 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -2,14 +2,21 @@ { options.osbmModules = { # Desktop Environment - desktopEnvironment = lib.mkOption { - type = lib.types.enum [ - "plasma" - "gnome" - "none" - ]; - default = "none"; - description = "Which desktop environment to use"; + desktopEnvironment = { + plasma.enable = lib.mkEnableOption "plasma"; + gnome.enable = lib.mkEnableOption "gnome"; + niri.enable = lib.mkEnableOption "niri"; + # none is true if all above are false, just for easier checks + none = lib.mkOption { + type = lib.types.bool; + default = + !( + config.osbmModules.desktopEnvironment.plasma.enable + || config.osbmModules.desktopEnvironment.gnome.enable + || config.osbmModules.desktopEnvironment.niri.enable + ); + description = "True if no desktop environment is enabled"; + }; }; # Machine Type @@ -83,7 +90,7 @@ graphical = { enable = lib.mkOption { type = lib.types.bool; - default = config.osbmModules.desktopEnvironment != "none"; + default = !config.osbmModules.desktopEnvironment.none; description = "Enable graphical applications"; }; }; @@ -165,7 +172,7 @@ bluetooth = { enable = lib.mkOption { type = lib.types.bool; - default = config.osbmModules.desktopEnvironment != "none"; + default = !config.osbmModules.desktopEnvironment.none; description = "Enable Bluetooth support"; }; }; @@ -393,7 +400,7 @@ fonts = { enable = lib.mkOption { type = lib.types.bool; - default = config.osbmModules.desktopEnvironment != "none"; + default = !config.osbmModules.desktopEnvironment.none; description = "Enable custom fonts"; }; }; diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 9a5cd6d..885f011 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -10,7 +10,7 @@ in { config = lib.mkMerge [ # Plasma Desktop Environment - (lib.mkIf (cfg.desktopEnvironment == "plasma") { + (lib.mkIf cfg.desktopEnvironment.plasma.enable { services = { xserver.enable = true; displayManager.sddm.enable = true; @@ -40,7 +40,7 @@ in }) # GNOME Desktop Environment - (lib.mkIf (cfg.desktopEnvironment == "gnome") { + (lib.mkIf cfg.desktopEnvironment.gnome.enable { # Enable GNOME Desktop Environment services = { @@ -85,7 +85,7 @@ in }) # Common settings for any desktop environment - (lib.mkIf (cfg.desktopEnvironment != "none") { + (lib.mkIf (!cfg.desktopEnvironment.none) { # Enable X11 keymap services.xserver.xkb = { layout = lib.mkDefault "us"; diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix index b053b2a..ce15f72 100644 --- a/modules/nixos/system/i18n.nix +++ b/modules/nixos/system/i18n.nix @@ -27,7 +27,7 @@ inputMethod = { type = "fcitx5"; - enable = config.osbmModules.desktopEnvironment != "none"; + enable = !config.osbmModules.desktopEnvironment.none; fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk From f52c5680ebcab9ef8b57feb7dfd9db69eb6f3b70 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 11:53:39 +0300 Subject: [PATCH 1692/1768] add niri config --- modules/nixos/system/desktop-environment.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 885f011..372ce47 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -84,6 +84,12 @@ in }) + # niri desktop environment + (lib.mkIf cfg.desktopEnvironment.niri.enable { + # is this it? + programs.niri.enable = true; + }) + # Common settings for any desktop environment (lib.mkIf (!cfg.desktopEnvironment.none) { # Enable X11 keymap From 3f74cbcfd7aa1eb5517eebfe703f935512044ca0 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 16:38:31 +0300 Subject: [PATCH 1693/1768] better user config --- hosts/nixos/apollo/configuration.nix | 1 - hosts/nixos/pochita/configuration.nix | 1 + hosts/nixos/tartarus/configuration.nix | 1 + hosts/nixos/ymir/configuration.nix | 1 + modules/nixos/options.nix | 18 ++++------ modules/nixos/system/home-manager.nix | 7 +++- modules/nixos/system/impermanence.nix | 7 ++-- modules/nixos/system/users.nix | 47 ++++++++++++++------------ 8 files changed, 46 insertions(+), 37 deletions(-) diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 6977a0b..f77da2a 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -6,7 +6,6 @@ osbmModules = { machineType = "server"; - users = [ "osbm" ]; services = { glance.enable = true; # anubis.enable = true; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 25ac796..a5b6bd7 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -14,6 +14,7 @@ osbmModules = { machineType = "server"; hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader + familyUser.enable = true; services = { wanikani-bypass-lessons.enable = true; wanikani-fetch-data.enable = true; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index f0eba85..0a862f5 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -7,6 +7,7 @@ osbmModules = { desktopEnvironment.plasma.enable = true; machineType = "laptop"; + familyUser.enable = true; emulation.aarch64.enable = true; hardware.sound.enable = true; programs.steam.enable = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 539f10c..75d6eb1 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -7,6 +7,7 @@ osbmModules = { desktopEnvironment.plasma.enable = true; machineType = "desktop"; + familyUser.enable = true; programs = { adbFastboot.enable = true; steam.enable = true; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 5a8d68c..7b998c2 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -32,24 +32,18 @@ description = "Type of machine for appropriate defaults"; }; - # Users - users = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ - "osbm" - ] - ++ lib.optionals ( - config.osbmModules.machineType == "desktop" || config.osbmModules.machineType == "laptop" - ) [ "bayram" ]; - description = "List of users to create. `osbm` is my main user, and `bayram` is for my family (only on desktop/laptop)."; - }; - defaultUser = lib.mkOption { type = lib.types.str; default = "osbm"; description = "Default user for the system"; }; + familyUser.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable family user account"; + }; + # Home Manager homeManager = { enable = lib.mkOption { diff --git a/modules/nixos/system/home-manager.nix b/modules/nixos/system/home-manager.nix index 9eda20c..2b3cbf9 100644 --- a/modules/nixos/system/home-manager.nix +++ b/modules/nixos/system/home-manager.nix @@ -34,8 +34,13 @@ let # Capture the NixOS system config before entering the home-manager scope systemConfig = config; + # Build list of regular users based on defaultUser and familyUser options + regularUsers = [ + systemConfig.osbmModules.defaultUser + ] + ++ lib.optional systemConfig.osbmModules.familyUser.enable "bayram"; in - lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (_username: { + lib.genAttrs regularUsers (_username: { # Use the system's stateVersion for home-manager home.stateVersion = lib.mkDefault systemConfig.system.stateVersion; imports = [ diff --git a/modules/nixos/system/impermanence.nix b/modules/nixos/system/impermanence.nix index c97f947..eea80b5 100644 --- a/modules/nixos/system/impermanence.nix +++ b/modules/nixos/system/impermanence.nix @@ -6,8 +6,11 @@ ... }: let - # Filter out 'root' from the users list since it's a special system user - regularUsers = builtins.filter (u: u != "root") config.osbmModules.users; + # Build list of regular users based on defaultUser and familyUser options + regularUsers = [ + config.osbmModules.defaultUser + ] + ++ lib.optional config.osbmModules.familyUser.enable "bayram"; # Generate user persistence configuration userPersistence = lib.genAttrs regularUsers (_username: { diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index 643aa4d..72df34d 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -1,33 +1,40 @@ { lib, config, ... }: -let - # Filter out 'root' from the users list since it's a special system user - regularUsers = builtins.filter (u: u != "root") config.osbmModules.users; -in { - config = lib.mkIf (config.osbmModules.users != [ ]) { + config = { users.users = lib.mkMerge [ - # Create users based on the list (excluding root) - (lib.genAttrs regularUsers (username: { - isNormalUser = true; - description = username; - initialPassword = "changeme"; - extraGroups = [ - "networkmanager" - ] - ++ lib.optional (username == config.osbmModules.defaultUser) "wheel" - ++ lib.optional config.osbmModules.virtualisation.docker.enable "docker" - ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; - })) - - # Additional configuration for default user (including root if it's default) + # Default user { ${config.osbmModules.defaultUser} = { + isNormalUser = true; + description = config.osbmModules.defaultUser; + initialPassword = "changeme"; + extraGroups = [ + "wheel" + "networkmanager" + ] + ++ lib.optional config.osbmModules.virtualisation.docker.enable "docker" + ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; openssh.authorizedKeys.keys = lib.mkDefault [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k" ]; }; } + # Family user (bayram) + (lib.mkIf config.osbmModules.familyUser.enable { + bayram = { + isNormalUser = true; + description = "bayram"; + initialPassword = "changeme"; + extraGroups = [ + "networkmanager" + ] + ++ lib.optional config.osbmModules.virtualisation.docker.enable "docker" + ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; + }; + }) + + # Root user { root = { initialPassword = "changeme"; @@ -36,8 +43,6 @@ in ]; }; } - ]; - }; } From b04abb09014d0b47e7aaf4a9c7ff1615c61242ea Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 21:29:19 +0300 Subject: [PATCH 1694/1768] remove machineType option --- hosts/darwinHosts/prometheus/configuration.nix | 1 - hosts/nixos/apollo/configuration.nix | 1 - hosts/nixos/artemis/configuration.nix | 1 - hosts/nixos/harmonica/configuration.nix | 1 - hosts/nixos/pochita/configuration.nix | 1 - hosts/nixos/tartarus/configuration.nix | 1 - hosts/nixos/wallfacer/configuration.nix | 1 - hosts/nixos/ymir/configuration.nix | 1 - modules/nixos/options.nix | 13 ------------- 9 files changed, 21 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 680e5b1..a70c2b8 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -13,7 +13,6 @@ ]; osbmModules = { - machineType = "laptop"; programs.neovim.enable = true; }; diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index f77da2a..07e5a15 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -5,7 +5,6 @@ ]; osbmModules = { - machineType = "server"; services = { glance.enable = true; # anubis.enable = true; diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index be03b9e..c3364e9 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -12,7 +12,6 @@ osbmModules = { desktopEnvironment.gnome.enable = true; - machineType = "mobile"; hardware.systemd-boot.enable = false; # Mobile devices use different bootloader programs.graphical.enable = false; }; diff --git a/hosts/nixos/harmonica/configuration.nix b/hosts/nixos/harmonica/configuration.nix index c4d855d..0d25a44 100644 --- a/hosts/nixos/harmonica/configuration.nix +++ b/hosts/nixos/harmonica/configuration.nix @@ -5,7 +5,6 @@ ]; osbmModules = { - machineType = "server"; hardware.systemd-boot.enable = false; # Uses extlinux bootloader }; diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index a5b6bd7..9aae70c 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -12,7 +12,6 @@ ]; osbmModules = { - machineType = "server"; hardware.systemd-boot.enable = false; # Raspberry Pi uses init-script bootloader familyUser.enable = true; services = { diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 0a862f5..5fde18b 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -6,7 +6,6 @@ osbmModules = { desktopEnvironment.plasma.enable = true; - machineType = "laptop"; familyUser.enable = true; emulation.aarch64.enable = true; hardware.sound.enable = true; diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index f9c1487..39fb62a 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -4,7 +4,6 @@ ../../../modules/nixos ]; osbmModules = { - machineType = "server"; services = { hydra.enable = true; atticd.enable = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 75d6eb1..592dec9 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -6,7 +6,6 @@ osbmModules = { desktopEnvironment.plasma.enable = true; - machineType = "desktop"; familyUser.enable = true; programs = { adbFastboot.enable = true; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 7b998c2..940e5fa 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -19,19 +19,6 @@ }; }; - # Machine Type - machineType = lib.mkOption { - type = lib.types.enum [ - "desktop" - "laptop" - "server" - "embedded" - "mobile" - ]; - default = "server"; - description = "Type of machine for appropriate defaults"; - }; - defaultUser = lib.mkOption { type = lib.types.str; default = "osbm"; From 6d1a24f74ecc6278dc21736fc4a0d1cc497b30df Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 21:30:56 +0300 Subject: [PATCH 1695/1768] enable niri here --- hosts/nixos/ymir/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 592dec9..4578b24 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -5,7 +5,10 @@ ]; osbmModules = { - desktopEnvironment.plasma.enable = true; + desktopEnvironment = { + plasma.enable = true; + niri.enable = true; + }; familyUser.enable = true; programs = { adbFastboot.enable = true; From 9d8815e4c84572f227de7138c498b3f84aaeffe1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 21:33:19 +0300 Subject: [PATCH 1696/1768] remove unused service --- modules/nixos/options.nix | 1 - modules/nixos/services/cloudflare-dyndns.nix | 19 ------------------- modules/nixos/services/default.nix | 1 - 3 files changed, 21 deletions(-) delete mode 100644 modules/nixos/services/cloudflare-dyndns.nix diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 940e5fa..56371d8 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -138,7 +138,6 @@ forgejo.enable = lib.mkEnableOption "forgejo"; atticd.enable = lib.mkEnableOption "atticd"; cloudflared.enable = lib.mkEnableOption "cloudflared"; - cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns"; glance.enable = lib.mkEnableOption "glance"; hydra.enable = lib.mkEnableOption "hydra"; immich.enable = lib.mkEnableOption "immich"; diff --git a/modules/nixos/services/cloudflare-dyndns.nix b/modules/nixos/services/cloudflare-dyndns.nix deleted file mode 100644 index 9986a73..0000000 --- a/modules/nixos/services/cloudflare-dyndns.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - lib, - config, - ... -}: -{ - config = lib.mkMerge [ - (lib.mkIf config.osbmModules.services.cloudflare-dyndns.enable { - services.cloudflare-dyndns = { - enable = true; - apiTokenFile = "/persist/cloudflare-dyndns"; - proxied = false; # TODO please revert - domains = [ - "git.osbm.dev" - ]; - }; - }) - ]; -} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 3b8a395..ea9cb1f 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -3,7 +3,6 @@ ./actual.nix ./anubis.nix ./atticd.nix - ./cloudflare-dyndns.nix ./cloudflared.nix ./ollama.nix ./openssh.nix From fef4e4778844a09b222ce8119931a41eaa7d12a4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 21:41:06 +0300 Subject: [PATCH 1697/1768] first lets try hyprland --- modules/nixos/options.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 56371d8..1c5ed84 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -6,6 +6,7 @@ plasma.enable = lib.mkEnableOption "plasma"; gnome.enable = lib.mkEnableOption "gnome"; niri.enable = lib.mkEnableOption "niri"; + hyprland.enable = lib.mkEnableOption "hyprland"; # none is true if all above are false, just for easier checks none = lib.mkOption { type = lib.types.bool; @@ -14,6 +15,7 @@ config.osbmModules.desktopEnvironment.plasma.enable || config.osbmModules.desktopEnvironment.gnome.enable || config.osbmModules.desktopEnvironment.niri.enable + || config.osbmModules.desktopEnvironment.hyprland.enable ); description = "True if no desktop environment is enabled"; }; From 7b03abe4e9d9247b2b92d9f23b2f7a8d23908ab8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 23 Nov 2025 21:44:22 +0300 Subject: [PATCH 1698/1768] enable hyprland --- hosts/nixos/ymir/configuration.nix | 1 + modules/nixos/system/desktop-environment.nix | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 4578b24..539c889 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -8,6 +8,7 @@ desktopEnvironment = { plasma.enable = true; niri.enable = true; + hyprland.enable = true; # im insane so i enable every DE }; familyUser.enable = true; programs = { diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 372ce47..ac6053e 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -90,6 +90,12 @@ in programs.niri.enable = true; }) + # Hyprland desktop environment + (lib.mkIf cfg.desktopEnvironment.hyprland.enable { + programs.hyprland.enable = true; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + }) + # Common settings for any desktop environment (lib.mkIf (!cfg.desktopEnvironment.none) { # Enable X11 keymap From 6499521cf6effc5ab43e0c4a487441a1581af726 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 08:45:58 +0300 Subject: [PATCH 1699/1768] add claude code --- hosts/darwinHosts/prometheus/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index a70c2b8..8f561b6 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -51,6 +51,7 @@ libreoffice # ungoogled-chromium code-cursor + claude-code ollama ]; system.stateVersion = 6; From e117ab9ae1b75b73edd14425ecb1d30ccd7aeee1 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 09:07:58 +0300 Subject: [PATCH 1700/1768] broken --- hosts/darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 8f561b6..69ab236 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -48,7 +48,7 @@ lazygit # anki # blender - libreoffice + # libreoffice # ungoogled-chromium code-cursor claude-code From 54e2cd44ed541c3d20a36d0eac9bb09dc11eef6e Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 07:24:31 +0100 Subject: [PATCH 1701/1768] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index f3f07b9..2354eb2 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1764017209, + "narHash": "sha256-RoJGCtKExXXkNCZUmmxezG3eOczEOTBw38DaZGSYJC0=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "ec8eabe00c4ee9a2ddc50162c125f0ec2a7099e1", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1764034279, + "narHash": "sha256-hZH6EHQYFifVg0bmSBYT8Art5BWhXBXE307uPLnexY0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "381f4f8a3a5f773cb80d2b7eb8f8d733b8861434", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1763136804, - "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=", + "lastModified": 1763505477, + "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f", + "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", "type": "github" }, "original": { @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1763265660, - "narHash": "sha256-Ad9Rd3ZAidrH01xP73S3CjPiyXo7ywZs3uCESjPwUdc=", + "lastModified": 1763870992, + "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "469ef53571ea80890c9497952787920c79c1ee6e", + "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -874,11 +874,11 @@ ] }, "locked": { - "lastModified": 1763317756, - "narHash": "sha256-7CD7BQR3RVKllDWfqIwAicgs2j4jzpaugxvkLU8cGgI=", + "lastModified": 1763564778, + "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "cbdf90f639660981a55bbf6af86e6cc5f13d2752", + "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", "type": "gitlab" }, "original": { From 34728e45b1e8dcf49525cb349c3381bd41f4e2c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 09:30:39 +0300 Subject: [PATCH 1702/1768] enable plasma in pochita --- hosts/nixos/pochita/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 9aae70c..2095f02 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -19,6 +19,7 @@ wanikani-fetch-data.enable = true; wanikani-stats.enable = true; }; + desktopEnvironment.plasma.enable = true; }; zramSwap.enable = true; From afde7af37d262d8a44d65687378adc1c0743b1c5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 09:34:29 +0300 Subject: [PATCH 1703/1768] disable programs --- hosts/nixos/pochita/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 2095f02..b878248 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -20,6 +20,7 @@ wanikani-stats.enable = true; }; desktopEnvironment.plasma.enable = true; + programs.graphical.enable = false; }; zramSwap.enable = true; From 19066e70500ade71d289013e40d554838a73ee91 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 10:13:36 +0300 Subject: [PATCH 1704/1768] nothing ever works in darwin --- hosts/darwinHosts/prometheus/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index 69ab236..f438a19 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -52,7 +52,7 @@ # ungoogled-chromium code-cursor claude-code - ollama + # ollama ]; system.stateVersion = 6; nixpkgs.hostPlatform = "x86_64-darwin"; From f7cb5f380c696ddc7f60e3b853c596b7c01d6d5f Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 14:08:01 +0300 Subject: [PATCH 1705/1768] use git without osxkeychain --- hosts/darwinHosts/prometheus/configuration.nix | 1 - modules/nixos/programs/command-line.nix | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index f438a19..e3ee79e 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -44,7 +44,6 @@ # ghostty kitty vscode - git lazygit # anki # blender diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index befd242..c8bfeeb 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -16,9 +16,11 @@ nano # version control - git - lazygit + (pkgs.gitFull.override { + osxkeychainSupport = false; + }) git-lfs + lazygit gh # nix tools From ad40a39e3a1959b6d2921cceb680e2098f927388 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 14:30:44 +0300 Subject: [PATCH 1706/1768] it already exists in the commandline list --- hosts/darwinHosts/prometheus/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/darwinHosts/prometheus/configuration.nix b/hosts/darwinHosts/prometheus/configuration.nix index e3ee79e..b99fac6 100644 --- a/hosts/darwinHosts/prometheus/configuration.nix +++ b/hosts/darwinHosts/prometheus/configuration.nix @@ -44,7 +44,6 @@ # ghostty kitty vscode - lazygit # anki # blender # libreoffice From 82a518970f177d3bfcd49655a316c0c429d51c83 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 14:30:59 +0300 Subject: [PATCH 1707/1768] lets pin this too --- modules/home-manager/programs/git.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix index f3cadfd..5ce0533 100644 --- a/modules/home-manager/programs/git.nix +++ b/modules/home-manager/programs/git.nix @@ -1,6 +1,9 @@ { programs.git = { enable = true; + package = pkgs.gitFull.override { + osxkeychainSupport = false; + }; signing = { format = "openpgp"; }; From e2b0c0014765eeb479da7634cec90ea9b6b0f286 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 14:32:21 +0300 Subject: [PATCH 1708/1768] i am a dumbass --- modules/home-manager/programs/git.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix index 5ce0533..6110f10 100644 --- a/modules/home-manager/programs/git.nix +++ b/modules/home-manager/programs/git.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { programs.git = { enable = true; From 45ac230b4f5ea5c7ef80ac566673cf5b532248a5 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 16:15:15 +0300 Subject: [PATCH 1709/1768] fix url --- modules/nixos/services/glance.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/glance.nix b/modules/nixos/services/glance.nix index 1481400..1373333 100644 --- a/modules/nixos/services/glance.nix +++ b/modules/nixos/services/glance.nix @@ -117,7 +117,7 @@ { icon = "sh:immich"; title = "Immich Photo Server"; - url = "https://photos.osbm.dev"; + url = "https://immich.osbm.dev"; } { icon = "sh:actual-budget"; From 85dfccfaa56b971be27f2f2a78082bfc5f9a9101 Mon Sep 17 00:00:00 2001 From: osbm Date: Tue, 25 Nov 2025 16:41:47 +0300 Subject: [PATCH 1710/1768] add rclone --- modules/nixos/programs/command-line.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/programs/command-line.nix b/modules/nixos/programs/command-line.nix index c8bfeeb..f868e1b 100644 --- a/modules/nixos/programs/command-line.nix +++ b/modules/nixos/programs/command-line.nix @@ -11,6 +11,7 @@ wget curl dig + rclone # text editors nano From c5181be5c5ea4de4346379784d7e38ddfef50d65 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Nov 2025 10:25:25 +0300 Subject: [PATCH 1711/1768] add fj alias --- modules/home-manager/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index aea89a7..2cca8ff0 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ lib, pkgs, ... }: { # Import all home-manager modules imports = [ @@ -22,6 +22,7 @@ du = "du -h"; lg = "lazygit"; onefetch = "onefetch -T prose -T programming -T data"; + fj = "${lib.getExe pkgs.forgejo-cli} --host git.osbm.dev"; }; # Don't set stateVersion here - let it be set by the system configuration From 76f16f4552a21dd2749b5853bbd87457fbacb60f Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 26 Nov 2025 10:43:41 +0300 Subject: [PATCH 1712/1768] try this for shell completions --- modules/home-manager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 2cca8ff0..199a708 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -13,6 +13,8 @@ EDITOR = lib.mkDefault "nvim"; }; + home.packages = [ pkgs.forgejo-cli ]; + home.shellAliases = { c = "code ."; l = "eza --all --long --git --icons --group --sort size --header --group-directories-first"; From 16af91a525fddf9df8d53fd40ab999fba57a5644 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Nov 2025 08:51:22 +0300 Subject: [PATCH 1713/1768] add nix formatter --- flake.lock | 37 ++++++++++++++++++++++++++++++++++++- flake.nix | 10 +++++++++- treefmt.nix | 12 ++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 treefmt.nix diff --git a/flake.lock b/flake.lock index 2354eb2..36b16e8 100644 --- a/flake.lock +++ b/flake.lock @@ -550,6 +550,22 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -726,7 +742,8 @@ "nixpkgs": "nixpkgs", "osbm-nvim": "osbm-nvim", "raspberry-pi-nix": "raspberry-pi-nix", - "simple-nixos-mailserver": "simple-nixos-mailserver" + "simple-nixos-mailserver": "simple-nixos-mailserver", + "treefmt-nix": "treefmt-nix" } }, "rpi-bluez-firmware-src": { @@ -931,6 +948,24 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 34b0a22..808bb7b 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; osbm-nvim.url = "github:osbm/osbm-nvim"; + treefmt-nix.url = "github:numtide/treefmt-nix"; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; @@ -64,6 +65,7 @@ nixpkgs, nix-on-droid, nix-darwin, + treefmt-nix, ... }@inputs: let @@ -83,6 +85,9 @@ modules = [ ./hosts/nixos/${configName}/configuration.nix ]; }; nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos); + treefmtEval = forAllSystems ( + system: treefmt-nix.lib.evalModule (makePkgs system) ./treefmt.nix + ); in { nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames makeNixosConfig; @@ -97,7 +102,10 @@ specialArgs = { inherit inputs outputs; }; }; lib = import ./lib { inherit (nixpkgs) lib; }; - formatter = forAllSystems (system: (makePkgs system).nixfmt-tree); + formatter = forAllSystems (system: treefmtEval.${system}.config.build.wrapper); + checks = forAllSystems (system: { + formatting = treefmtEval.${system}.config.build.check self; + }); nixosModules.default = ./modules/nixos; homeManagerModules.default = ./modules/home-manager; diff --git a/treefmt.nix b/treefmt.nix new file mode 100644 index 0000000..1b27317 --- /dev/null +++ b/treefmt.nix @@ -0,0 +1,12 @@ +{ pkgs, ... }: +{ + projectRootFile = "flake.nix"; + programs = { + nixfmt = { + enable = true; + package = pkgs.nixfmt-rfc-style; + }; + statix.enable = true; + deadnix.enable = true; + }; +} From 7241a325a2b093d4c42f6edbf2a448a04c0a2adb Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Nov 2025 09:00:12 +0300 Subject: [PATCH 1714/1768] pin down input --- flake.lock | 20 +++----------------- flake.nix | 5 ++++- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 36b16e8..6dbe6fe 100644 --- a/flake.lock +++ b/flake.lock @@ -550,22 +550,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1761236834, - "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -951,7 +935,9 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1762938485, diff --git a/flake.nix b/flake.nix index 808bb7b..8ef2e54 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; osbm-nvim.url = "github:osbm/osbm-nvim"; - treefmt-nix.url = "github:numtide/treefmt-nix"; + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; raspberry-pi-nix = { url = "github:nix-community/raspberry-pi-nix"; }; From e883f1c8519ddf4d46f0fabe24df5b52450bf63f Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Nov 2025 09:00:21 +0300 Subject: [PATCH 1715/1768] formatting --- flake.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8ef2e54..46be2dc 100644 --- a/flake.nix +++ b/flake.nix @@ -88,9 +88,7 @@ modules = [ ./hosts/nixos/${configName}/configuration.nix ]; }; nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos); - treefmtEval = forAllSystems ( - system: treefmt-nix.lib.evalModule (makePkgs system) ./treefmt.nix - ); + treefmtEval = forAllSystems (system: treefmt-nix.lib.evalModule (makePkgs system) ./treefmt.nix); in { nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames makeNixosConfig; From 7fd171606485e57aeea17b59fc7c4ab8d19327bf Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Nov 2025 09:02:32 +0300 Subject: [PATCH 1716/1768] clean --- .github/workflows/nix.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index dd1b691..7f7943f 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -21,19 +21,11 @@ jobs: steps: - uses: actions/checkout@v5 - uses: cachix/install-nix-action@v31 - # TODO: add a binary cache - # - uses: cachix/cachix-action@v10 - # with: - # name: YOURCACHE - # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - run: nix flake check --accept-flake-config - # Pre-build the system configuration - run: nix build --accept-flake-config --dry-run .#nixosConfigurations.${{ matrix.target-system }}.config.system.build.toplevel check-formatting: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v5 - uses: cachix/install-nix-action@v31 - - run: nix run nixpkgs#nixfmt-tree -- --ci - - run: nix run nixpkgs#deadnix -- --fail - - run: nix run nixpkgs#statix -- check + - run: nix flake check --accept-flake-config From 9cfd96481c0f3f89a8c0a46be7d9bbb0096c5c5b Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Nov 2025 09:04:32 +0300 Subject: [PATCH 1717/1768] add shellcheck --- treefmt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/treefmt.nix b/treefmt.nix index 1b27317..c81a23d 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -7,6 +7,7 @@ package = pkgs.nixfmt-rfc-style; }; statix.enable = true; + shellcheck.enable = true; deadnix.enable = true; }; } From d138a14ee1d15c23388bb0f42e8e13b4c31aaf0d Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Nov 2025 09:04:45 +0300 Subject: [PATCH 1718/1768] exclude lock files --- treefmt.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/treefmt.nix b/treefmt.nix index c81a23d..084c2fb 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -10,4 +10,9 @@ shellcheck.enable = true; deadnix.enable = true; }; + settings = { + global.excludes = [ + "*.lock" + ]; + }; } From 893e5a177999b9188685c9612b2f7dcc0b3e2800 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 27 Nov 2025 09:05:49 +0300 Subject: [PATCH 1719/1768] formatting --- modules/nixos/services/system-logger/system-logger.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/nixos/services/system-logger/system-logger.sh b/modules/nixos/services/system-logger/system-logger.sh index b31e9f7..bd1e16f 100755 --- a/modules/nixos/services/system-logger/system-logger.sh +++ b/modules/nixos/services/system-logger/system-logger.sh @@ -25,7 +25,7 @@ collect_logs() { local source="$1" local output="$2" local max_lines="$3" - + if [ -f "$source" ]; then # Get the last N lines to stay within size limit tail -n "$max_lines" "$source" > "$output" 2>/dev/null || true @@ -40,7 +40,7 @@ get_journal_logs() { local output="$1" local filter="$2" local max_lines="$3" - + journalctl --since "00:00:00" --until "23:59:59" \ --no-pager --output=short \ | grep -i "$filter" | tail -n "$max_lines" > "$output" 2>/dev/null || true @@ -49,7 +49,6 @@ get_journal_logs() { # Calculate approximate lines per log type to stay under 1MB # Assuming average line is ~100 bytes, we aim for ~10,000 total lines -TOTAL_LINES=10000 SSH_LINES=2000 KERNEL_LINES=2000 LOGIN_LINES=1000 From f96ba4ba9d95935ae731d860f39e74907492847d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 29 Nov 2025 13:33:55 +0300 Subject: [PATCH 1720/1768] update flake.lock --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 6dbe6fe..5254c03 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1764017209, - "narHash": "sha256-RoJGCtKExXXkNCZUmmxezG3eOczEOTBw38DaZGSYJC0=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "ec8eabe00c4ee9a2ddc50162c125f0ec2a7099e1", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1764034279, - "narHash": "sha256-hZH6EHQYFifVg0bmSBYT8Art5BWhXBXE307uPLnexY0=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "381f4f8a3a5f773cb80d2b7eb8f8d733b8861434", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1763505477, - "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { @@ -380,11 +380,11 @@ "nmt": "nmt_2" }, "locked": { - "lastModified": 1756744433, - "narHash": "sha256-6BSEvkprwEQDQQgW5UH/1GkBPGM8M9+qX6o9ePslr6E=", + "lastModified": 1763721296, + "narHash": "sha256-xWX9+lScfVcSejkwieNpeTYdNbyWY/dxf0mLjsy+9ek=", "owner": "Gerschtli", "repo": "nix-formatter-pack", - "rev": "63b748033a3fa0af80f8ed908521122e48858c30", + "rev": "8ccdeef5cd29bc30ee881d425d53ef2ae884d64d", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764328224, + "narHash": "sha256-hFyF1XQd+XrRx7WZCrGJp544dykexD8Q5SrJJZpEQYg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "d62603a997438e19182af69d3ce7be07565ecad4", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -504,11 +504,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -520,11 +520,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1761656231, - "narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", + "lastModified": 1764230294, + "narHash": "sha256-Z63xl5Scj3Y/zRBPAWq1eT68n2wBWGCIEF4waZ0bQBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", + "rev": "0d59e0290eefe0f12512043842d7096c4070f30e", "type": "github" }, "original": { @@ -558,11 +558,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1761744315, - "narHash": "sha256-OknzyEoI+VEYgk/FWMyx3tvjb/MPPyqS+G/aemDz51w=", + "lastModified": 1764385708, + "narHash": "sha256-OW19qwRisjzD1vQknzGXbZ5yqtULI1FU1f6HZdKn5TA=", "owner": "nix-community", "repo": "nixvim", - "rev": "6233fc6b2c3f203d8a5970f4a2c1df5777902717", + "rev": "96d3538c32816992f30d858095aa93c9ee32fd45", "type": "github" }, "original": { @@ -672,11 +672,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1761771567, - "narHash": "sha256-EC8Bpx6KIU0fHbhQVM6p8j+ZH56UfZ7mrVTl80d8Vcs=", + "lastModified": 1764412419, + "narHash": "sha256-7EbTmHOe+xi6KJ7ApasMqjylPdR5aFi1ICWqDxlT66U=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "8f08a58beafbcb94ddd6fb2d24975dd736e236d0", + "rev": "6f896c425bb07516e6730935d0f602a739c5db4c", "type": "github" }, "original": { @@ -875,11 +875,11 @@ ] }, "locked": { - "lastModified": 1763564778, - "narHash": "sha256-HSWMOylEaTtVgzIjpTbjcjVLXHDwNyV081eVUBfAcMs=", + "lastModified": 1764381008, + "narHash": "sha256-s+/BuhPPSJHpPRcylqfW+3UFyYsHjAhKdtPSxusYn0U=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "4987d275a90392347f84923cd4cd8efcf0aa7a22", + "rev": "76bd7a85e78a9b8295782a9cf719ec3489d8eb55", "type": "gitlab" }, "original": { From 14a69d239b7adb672cd70720942877a7a69a4aca Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 29 Nov 2025 23:40:44 +0300 Subject: [PATCH 1721/1768] add waybar --- modules/home-manager/programs/default.nix | 1 + modules/home-manager/programs/waybar.nix | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 modules/home-manager/programs/waybar.nix diff --git a/modules/home-manager/programs/default.nix b/modules/home-manager/programs/default.nix index 9da3ac0..9977ab1 100644 --- a/modules/home-manager/programs/default.nix +++ b/modules/home-manager/programs/default.nix @@ -12,6 +12,7 @@ ./starship.nix ./tlrc.nix ./tmux.nix + ./waybar.nix ./wezterm.nix ./zoxide.nix ]; diff --git a/modules/home-manager/programs/waybar.nix b/modules/home-manager/programs/waybar.nix new file mode 100644 index 0000000..129ae1e --- /dev/null +++ b/modules/home-manager/programs/waybar.nix @@ -0,0 +1,6 @@ +{ + programs.waybar = { + enable = true; + systemd.enable = true; + }; +} From cc7096662ed45c8a6883dec66dcafe7e2440c2b8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Nov 2025 14:37:46 +0300 Subject: [PATCH 1722/1768] add swww --- modules/home-manager/programs/default.nix | 1 + modules/home-manager/programs/swww.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 modules/home-manager/programs/swww.nix diff --git a/modules/home-manager/programs/default.nix b/modules/home-manager/programs/default.nix index 9977ab1..161cc6f 100644 --- a/modules/home-manager/programs/default.nix +++ b/modules/home-manager/programs/default.nix @@ -10,6 +10,7 @@ ./mpv.nix ./ssh.nix ./starship.nix + ./swww.nix ./tlrc.nix ./tmux.nix ./waybar.nix diff --git a/modules/home-manager/programs/swww.nix b/modules/home-manager/programs/swww.nix new file mode 100644 index 0000000..5f19f3c --- /dev/null +++ b/modules/home-manager/programs/swww.nix @@ -0,0 +1,19 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.swww ]; + + systemd.user.services.swww = { + Unit = { + Description = "Wayland wallpaper daemon"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + + Service = { + ExecStart = "${pkgs.swww}/bin/swww-daemon"; + Restart = "on-failure"; + }; + + Install.WantedBy = [ "graphical-session.target" ]; + }; +} From c83209886a2b6bd450ebbe7c3bf15c704e63fbba Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Nov 2025 14:47:21 +0300 Subject: [PATCH 1723/1768] add new packages --- modules/nixos/system/desktop-environment.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index ac6053e..618613b 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -88,6 +88,10 @@ in (lib.mkIf cfg.desktopEnvironment.niri.enable { # is this it? programs.niri.enable = true; + environment.systemPackages = with pkgs; [ + fuzzel + swww + ]; }) # Hyprland desktop environment From e822bc73b55b1a32cb6eb165a400814e6de84ae8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Nov 2025 16:52:55 +0300 Subject: [PATCH 1724/1768] add networking to pochita --- hosts/nixos/pochita/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index b878248..4b2ec0c 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -26,6 +26,8 @@ zramSwap.enable = true; networking.hostName = "pochita"; + networking.networkmanager.enable = true; + # log of shame: osbm blamed nix when he wrote "hostname" instead of "hostName" environment.systemPackages = [ From 337e3767c3a10ed2a8ef796e66c9d6d3ad2d0739 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Nov 2025 17:52:44 +0300 Subject: [PATCH 1725/1768] test this shit --- modules/home-manager/programs/mpv.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/home-manager/programs/mpv.nix b/modules/home-manager/programs/mpv.nix index e19abe5..75b65fc 100644 --- a/modules/home-manager/programs/mpv.nix +++ b/modules/home-manager/programs/mpv.nix @@ -14,5 +14,10 @@ }; } + # Raspberry Pi 5 specific: Use OpenGL to avoid Vulkan memory issues + (lib.mkIf (nixosConfig != null && nixosConfig.networking.hostName == "pochita") { + programs.mpv.config.gpu-api = "opengl"; + }) + ]; } From d19d3b9330b02fa3b09252027769cffc72d6bd2f Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 30 Nov 2025 22:53:12 +0300 Subject: [PATCH 1726/1768] add xwayland --- modules/nixos/system/desktop-environment.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 618613b..3410afc 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -92,6 +92,24 @@ in fuzzel swww ]; + + + # XWayland satellite service for X11 app support + systemd.user.services.xwayland-satellite = { + Unit = { + Description = "Xwayland outside Wayland"; + BindsTo = "graphical-session.target"; + After = "graphical-session.target"; + }; + Service = { + Type = "notify"; + NotifyAccess = "all"; + ExecStart = "${pkgs.xwayland-satellite}/bin/xwayland-satellite"; + StandardOutput = "journal"; + Restart = "on-failure"; + }; + Install.WantedBy = [ "graphical-session.target" ]; + }; }) # Hyprland desktop environment From d7c3f12485c9cba7802b43dc472b95e75b9d2306 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 6 Dec 2025 12:15:06 +0300 Subject: [PATCH 1727/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 5254c03..c0a4872 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1764350888, - "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", + "lastModified": 1764627417, + "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", "owner": "nix-community", "repo": "disko", - "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", + "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1764361670, - "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1763870992, - "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", + "lastModified": 1764475780, + "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", + "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764328224, - "narHash": "sha256-hFyF1XQd+XrRx7WZCrGJp544dykexD8Q5SrJJZpEQYg=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d62603a997438e19182af69d3ce7be07565ecad4", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -875,11 +875,11 @@ ] }, "locked": { - "lastModified": 1764381008, - "narHash": "sha256-s+/BuhPPSJHpPRcylqfW+3UFyYsHjAhKdtPSxusYn0U=", + "lastModified": 1764763336, + "narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "76bd7a85e78a9b8295782a9cf719ec3489d8eb55", + "rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e", "type": "gitlab" }, "original": { From bb1bfbc90652a2099e52e1a015ec433b8cf1c775 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 11 Dec 2025 06:13:35 +0100 Subject: [PATCH 1728/1768] update flake.lock --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c0a4872..b0e93d8 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1764627417, - "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=", + "lastModified": 1765326679, + "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", "owner": "nix-community", "repo": "disko", - "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3", + "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1765337252, + "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1765065051, + "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", "type": "github" }, "original": { @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1764475780, - "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -425,11 +425,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1760773689, - "narHash": "sha256-TaRP+sx4EiqBcfdKVYKT+RbrRHioJF+HUmiaUaHj5I8=", + "lastModified": 1765031149, + "narHash": "sha256-4ZtlnCp4blhsjGnQIxAXDAj7nCJKy7tozoBRtklmwcU=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "1c306c07b3e99ab79b967ead32f9af7b8672a7ef", + "rev": "55b6449b4582a4ba3ce712543c973360a026db7d", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { From 15e48a82ba3a72471f85dfb90a169a9cb3d50729 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 11 Dec 2025 09:30:33 +0300 Subject: [PATCH 1729/1768] fix ollama package --- modules/nixos/services/ollama.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/ollama.nix b/modules/nixos/services/ollama.nix index b73333a..a856f01 100644 --- a/modules/nixos/services/ollama.nix +++ b/modules/nixos/services/ollama.nix @@ -1,6 +1,7 @@ { lib, config, + pkgs, ... }: { @@ -8,7 +9,7 @@ (lib.mkIf config.osbmModules.services.ollama.enable { services.ollama = { enable = true; - acceleration = "cuda"; + package = pkgs.ollama-cuda; # loadModels = [ # "deepseek-r1:7b" # "deepseek-r1:14b" From cf362dd3d9d6890e40a6bedc467286602b6a9823 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 11 Dec 2025 09:30:54 +0300 Subject: [PATCH 1730/1768] fix fcifx-mozc japanese input --- modules/nixos/system/i18n.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/nixos/system/i18n.nix b/modules/nixos/system/i18n.nix index ce15f72..5d60ff1 100644 --- a/modules/nixos/system/i18n.nix +++ b/modules/nixos/system/i18n.nix @@ -28,11 +28,15 @@ inputMethod = { type = "fcitx5"; enable = !config.osbmModules.desktopEnvironment.none; - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-gtk - fcitx5-nord # a color theme - ]; + fcitx5.addons = + with pkgs; + [ + fcitx5-gtk + fcitx5-nord # a color theme + ] + ++ lib.optionals pkgs.stdenv.hostPlatform.isx86 [ + fcitx5-mozc # Not available on aarch64-linux + ]; }; }; From da2d1cbbb241336fa31adb53d05cc6410a165e65 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 11 Dec 2025 09:31:15 +0300 Subject: [PATCH 1731/1768] fix xwayland-satellite systemd service --- modules/nixos/system/desktop-environment.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/nixos/system/desktop-environment.nix b/modules/nixos/system/desktop-environment.nix index 3410afc..5063e12 100644 --- a/modules/nixos/system/desktop-environment.nix +++ b/modules/nixos/system/desktop-environment.nix @@ -93,22 +93,19 @@ in swww ]; - # XWayland satellite service for X11 app support systemd.user.services.xwayland-satellite = { - Unit = { - Description = "Xwayland outside Wayland"; - BindsTo = "graphical-session.target"; - After = "graphical-session.target"; - }; - Service = { + description = "Xwayland outside Wayland"; + bindsTo = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { Type = "notify"; NotifyAccess = "all"; ExecStart = "${pkgs.xwayland-satellite}/bin/xwayland-satellite"; StandardOutput = "journal"; Restart = "on-failure"; }; - Install.WantedBy = [ "graphical-session.target" ]; }; }) From e946c3134e891c137c65977cd447763145cdbe88 Mon Sep 17 00:00:00 2001 From: osbm Date: Thu, 11 Dec 2025 09:31:58 +0300 Subject: [PATCH 1732/1768] ignore these things --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 438ab28..4004acc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .DS_Store .direnv *.old - +.vscode/ +.claude/ From f844d3423fbacca4d8316f5a1a4f7d4e0c296c94 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 14 Dec 2025 15:54:56 +0300 Subject: [PATCH 1733/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index b0e93d8..4bba604 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1765326679, - "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", + "lastModified": 1765688338, + "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=", "owner": "nix-community", "repo": "disko", - "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", + "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1765337252, - "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", + "lastModified": 1765682243, + "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", + "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1765065051, - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", + "lastModified": 1765684049, + "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", + "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { From 2068d65790c7223355c7d5e1b8a16b1fb0b9bf88 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 14 Dec 2025 20:22:50 +0300 Subject: [PATCH 1734/1768] add jovian --- flake.lock | 44 ++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 4 ++++ 2 files changed, 48 insertions(+) diff --git a/flake.lock b/flake.lock index 4bba604..6283f10 100644 --- a/flake.lock +++ b/flake.lock @@ -273,6 +273,27 @@ "type": "github" } }, + "jovian-nixos": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765526639, + "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "457a55ed77a105088a47cb55b9eccf7768559451", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "libcamera-src": { "flake": false, "locked": { @@ -393,6 +414,28 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "jovian-nixos", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -718,6 +761,7 @@ "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", + "jovian-nixos": "jovian-nixos", "mobile-nixos": "mobile-nixos", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", diff --git a/flake.nix b/flake.nix index 46be2dc..8824afb 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,10 @@ url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs.nixpkgs.follows = "nixpkgs"; }; + jovian-nixos = { + url = "github:Jovian-Experiments/Jovian-NixOS"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = From fcbe4cbbcfef4156135f1be64488ee62a2920d81 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 14 Dec 2025 20:25:19 +0300 Subject: [PATCH 1735/1768] clean --- hosts/nixos/tartarus/configuration.nix | 2 +- hosts/nixos/ymir/configuration.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 5fde18b..9e6222b 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -12,7 +12,7 @@ programs.steam.enable = true; }; - networking.hostName = "tartarus"; # Define your hostname. + networking.hostName = "tartarus"; # Enable networking networking.networkmanager.enable = true; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 539c889..4f00b3f 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -30,14 +30,13 @@ }; networking = { - hostName = "ymir"; # Define your hostname. + hostName = "ymir"; firewall.allowedTCPPorts = [ 8889 8000 ]; - # Enable networking networkmanager.enable = true; }; From 7b532599ae8f39b393e4601b35f9f720b772e223 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 14 Dec 2025 20:25:51 +0300 Subject: [PATCH 1736/1768] init ares --- hosts/nixos/ares/configuration.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 hosts/nixos/ares/configuration.nix diff --git a/hosts/nixos/ares/configuration.nix b/hosts/nixos/ares/configuration.nix new file mode 100644 index 0000000..a3e4fd2 --- /dev/null +++ b/hosts/nixos/ares/configuration.nix @@ -0,0 +1,37 @@ +{ + imports = [ + # ./hardware-configuration.nix + ../../../modules/nixos + ]; + + osbmModules = { + desktopEnvironment = { + plasma.enable = true; + }; + familyUser.enable = true; + programs = { + adbFastboot.enable = true; + steam.enable = true; + }; + hardware = { + hibernation.enable = false; + sound.enable = true; + }; + i18n.enable = true; + }; + + networking = { + hostName = "ares"; + + firewall.allowedTCPPorts = [ + 8889 + 8000 + ]; + + networkmanager.enable = true; + }; + + virtualisation.waydroid.enable = true; + + system.stateVersion = "26.05"; # changing this is a great taboo of the nixos world +} From 5dc42c0c2d8cf0c3ef02f44a1d805f0207a8f5ec Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 14 Dec 2025 20:26:47 +0300 Subject: [PATCH 1737/1768] update iso name --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index e985ea2..7617ba5 100644 --- a/justfile +++ b/justfile @@ -57,7 +57,7 @@ build-sd-image-pochita: check-git nom build -L .#nixosConfigurations.pochita-sd.config.system.build.sdImage build-iso: check-git - nom build -L .#nixosConfigurations.myISO.config.system.build.isoImage + nom build -L .#nixosConfigurations.iso.config.system.build.isoImage flash-sd-image-harmonica: # raise error because this command should be edited before running From 5210469682a9ee827f816c9bbd4bf7931a949731 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Dec 2025 21:42:20 +0300 Subject: [PATCH 1738/1768] add artemis --- secrets/cloudflare.age | 31 ++++++++++++++----------------- secrets/forgejo-mail.age | 28 ++++++++++++++-------------- secrets/network-manager.age | Bin 814 -> 814 bytes secrets/noreply-mail.age | 29 ++++++++++++++--------------- secrets/osbm-mail.age | Bin 823 -> 823 bytes secrets/secrets.nix | 1 + secrets/ssh-key-private.age | Bin 1161 -> 1161 bytes secrets/ssh-key-public.age | Bin 843 -> 843 bytes secrets/vaultwarden-mail.age | Bin 823 -> 823 bytes secrets/vaultwarden.age | Bin 839 -> 839 bytes 10 files changed, 43 insertions(+), 46 deletions(-) diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index 406ae1c..0149271 100644 --- a/secrets/cloudflare.age +++ b/secrets/cloudflare.age @@ -1,18 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ m+TzH0uOU2/6ti8oabwOPMBRWC3X2GvY7JojIxvVIUE -mkeLDnnaXmh2E1q9ueYzkstzqRZBVqY1pJ1XYlOC+oo --> ssh-ed25519 a9zBzw +qk1Gh0ocii1g/C2lDeZr447f9OMzmJM891ruFzoglM -n4kgDIZqDsuUOZqB15DHS7hJCijm+Ee+tlBsdgzdaHc --> ssh-ed25519 /0F2+A D1s3AcvFmhsxSaRzgsXR4+C/epvCdYVDCA7bmtNmeyA -KqhvU1bsC44PYcBGX9k7ply5YILCIJkVBK2sWKPXUVc --> ssh-ed25519 cs+R0A 1U34IFVZ/59q3rvTzYpb+fW0OZnbVB31moZzPj7UNXw -fX2eQ+M2nl+RbbKVpOP7N8a6v2zCBorOxmYFWW9gW/0 --> ssh-ed25519 uTfCrQ vsWkwNohHmWosDB2oNl5OWfaQqz4MvdBo+lPdSzCrS0 -1J1uw5g7vP0zMC3MT/7kuNsSekANW1UAxBetWTMqZZA --> ssh-ed25519 Ws1uag /9kr4cVp8bcLhZlvn08+6SH5zEKQ9LoLF235qThsJis -g/qs1nTGPk6TH75z7KyMCgimVPAkjSgaWBmgRNdTxWo ---- 1sGduFDJf3DfTO87Q3CecpHJ7A1dVqJWT1uMtBunk+Y -ۇ\[~.@dzLb4YשC -G6x -P -Υ^%zM:4bLf? \ No newline at end of file +-> ssh-ed25519 YVcKMQ h/uDnS6d2GQBexwOo+3f8NzwUN/yDKddEJUAs5AuIj8 +Q8unAzt6X8KDbc1Gr8q1Vn5A1vp4FmXfkdRdCtJGa7o +-> ssh-ed25519 a9zBzw RccBz7MEP5ZAgtNldXMnLTxMC6OPW1OXDve2uOcCHU4 +zNq86SMCH3NSPkMLZZ5A2bKw+6wGcFaByX8gVg4c31A +-> ssh-ed25519 /0F2+A +vu9JKX82tj9iH+qOKMoJO/o1YDu22y0BB0TRyNmrxY +TYOoZqPtEVhzAEPfrNL4THO6PVPybGlbMcN5gQvHtcA +-> ssh-ed25519 cs+R0A ltDqnQlmgOxZtzwpxZIXGVQUDKFC690bi7xcX4YRZAY +3t3trhFquGkeG8bi9XL/yuc/2h1FGtNJOJSCvA/qLIE +-> ssh-ed25519 uTfCrQ kzuFu3mgXVZ6KOj/aDCljvXDFeDp3gy/yoZp05MCz2w +7myQ6YzoPqljFivPjDJv027oVyTbK73P6zYclIFcCBg +-> ssh-ed25519 Ws1uag Ty4IIVMnRirMXuePYu1rE+ApDMcHN0YEvr3MPV/xLDs +ocrRBcRU40bQRrMiBauzwxMIFO2ZRoScfW1BYCi/GRg +--- /QIgrpL3MscNic2uP0D54is78M+mSuyHEMA61HrBU5g + XQ`@Nm#JvAQۙo){]K08oMrx.w2+:ɮ ذiQ5 \ No newline at end of file diff --git a/secrets/forgejo-mail.age b/secrets/forgejo-mail.age index 6bb289a..74db55c 100644 --- a/secrets/forgejo-mail.age +++ b/secrets/forgejo-mail.age @@ -1,15 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ fB1e9Vef8KAN7+bQTYhhmhPDRXFGNKuwx2XePcHQWTs -ZKnl/YZVE7PHwgrkXSiyw+p7EzxPPb2EYk3q3IISHsk --> ssh-ed25519 a9zBzw L0V8yU3x4UYCfOOznBPM5Ls4BkxgmgV8ZbG7AyqJrQQ -oHx2XSqRd2LMlHyucv4RuReNgsATDAV1SZHUk51whfE --> ssh-ed25519 /0F2+A YryrcK2spRGO7WWarf6VbBVkDFeoZyjBLPVf6mMKonc -RlB8w3OvOOrFr0Q1FB4HfOlzjuwPREtnhedcoFWkuBQ --> ssh-ed25519 cs+R0A dRcTD8GbPj5c95SYEZEvxJUxXg96dDkYP1hlGurBdAs -cezru8j9OlkR6wzelfN4bGY/SM9GB2ktCJNRiPjzDuE --> ssh-ed25519 uTfCrQ FraMU2qD5FVKRzPz+sQg65JqV79EF+q9jdbvAtisox4 -gL6CDNm8KPiFZ6NkrVHN2nR4O7BpUA2jGDTSf/hyUFM --> ssh-ed25519 Ws1uag cYjmGrTNlRFiuNBDiQrXmPTu9G6V5v72muwWGJ8w8yk -VN5kfbyHnxkcWJlsIBVRw6bdUJa3TtrZ5l7TR6iUO7I ---- cByQ6nHhBovw3oLm3s3f/DqwH+blXJuw4iS49r2nTV8 -B.f2SMى xV16|_aEa)* ,1hesuj't} :n?>lUъpa \ No newline at end of file +-> ssh-ed25519 YVcKMQ sK5SYxF5D/Go8zk4bljCxfCYhHLRJPdFBfmmruyTYAo +qfW7eOayEjjs/qNamhYbYBi2/wpv/u8peqyWF1oQIdg +-> ssh-ed25519 a9zBzw NvIq6PYP7jBlgNysFkt3mEMmNPMU2D2oA5JItZ/9uEE +hXCZVe7oO9SifHanw8WbjJ/Ore/u7HSz1pdi0HB68b4 +-> ssh-ed25519 /0F2+A Hhv9MNohRp4nrqEM9KbWu9W3uEm9hS7ZR0nNC3Oockk +Gat2NKyCezf2BcX+brHbmOBtWVigRHcnHx331g3trF8 +-> ssh-ed25519 cs+R0A 0lGS3b9hJ262w0KQQHzYxk3RBORlkpv2GK+n9XHcJQA +aetqm1DT6p84vHTgSh9wwVLnVPoxySX7q4t9NzAX7bo +-> ssh-ed25519 uTfCrQ KGWIy75aGTukNEoQjulULAP9lx/O9ys4bKMNCNlvDmI +dHQqacQygKM/zXo4LXg3U0NxmKQdvWXKruhW8sgpoRE +-> ssh-ed25519 Ws1uag 9PsqquvUt0euCNEL5yurA7sxlCXhmU5Uuz9vse5EkSA +xiNH5dO32MDSLAc0caItEjiPS3zBGFdYKRW3GciFINU +--- oh7SCdtc18yNFXikPI/458giEGDyaOP2VlGVPSimBzk + n[Ḟ}Đ(>Z{^[‰iі!o.T*zXZ36zہ/y?X[KÌ \ No newline at end of file diff --git a/secrets/network-manager.age b/secrets/network-manager.age index c79dfbc3fe2eb75a885615a8edab6230798cd93f..a5a87a2c072228d06d86860ac893e1952c65476a 100644 GIT binary patch delta 725 zcmZ3-wvKIrPJN|eREe8`sc(vhfX;@{ZXTEQ`r;B!~rB`Z5dRbaoadL2!Pmr;j zBUe;;n0B&bu0guLc4cmvp?_Ghc7{)dZ=i3OX_-f4fQfHrqD!JlTBf^)FPE;JLUD11 zZfc5=si~o*LZW4rQ&qWwL0V+CqiJNiVQ7+fWtLHrlUrV4fl*Y3agldqiMOd?x<^h$ zUV3&W`pHqIRmPPe6^Wr`mQF_gmX=kSmATnfE+yGTK0%(7;~B-n^TVs6QY<|a z%d(1GJR=J|!wQ4_Dojd({ZdlX{48Bca>6ny14}~ETr11DoT5^-gR_g0J>5!!os3K( z{5*0!j6%XvE5eFzy^)V~pE1Z0~}=z?5ulqtI|~?QApC z%EH_V6Rro>+|O1T=-Bye2@^Q{!g7Vr+(pl3i(kEOb=c*`J7e)D@9dPKTCModAU=nYnVw^xK~nTn6r6Kh@n@WOPOC@u2-N>Sb=FpR)uGh1(&X!LUD11 zZfc5=si~o*LZW4rQ&qWwexjw1udhj3T1jr6mtjD9p__hQj*nYnMp|Hgij${Pwx3Cm zZ)Bloa721KSH4AVNN!buNoHQ8K}3bOyRW&wc}bXOeyC?qS#o)~UzLxWVN^tzMY4(O z#E;_PKCV@v#*scI{z;)hS>9FN!4(lvmbvbZ*`6L=Vd2?cC6P&yhUt|iX<5EpF8+?b zfr;)O+PMKP&QWD1sb1RV5g}QbLB+1#ex^mP+HTHej`^7xuI1U2;~B-nLjpqmBF$3V z-NM3>-2;>SqoOR#stlcyqtcv$N}P++O^toDGcA0BDykg0N{fTcT+=IZ(%gOAj6L!y zeG}8PgZ+{s{0$63&3u!by>dd6BAn8E^K(5XpJf!UFG`Op$WP434DbsJb4fKXkH}3a zaEr9?iK;RUcQNs;4A0GQ49N1T3U+qnN^y?}FE=hr4-0dv%qa58w{Q$BGj#T_OmnaD za0^QePV)-(OiXkMO)@k=kAd)F!_vfb1-FdE?83ZMUym&3;@m3t!kqeWeT#qsKg%2+ z!;-w>(!jzHceCW&9G{fnY_6y(H$T5DUlZ4W2or+>?I2^rB(ESdkGzsZZ?}BUT%VM3 z1OL!)zm!PhY%X10U4@FY0v~?^!^BMeklfrLr)1C4$RP97aOa#HGymXpvm`U8B42;E zvQX^`3ohx-#D)Gw?dCoYzg@g$vV=pReWkP2^Xd@UU)d`Qg=dOHKjzMmR8Ktf)i~%O vOL^iXp5MKl-?di@J+7a1LA1v>fAbS2hF{B1)|j(Ro4GP%NnL2Z*qTrPy|DP& diff --git a/secrets/noreply-mail.age b/secrets/noreply-mail.age index e61b338..fda62cb 100644 --- a/secrets/noreply-mail.age +++ b/secrets/noreply-mail.age @@ -1,16 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ gvHiH6XLSdc7l70IkLA8jGv3TD0WOzDMeifTSRXfiyo -pzRrnvkjc8JJj7XqdWqw4q4CXLswREGQDLVo6CZQDks --> ssh-ed25519 a9zBzw TnFaVLa/ve8716uXJUY9wQ7+Akq4YXDyaEJw0wqlim4 -BGrVLHVnJ9BUFwm6vS+83pEhonfW5CKY40IanSeUwkg --> ssh-ed25519 /0F2+A DV0pBwSTHbWHZ3I6dzxZs0zlKk4cfNVTXwVwiG1WUQk -AZ5nxL6LeRN1M0I8WlUdB/blq3M+ZC96QDTYj1+eALE --> ssh-ed25519 cs+R0A Aqqtjv1JyrbC7jF66ff4juXRCe1uL+9RMchN66fIC00 -on+5kDexf2IzZUuWFD3OvgDObwX9wnY9HRvi2bwlO5w --> ssh-ed25519 uTfCrQ DHr+SFyihKsc9iPZwn1f2rTo8bxLIy9yqPjiMVCtLiQ -Rntyppg6sXc89Un4+LZOS9K4SQL+dwXvZ8d90Z6Ij6M --> ssh-ed25519 Ws1uag E4Nxamb9B+B9M6vlj4NxL4YE5ZKrsyLenfcKwVhA/Fg -XXSxM3z1XMbK4e8VS1UQ/z63qo+o4jVcE1VjLKaXIdg ---- c8c09M9t+o1pxFwW/r6mOcG37fM+DT8ppVtoGk1NPUI -:D ĥZ0Qcs:U54:MN -hp¿[c[A6 >d=yq;8@"5{?0*ut'< \ No newline at end of file +-> ssh-ed25519 YVcKMQ A2OmZdHVztwWTwdE1GYkmvAdfBe24eDCYQa6GM5n/k0 +RL3isMfKSZ/Vk5DLP1fEifUY+ZFhFNBBxApuU27Nr/0 +-> ssh-ed25519 a9zBzw G4Jb0O3rI9QD1Q1ftpkBfnisus9kSKQMDMb6v1dhmnA +cEVRz+h1ZbVuoo0N7MbBUDATRrZ4vO7prywHsClipUY +-> ssh-ed25519 /0F2+A ne7g2rvFiTK2HGSlnOQJCAshf9MxcbWmPtRPuBpIWiM +ZEQRbGNxITreCPKR0pd44ZlbVEh9B5EHHzya2zynpYI +-> ssh-ed25519 cs+R0A R2aR5a0sjFPSmxcfgoZBCh/0sD+Dyq3vzSHepucwuXc +SUDi/jOfvU5dbOXAH4bzowOPmXi7dNOoJzhKr/ycuOg +-> ssh-ed25519 uTfCrQ ODaUgBHpTFlfWdS28ck1cRh/NXy/QVPfUTikFY9U738 +ERPJYEd9awF/G94+zyto+5olcNKoa5vlhY+x8ltYKlU +-> ssh-ed25519 Ws1uag XkC8PV6h/+5uRxWsl1+DMk43gpSW+Gyp/jzn1Ia+zwk +VR1jtw1a/YnksiLXA5eQ2VCQ/QjvOA9B/rKA8FYNM3w +--- gy/4QQbSTY3afZjHA7fL2hVyuafqr++G2pn001kPBXc +!D,%[e7!GrPӍm)7VۨwZg8^ D$tLf~KXklV o~c<޸ \ No newline at end of file diff --git a/secrets/osbm-mail.age b/secrets/osbm-mail.age index 4791d4871dc4a2cd1450e7dfe964b42651fd46ea..2318aa6cc5c1de072e5f4a1133c0605f0339db12 100644 GIT binary patch delta 734 zcmdnaww-N)PJKnTzGrf2o^PPLQB*)=MMz$rgb+DSQ1EhMy1}lk!kt9RpA!-zV4pk#>V<(9+siyndV{c&PJ}2;~B-n-OTa|qSDh6 z^)t+T40DQ#!kjA&63sk3Ba*`{s(cFcE&W`RP0gLd3f&yJ61C0!GYg&d(*sQ-e4Q)v zGkprZauO{|f~s8ns*3Xq-J?pYd@>@8O7krypJf!UFAwodDG946j7;~bD5%USO)-lI z%}R60cTe;8E=@0vbocfR4aoPb$_(}8N_C3xj&jj2^)HXgPb~8e2?)>dPL52j^7b)K zF*k9m^fFEhFUrby&GairkAd)F!_vfbh5VA-Nd0o(6vwKtpn{yr%EJ06%L2Ece0LXP zUl#+XVzXplPhTU0C<{xcK&~9qbWfxF^o)W^XUFpJw9IVZia>AEBop_1SD(CssPf31 z%AySCki7H&UoKr;U4;^FSGNF*O2dpK^WrLlpnSJ$Pz&$M;NYV2)Jkpt zsIbs9N3MTMq7JfozPJ;*T$AI{`k;?N8g`*~WS;UH>+Wzke!RDH`|>ZLT`BK68wIkq zrJhZaIO-t(Z`NC%%gawC^xydv%gnL%+9W>nrPen8zp`>MbXe}YdiqVe+akBlC#Czp G3jhF63I*B# delta 734 zcmdnaww-N)PJL*aqiL~YftRy|hhvs`uu)cke^Pp3o@tq3XjO4YWkq>ac7*1lD>bHqg!xNdZcA(WU`-Qo^xSkl25RK zepRVY* zi(RX#inYV^qXLbp%KZ|(qAa~UJj_fBoDAHel1i&Ay)zxTf(j$N3<`>zldIe!orBGs zg5B~XOM)}>lY%Rf3ys5#OM=S%f&y}L^9@WUpJf!Uk918+FU!cts;r0#tVk=(3e$J5 zOo=o~GI2K!EKf;tO-c$e^au#^FV3{!@^#X8H*+a=PjU||@ryF6$SU_JDJgQv3Cj(3 z%FZ)(38`|4@U4upEcP$vLW_a$V#CtJbcKv8{jelcU+)4xpESQxuOQcY_w20vpd`19 zoZOI*q%5~WCx5qeZ4)!Y?0hbdw7_hWwA`qOVCTvlkIEcxM=#UjN5fV{lLU(eQDd_3pE zoyOFS{YEE^6`Xx{+nvn)I-Rd$SHYzTT|W)J@#fC`>*k`nqp~{M711B9T^gt>}y`A9bS^3 zlTv9?pdakYmF%2q7HaOUZC)1US(Kkx;cOJ-Yi5uZRBV`6>RXxWmJ;a^;+q;!m=YE` z@uPTncBG5DlUbpmXMmT7Z@76_M5d!tqEAGSzOR>wsbhv|R77}1NNH-YySoWjW|4EA zM{aR$g++3)Wu=c_p?gGnsB2}INnl8>cA#%$NV$Kep|)j4Rcij^ct-K?sPM#!vZ$mI z7q8+{Uw4-*i}1iK?Tl=X3X_bqvWlEE4+F9XBoxogHqhHOA>u5A}Yc%^i%vJJwu8t zf?Ygv69Xf?iX9EJOrj$4O`Hnc4J*sJjH+CUwOx%3P11u((-U(mi*iCr^V0$%oPtt| zJ%hdcT{5zwJT3AwDpK>&V<5cPurx7Up)5V5pu#C6ptPbOz#zl0JhDE~v^X_8CB)M( zurjzLDkvzw$ipx(+1%09fGfn+)Wp|2J3~9D&_A$9JItuuEz-it!X?lwGp)eSH#acD zxxmE8&(k<8nM+q!S0N+E(#62c)49~wJT228+rl#4IVvqL&p0PIOJ6@YIl?r@FQU@S zHzcUag3I7tN^s#MGo^Z^yIZ8+m&~}s?D@V?v}>#XvqT$LPKlrI^OB;^Z(3;lG&<+PT)G z@1}@4^9D16snfj@>!$O)NZ?7gb~AnWuWg5AUCSH~o4;nR-*(=Ryb`)#!^*OWpVzFd z(9vm?^j4Xj+u5Na zWYT2g7U#L}K!ts&Y^m;~zHr+>mf3an`V%8nc76WlvikhzCfnFh@n1W{Ot)DDKgj<- zwYP2aGX2}hrB~W}R%HDPzhwLV?v15;;uEG`c(HEHBbNStw&kxw!spy)Z(p2^~9LP3jUpH*4;(n;8?C1ug$Bl6dl_{EVLxNB@dPR{_ov Bu{i($ delta 1075 zcmeC=?BtxFQ=eE+k?Wn3RbrN#ms4q29O#@LQs$9Tp5~ohRqB|V8)EL{8|>+tYMhs0 zz~yh2T@~qXY8+aX>XjPhVPawC=;Z32<53!<9pK}YT2)kTY7%Jfk#3Ue%cX0lP+Xj$ zo0?)|YHDbykZ4)uR8_8E>}Tqnkzp2P?pc`?VQi3WCNAmYnKd99nLcpH~`L>7D53pH><; z@uPTnZcee6c~E4&VYWqXQd)_(qhWfMhkvGVqF;KBi(8ptVX8%h+2;KE|FaL16SNHaIbTsQw> z1LvxcB4dk^jLbC85T_u&4CgYhu&kgo1OMd7XBoxo%X5;G1M^ZmO-zg`1Jm3~EW+H4 zoijZB3*6n@%ltyaeDi%Gd~=-3J)C^G3X2NO!Xkq84RZ`jee$y-LP`sgqSA^3N_|6v z^j+Mt^&^9QjGPiJ(}FQ#AiUVHG%;PFD6BYJ+pyd@prAA()7L2@v)uyF zvNYW!rOL~~vb4Yj@(oK-Q1kto2qVFG2&RI-Cx(x@%po>NU4Eb#YJr3adFq>wk*<&7AJ>dWVC} z1`cJ8&9<*e(WvJWvCLB_#Mi>_tN|WzTN>0o&t5BV$UzCk6c+9_;h82 zScRPWE9dsd`FB;)HZ~d99k66Fw#}b(=)AzbFS>14u1QYMb?z&6Y<(zT<)EKEk4H|JUwiWXV1o75Dyk zZ$`C{_s@$PmmmGS}92;L99=CJ)X{S%oRA*_bid;jN*c1ZNBTVGuf8O@;U$j)HSE* diff --git a/secrets/ssh-key-public.age b/secrets/ssh-key-public.age index cd6128524c81b47c0e017a39887042a21dfca719..1d661c0939f1051179391945fa32c9067c85d24e 100644 GIT binary patch delta 754 zcmX@jcA9O1PJOAiab~D{rCUT%wzi{LaagHYS+-ebRDgS?cTu{blcSSCa%Pp2ab z371i6L0)ExWmcANp?`_1t5Hs%lXph4K}CgSX{xzTsGoL`dsUFBfsb#X1(&X!LUD11 zZfc5=si~o*LZW4rQ&qV_a+0^Dxp$zSUsh#OmZ`s4xSNS~m2q~tYi6*wdr(SvX0fBE zxpRR$Hqyp6Z_&;%^l0Q&k*Zp3fDMQc>mW<(%P~>0{_$5tMIM znOqqX;OkiKADESG9+l}*S!|J%o|qAs=sWo=qjbNOq}F zg-MuyNP0$uQ+jfiV^oxuxgd6%1I7zO56CYj}@=S8_@W}Eo=>U+8tTAG*_JDYf9coY<6 z<~q9NC+1mj>FVk#m^nN8yE^-)`3bIV zB+(S(*6C(law6=YwMdofA<*Qp8++D3`9CLUD11 zZfc5=si~o*LZW4rQ&qWwTY+1OPmz;lVVZGXuxYZsrCUgTijiArh?A$bUqxw#r*DvH znM+`Rr*Tj^SAjv8S5Qc4vT>3@VrD@>Kt^F+Qb38Xk#T@`VzzURVL+&xad=8um7jU? z#E;_PAt@1_2Bq3j?io?u7Ty*rb{U7bV9!~LQHG7VCkO!QrRTm!NvpJf!UcQ!D|FfcC(uguT(bM|%0_R9A) zbWP7U$t(*oG|wt?D@{-KNXc_@3=Xs4a?N-3&nokd$|x(bC~|R4PEPkM3JTBhHFEUT z_wqDz^D@o#b<|ID^hz;6kAd)F!_vfbg<_Xb$I$YuB2V)Y{jBWdsL*;NZ%_S-Fb|KQ zaHq&*pP~p)-=w1O%m{Dyd@gOHJfomAk0g`8;>>ja%4D<3P(O41pj6M&Y;7+$ci*x+ zx7;lEP_sOXWG-D@U4>wyh)T0$(iT%(MCJ77te^x%6x~Kj*O7UjMC6&q=SH{_m1Y zYTQ$Xr?o;Ck6VSGyfQz13a6m4vDoz;wv#{SZ#l2R9r9wzoZ24!%i=LrS8Zy`Laesx ahza$ySZ#bE#Wa~K#%YiJ-e=w1&H?~ZcLg*6 diff --git a/secrets/vaultwarden-mail.age b/secrets/vaultwarden-mail.age index 619385180d87ef902d704af8264f29e998dfc5c0..d899729c801ef9f62e2aedd7611b2d56617e98bc 100644 GIT binary patch delta 734 zcmdnaww-N)PJK>}U#@dzsAEcDL4ZeJNd9HU*ad^H5rT^>H&zDl&59Dt6BfFUiTM^3Dq@N%so$stWbXcGAwa2rl$< z&q{SRiYheB(JoA?bWU_ckAd)F!_vfb1?TKaQw#U>tWXbg?U1~Z#DMxxpPZb;^7LfC zkdz7|PtQnw-!gyqk|6Vle6Cy*FN4I=D1DDe&&bs9pirOGWEbBGk3eVRlH#<2P~X%r zC+DIR)9}g^6E0m{U4_W3q`cx>{VK=cw8C_KqoN|$Fbl&Br*Nmz3`6h0SM=l@N_h)Z8^-l>6^)>zXO>&WV$uB9lmI*gcM{BMwPIrHhvDe{t+ta#q^F4Qu zgf;HJ{Ol;xrdbT%{u#0OwNJlzO3m7=Nm{?vHTLDZC$pzyTy~kr|01dR-NiizKE^-Y G@E8EnF9lx! delta 734 zcmdnaww-N)PJOM{u%hUXFo*vA#=r zpl71FYhh*}SD0mBX}DQRvVn1hg|?rIiLZ}QvbmwYr=@vCuBC~kQL$r)nUP;uRi?A= z#E;_PL7s`3*~K1yN%^jc7Oo{;CIOyhl_7?n0Tz}%dBIs8B`LwV8D*|n!N$p4UX`T= z1x~JM?qykyiDh}Ih89tYzG(#}QHA<><)*$a{zf5Dj$Yp0rbfk+;~B-n-9jP~a}1MA ze6@2!Ei&DMUCo0%J)DZXb2EJNjr>ad(=(EyJlrx0$}&Q^QX~B>eVrqm3;Y5qEK4IJ zO@chMjZKpZT=Oj|EHb_IJ=SbFXrA_RkD4 z^i3@bb1}+G@lVV0Og7I7@h=H;GtZ9XDmL!stnUaGwEJ9Gaj&oS1W-}Qr~U*B&#b3bS8 zjXjH&2TcFBV9K+@3;j%$-gOo}IQw!#?vLJoPgYlo3mg((QL*{?#EX@GD^!yAUW{l7 H^g9OtIAsKs diff --git a/secrets/vaultwarden.age b/secrets/vaultwarden.age index 5088edc6b5ee0bea9a32c0b3810563a9d9171ddd..9f184fc7d30e1cd68872dbaf9c89e31cf6a13d3a 100644 GIT binary patch delta 750 zcmX@kcARa3PQ7`Kwq;ILdSSVlt51}ho12fnb7f|_lSiPXK}wZbgmIp>cR+AbuBnM( zHdkU;pi4xQk71Q>ey*2eh(&TiW?`^zQJzJGLAs%%XO&ZEq>pb^esWr3GMBEMLUD11 zZfc5=si~o*LZW4rQ&qV_se`!WVaB`Nbft!g}QEEY%u~%tPS$LJUr?X*V znYWQ!hKp-Cmt{_=Nsec^nZ9;nWpY5JU#Uk~NsxDGh;c+(vW2CeepG}dvL z#E;_Po<-j2Nm=d{p3ZKbUWUG9mBs$K&PJ()Zj~;s1}1J{#Rdfy-eH-=Awk7lDJI&v z8NsE&iTR~oA?BvOjv2+l*~Wz?`B`qhInI%3!Is8F?xvBhSrx96;~B-nb20-eg1kZ# ztMVOl$_uM15)%_6N=nT$&ApBEgMEW5bF-5&l1)<#{VFZEiplLkEHCkPPAPOXsr1dO%yh~%2ro*k zDyqsebMbddPtEo84o=EOkAd)F!_vfbg%mUAZ2jy=7yqi_+{onge3SZ+MB|VO&wx_L zh|uJU{M0J*4DTrY@Zw;PbS~%YjHIIC0-q{(Z|?vTi;}DYxA5c)FQX!NeSg!`pbYJt zG~cAs!tel}KrUTfU4^JBm(mEYY_D{`s5~DRM<+`oU+v;zFV`Sf|7?#a$DpL7;&jh~ zAoHj^S1!HoY0qUOo>iuvd%JwK$@(6)8JWuuv_97QU9yHje1q5Y89m=BMatQx8Bf}x zcAjO@xo%y~__!DM_c!kfZ#)$>q2D+_h<{7T^T-FA3*{=C1=4=S&)F|7*eNc;{CWSL WMd8A>0@8fuE+0%%#ipLo+5!L=y9R&& delta 750 zcmX@kcARa3PQ9h0NxoTRVX&{eL3pKeVQG}Fb7n|Il%a91iASVoafD;GqoHZAw|lC4 zIhU_-u9-nuYE)E#cVv)PiFUTDL9%mRWJzRLTCsmbR%K$KNkLJhQ%-VmI+w1ULUD11 zZfc5=si~o*LZW4rQ&qV_Xn06Yh*4y5dO$^Zpr>P@v74(|xv^(KTA-nJqFGi!NLD~@ zMyjWOYI$WkSDsf+wxOp_c4m2KVnL9JwsvS`fsco&lV7TKNO`WOf0VILKzLMSman<% z#E;_P-ueLneg>INN#r-OTfyLp{y?90Q9dpJf!UFVjv7&NK+iH1Mx-E_5=pEGtMa zNGd6|a4YZ(b4+%NEH6mP%!rCeFD=jKa&mRA%J8i42{R5fD@aQp%uk`k*axMr&kAd)F!_vfbh3xDyPao%O#{&NfAEO|jMA!Pn5R+2>v~Z^o z?||fh9G3{g#HjMZTrYj6bT0qk&`Kkx!m0psw;abX!+dj7bDw1G@N$z>fBn$3vdYY0 zmm+r$UvK{`6E0m{T?JE@^4z49AV1ffsLJe!ByEp!PajX$>|__?FmLzl2q$kh{Zc>Q z;1FMva;|C(Pd9tP37x4Pzu8?o@7JnXO-p6kQNYsTr+uhu(=)D&kck@i8n;H*3%s&> zy8G$sMba0u&S%se-~aoE_dAQ)ca}jSXL(;0o1RPF%6PKxXK9+M^r^1`bFK)lIlC(4 W@Z9P99#nAo$?$5t|M>Uc%7XwBZwd_n From bd20c97f7676261c3c59ede0e3e491f255c0e853 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Dec 2025 22:07:08 +0300 Subject: [PATCH 1739/1768] rekey for ares --- secrets/cloudflare.age | 32 ++++++++++++++++++-------------- secrets/forgejo-mail.age | 32 ++++++++++++++++++-------------- secrets/network-manager.age | 33 ++++++++++++++++++--------------- secrets/noreply-mail.age | 33 +++++++++++++++++++-------------- secrets/osbm-mail.age | Bin 823 -> 1043 bytes secrets/secrets.nix | 3 +++ secrets/ssh-key-private.age | Bin 1161 -> 1381 bytes secrets/ssh-key-public.age | Bin 843 -> 1063 bytes secrets/vaultwarden-mail.age | Bin 823 -> 1043 bytes secrets/vaultwarden.age | Bin 839 -> 1059 bytes 10 files changed, 76 insertions(+), 57 deletions(-) diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index 0149271..8eb6d21 100644 --- a/secrets/cloudflare.age +++ b/secrets/cloudflare.age @@ -1,15 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ h/uDnS6d2GQBexwOo+3f8NzwUN/yDKddEJUAs5AuIj8 -Q8unAzt6X8KDbc1Gr8q1Vn5A1vp4FmXfkdRdCtJGa7o --> ssh-ed25519 a9zBzw RccBz7MEP5ZAgtNldXMnLTxMC6OPW1OXDve2uOcCHU4 -zNq86SMCH3NSPkMLZZ5A2bKw+6wGcFaByX8gVg4c31A --> ssh-ed25519 /0F2+A +vu9JKX82tj9iH+qOKMoJO/o1YDu22y0BB0TRyNmrxY -TYOoZqPtEVhzAEPfrNL4THO6PVPybGlbMcN5gQvHtcA --> ssh-ed25519 cs+R0A ltDqnQlmgOxZtzwpxZIXGVQUDKFC690bi7xcX4YRZAY -3t3trhFquGkeG8bi9XL/yuc/2h1FGtNJOJSCvA/qLIE --> ssh-ed25519 uTfCrQ kzuFu3mgXVZ6KOj/aDCljvXDFeDp3gy/yoZp05MCz2w -7myQ6YzoPqljFivPjDJv027oVyTbK73P6zYclIFcCBg --> ssh-ed25519 Ws1uag Ty4IIVMnRirMXuePYu1rE+ApDMcHN0YEvr3MPV/xLDs -ocrRBcRU40bQRrMiBauzwxMIFO2ZRoScfW1BYCi/GRg ---- /QIgrpL3MscNic2uP0D54is78M+mSuyHEMA61HrBU5g - XQ`@Nm#JvAQۙo){]K08oMrx.w2+:ɮ ذiQ5 \ No newline at end of file +-> ssh-ed25519 YVcKMQ SzyXi6Hh+7+sQm4iiq3SWlo3cxGTwMJPXX4w/URFqXY +7Fnzw93NKiXKUpjXG6yPHQdJbdKaEBuN/YdYgI8jEJM +-> ssh-ed25519 a9zBzw vlb5nsi7E2isvsbVy6R4D2281w12ECh/Gzqs/ZZwPQ0 +VVcH4026EgunyP3fRNPWdOebZQ1DibJ9BXaaThjcFGc +-> ssh-ed25519 /0F2+A /7GRDS6ov7gkA1HKRznl6DZocf7jEG035xaJ44ThpDY +WQRu+gaUlymUMGoS16hKXVHXBTNoTvkXGe9eiu939yY +-> ssh-ed25519 cs+R0A nIeQDSProYaBOHeZfUuPSQK8CYP/7MxkV7OQenvannw +AXrgOBVlmEb08xtwmt9lBHNDE84O4x1BZEH3UAh7EtE +-> ssh-ed25519 uTfCrQ IqE4MACP4xUoSVe6NK0iey/frxjNzswrBH02z6psxig +LsZaJGENCXT3TY/Oy+EiRA9ncEUQcAWGJiYjMQyX98g +-> ssh-ed25519 +XMaYw cAtggUEmRxLWXVyrqg/esPl2xqE/BobEHltUuCkBqUs +7vDbubTN8ax9JZ/KuHHsg91OcK6u62Dq30toAJNjGUg +-> ssh-ed25519 pXo91A jvPPX5jpCf0ozamdvLoxtHLYrAcSz5ofQulizhxGqBE +ZdziYX0svKx/xqPuzvv0GhwxLiBsNPDDtCbKm6EQF6Y +-> ssh-ed25519 Ws1uag /JsuI0j9mORYt/sdA3l/oXopG1SG+tJaaTLBMeAtF2Y +spd+t5srZZSxiKsN9liqz9K4UmM/ULGb0BtUZJY3C38 +--- AzjTBh7gqXNPN3S9XcQVGMywIBhFdou67GHvoi98Uac +? ssh-ed25519 YVcKMQ sK5SYxF5D/Go8zk4bljCxfCYhHLRJPdFBfmmruyTYAo -qfW7eOayEjjs/qNamhYbYBi2/wpv/u8peqyWF1oQIdg --> ssh-ed25519 a9zBzw NvIq6PYP7jBlgNysFkt3mEMmNPMU2D2oA5JItZ/9uEE -hXCZVe7oO9SifHanw8WbjJ/Ore/u7HSz1pdi0HB68b4 --> ssh-ed25519 /0F2+A Hhv9MNohRp4nrqEM9KbWu9W3uEm9hS7ZR0nNC3Oockk -Gat2NKyCezf2BcX+brHbmOBtWVigRHcnHx331g3trF8 --> ssh-ed25519 cs+R0A 0lGS3b9hJ262w0KQQHzYxk3RBORlkpv2GK+n9XHcJQA -aetqm1DT6p84vHTgSh9wwVLnVPoxySX7q4t9NzAX7bo --> ssh-ed25519 uTfCrQ KGWIy75aGTukNEoQjulULAP9lx/O9ys4bKMNCNlvDmI -dHQqacQygKM/zXo4LXg3U0NxmKQdvWXKruhW8sgpoRE --> ssh-ed25519 Ws1uag 9PsqquvUt0euCNEL5yurA7sxlCXhmU5Uuz9vse5EkSA -xiNH5dO32MDSLAc0caItEjiPS3zBGFdYKRW3GciFINU ---- oh7SCdtc18yNFXikPI/458giEGDyaOP2VlGVPSimBzk - n[Ḟ}Đ(>Z{^[‰iі!o.T*zXZ36zہ/y?X[KÌ \ No newline at end of file +-> ssh-ed25519 YVcKMQ twM+pnzRQCyp4sUZC0G9JS1o3kNoZt8bIOiIPTgYilE +6WplMAVFAZBYdu2pKm5jrNhq2E/IZq6xJMo8TjAWaEE +-> ssh-ed25519 a9zBzw TZW133xE+eHr4D8FSpYuTubbYI1SOmQpR1R+9XK8/X4 +Il7y8pXPj4+/j8lwOYdxhbdofIoJf+U4lfM5774YAhU +-> ssh-ed25519 /0F2+A Dg6FD1avIaSmMMVLnU7q/zr70UdgBFX80XR2/cRkHVM +wqrSby/Sa8X1QBUM/sQJUKOUHYPGovNv2KAwDvYr7EE +-> ssh-ed25519 cs+R0A V297jWI+pRX0o+oBr3LiT1NkxfVpENViRMdJkAvXoFY +lk59YunSh3Dc9fjiFbWBil1f/Qv/WxshE2GL6YJfV8Q +-> ssh-ed25519 uTfCrQ DGURQ0SqB/pOWRjeJX0CPRPKXCuiUo+FDoBQQ9RAGFo +VaOmhhLsPBUAskQrmxq3qiFXeJMFkUyQUpzVcN9pbAg +-> ssh-ed25519 +XMaYw FXFQDMjuxdxjTHKevJZej5Hc+XCSh/shzonFZPYZSic +bL0qvNC81a7RG5x+2QRWoWT4L6BRxVkUS4B3cO0+QY0 +-> ssh-ed25519 pXo91A dsLQoEohfsIzlG/j4KJbWvhYVQJ+4luMeqg0tGHSSyo +sTZGKs3Jlw0nJyvyAPaFAb3LQQ1O+6LkxyXdO1fb84U +-> ssh-ed25519 Ws1uag zOBzTZYMZ0ozKyN/SifIR2D83URrCwGZ1FfKx3R+m1U +p6j3Da/H7nLb7sRmvAUlNUEStyB24fhTt3zYrPLGJmc +--- fN8gCGfrxEXuJbBc1742Iu/o8Am61wUs0/ZieTLeemA +'؏4k&Um i:Xgl:-EV$TT˃FY*٣+Z5 wNO.e 0;;} \ No newline at end of file diff --git a/secrets/network-manager.age b/secrets/network-manager.age index a5a87a2..b6df84c 100644 --- a/secrets/network-manager.age +++ b/secrets/network-manager.age @@ -1,16 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ y1ZtF05Md98/ht5VyiIoMgID+e9JeTgvfvscSZLR3FA -ZwV+cAm0gO+ymv1OVs+hLxMQMV5vHYP4MiaDa4fiGHM --> ssh-ed25519 a9zBzw 0fYkA5Yg1UbKyj2bBnqp2Zh3rKYtK51gHlxngWwZ7iM -8WsgxJEfw/8Y9IVl4p+AV7bg9SePgpMvyZ6GkPfO220 --> ssh-ed25519 /0F2+A /GzHeLpRDlSoTcGL5HTCBxjillIbZlDICAuL0O800x4 -vSmJYDc6PoPC/cZ5z3yTxaUv9B2O99ziymkzDtkrLRI --> ssh-ed25519 cs+R0A oWzZd9IavjrDIYqIVqSNx4tSNdefN9DtlVhyQtTfEyw -BZe+SkrcIFuSB24XNHmH2TVexWBSXSRiL7xrzoNqvgo --> ssh-ed25519 uTfCrQ k4GxWJ88sXN4AiWbk5IRe66uo5dZPwL0LbAtKYbDKW4 -Y2zntvR4g1BCwalML6sJp5tGPWNtjv6OoQPPRcc+7lE --> ssh-ed25519 Ws1uag P8JAx4/pvcCNtr19fVk3iNuB9GVPcIK9f0kMf2kdWVo -q17GOOnoLz1hTcsbNbVH+JB7/VFyAgG4YxbOO+MjOkI ---- kifpEgM9FFBnEalhRxX/o5kKpQQdk+2UWK+k65yqmx4 -Gy0,>V9L:D3>"Z:oa].|Dž}R` -"/*,Аŝ>4a \ No newline at end of file +-> ssh-ed25519 YVcKMQ hUkLzQpcg8I74J+2K626TtBhAIqfBPn5R4XAsWjyHXE +KCzMezgqED0lPS1AMBxF81Z6PWn1ZufZtnUzKWSjmAk +-> ssh-ed25519 a9zBzw Y2dL+hibnHijhuWZNSm4gSlAV6dhOCdImFTipOPEzyQ +3Se0VxqDp/4qsEmWVNI2Gm/G+R4QRawEKYiGZYYNpr8 +-> ssh-ed25519 /0F2+A RtEqouo9EEMV4JrpB7FguIKpMRLo+7Fn1BR/cWSvVXw +AMhcc35y4MfOEj8cW9EDRhs8rRc13B7nLk42pZ/hzpk +-> ssh-ed25519 cs+R0A UrPiktU+uoigQmfm2u3rhnx85K81RkAWEAaLoTWO4QA +3UyojRz0mfZTDiJbE0X6oxWRsDfag/Tfa3QRh1L15Ew +-> ssh-ed25519 uTfCrQ B6AFBC2gHIZ/w9f0JDwN13jRftVLju3xv68pRXLYoBM +5lM6VNbvVZx0ZT20h7MHtElEFWU4eYDglGKpYdJhRhY +-> ssh-ed25519 +XMaYw F89oI5pzX9edB683zkxUfXbUQjZKBKdalWE3I6x15gE +vVBHGLkeI1CDSHI2nToS5COxmBfASk0jlEps/P1nXnA +-> ssh-ed25519 pXo91A TsI8R5cvx1VsitT2iAPGDxMjLMKWqB9ymbKUx3Fh8xw +Tpu0Bjs1hZgUdUPtGCu+fgfhnWJ4ru7IiJOoKCLPeh8 +-> ssh-ed25519 Ws1uag 7luVKNhyPaJiq+d0NwyRqnHpfkqnGvzl8J384+akVQg +x8vX/WkEHEEJlR+puxkeEWd0lnCuRit+bAYHMaRaIyk +--- lM4+YgY122wOGXtdQYZEZAWq6L4IBPQegwXJVrjhuxM +{p[;5`+.]i غI$ۦ w> S~H2۰_*ħ4Xp`EtGz& \ No newline at end of file diff --git a/secrets/noreply-mail.age b/secrets/noreply-mail.age index fda62cb..30fa250 100644 --- a/secrets/noreply-mail.age +++ b/secrets/noreply-mail.age @@ -1,15 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 YVcKMQ A2OmZdHVztwWTwdE1GYkmvAdfBe24eDCYQa6GM5n/k0 -RL3isMfKSZ/Vk5DLP1fEifUY+ZFhFNBBxApuU27Nr/0 --> ssh-ed25519 a9zBzw G4Jb0O3rI9QD1Q1ftpkBfnisus9kSKQMDMb6v1dhmnA -cEVRz+h1ZbVuoo0N7MbBUDATRrZ4vO7prywHsClipUY --> ssh-ed25519 /0F2+A ne7g2rvFiTK2HGSlnOQJCAshf9MxcbWmPtRPuBpIWiM -ZEQRbGNxITreCPKR0pd44ZlbVEh9B5EHHzya2zynpYI --> ssh-ed25519 cs+R0A R2aR5a0sjFPSmxcfgoZBCh/0sD+Dyq3vzSHepucwuXc -SUDi/jOfvU5dbOXAH4bzowOPmXi7dNOoJzhKr/ycuOg --> ssh-ed25519 uTfCrQ ODaUgBHpTFlfWdS28ck1cRh/NXy/QVPfUTikFY9U738 -ERPJYEd9awF/G94+zyto+5olcNKoa5vlhY+x8ltYKlU --> ssh-ed25519 Ws1uag XkC8PV6h/+5uRxWsl1+DMk43gpSW+Gyp/jzn1Ia+zwk -VR1jtw1a/YnksiLXA5eQ2VCQ/QjvOA9B/rKA8FYNM3w ---- gy/4QQbSTY3afZjHA7fL2hVyuafqr++G2pn001kPBXc -!D,%[e7!GrPӍm)7VۨwZg8^ D$tLf~KXklV o~c<޸ \ No newline at end of file +-> ssh-ed25519 YVcKMQ h851CHrJgYTaKHgJdlLS3LIOdTqjSk5fTKjhKPf0t1A +vaPG9McfZ4be8CFwTrwWfJn4DpgqPzxx7WYyeEj8UbU +-> ssh-ed25519 a9zBzw tLZ6/UtnrrHdwWGHHuVhEKjuHJA7vibgyY5gHWwweEg +sTl+GnxlDLBsnd/lVz9XhXyVn9bJlOH8xMufg5+IkM4 +-> ssh-ed25519 /0F2+A zdrfMxNASfdGZ/KOI+OA6MywM3k4jcxp2CzjP7UDR0g +j873TXjMAjBf1Ka2Zi25fuLjxPH6DAE/RW1K3yt2DDk +-> ssh-ed25519 cs+R0A QQSSGv/Nu8cgLKERePAK0YyT68J6GwmuBrhWlDUkZlw +USxzTmMUZ/3UIUBBw3nMQbd/Bw0Bq7QL7VauWO5yd1g +-> ssh-ed25519 uTfCrQ nvf9FeU+BK5LTIAY3+L21xs2VAAMIb9iQjeVBeGsTS0 +5RYl31fB2Fkn1EEKv3WNqCq6Li/qXAYh265iElGPOyY +-> ssh-ed25519 +XMaYw JGyXPoK7UDBVgTpMDm+PihxpEEtiJIf4SoA48WUk91o +Jcth8v3ypTExUS1G66v9qJ3JYPu6U3MQVlKFD7JM5nY +-> ssh-ed25519 pXo91A BcL0YGLtMVkuXDNRTJAvJsxOXrVL960XbPSEkav9Gyk +vjRQoAVUP1ds94d0AjQO72Cb7dLcC3NIqDBKCixUYb8 +-> ssh-ed25519 Ws1uag m3HnmClnphAgbT8PGUawG9u3OSw14/+g5T4AFwpnbHQ +R//dKq/EwuyD5d/gh9L/sg8gO+GeXpT/MZmNBw+t7Rk +--- NXF0smHt86//62Vb57j5wah27/muZnWFuDUSzjopn48 +}>PE@̉gߑE9MݐibT4PRbg<4$] +D7o'eb7 {T(Jtot;=ybRqr \ No newline at end of file diff --git a/secrets/osbm-mail.age b/secrets/osbm-mail.age index 2318aa6cc5c1de072e5f4a1133c0605f0339db12..9dfe7f3e1ea3157143d43a2c4bccf10a21e15661 100644 GIT binary patch delta 956 zcmdnaHko6BPJK>dx{I-~YmiHBhJLQTiMx-Zwy|fCMUH-wr+1F2S9!T%l3Arsaz%iP zFITpKqmfsLX+d#ehD$|?Ns3{1K(>F1Yp_9Nh+~;{YM7ILYKDK6duV=HF_*5LLUD11 zZfc5=si~o*LZW4rQ&qV_MO9HrL|Tz^g@Ip2WMW{7xm#elc~F3USgvtlNO)FKMpb26 znq_cuxl?5%S4p^EKz5E{MR{alSd~YizH4cIieJ7-W@>m@MtPZGK$MG#QAVPHPf3c& z#E;_PN#OxrSp|8<29>U5F3FLlfga_4&W7b~8R3;B0Tt;~;Hgiccjx-E4tI7!E3imBfH*`$(NGi`uH;OQh2nb5bFb%B8);Es` z%dB+w2=>}m^o*kHeCPBeeeK}lir^r}6Gz`nV;9phpOBD}@DQg^3k!>g>N*&d4nfOYsY? zFEtEHPV&mhvEVXF@d?Q{E-XrO^$4+W%&K%UO7b%cD=~4b2=+}4E%HpuHZo5vjVw(m z2t~Ipyx6cbFGuO~HBiDc{_~G@qgCPqu z8y4y3Y@n;Kz&Bkj r?S_EI=49*om8Axo5~siL;ePmClmFINYsKVN!8i9k_c0hhvfc~;)`v%Q delta 734 zcmbQtv7K##PJKnTzGrf2o^PPLQB*)=MMz$rgb+DSQ1EhMy1}lk!kt9RpA!-zV4pk#>V<(9+siyndV{c&PJ}2;~B-n-OTa|qSDh6 z^)t+T40DQ#!kjA&63sk3Ba*`{s(cFcE&W`RP0gLd3f&yJ61C0!GYg&d(*sQ-e4Q)v zGkprZauO{|f~s8ns*3Xq-J?pYd@>@8O7krypJf!UFAwodDG946j7;~bD5%USO)-lI z%}R60cTe;8E=@0vbocfR4aoPb$_(}8N_C3xj&jj2^)HXgPb~8e2?)>dPL52j^7b)K zF*k9m^fFEhFUrby&GairkAd)F!_vfbh5VA-Nd0o(6vwKtpn{yr%EJ06%L2Ece0LXP zUl#+XVzXplPhTU0C<{xcK&~9qbWfxF^o)W^XUFpJw9IVZia>AEBop_1SD(CssPf31 z%AySCki7H&UoKr;U4;^FSGNF*O2dpK^WrLlpnSJ$Pz&$M;NYV2)Jkpt zsIbs9N3MTMq7JfozPJ;*T$AI{`k;?N8g`*~WS;UH>+Wzke!RDH`|>ZLT`BK68wIkq zrJhZaIO-t(Z`NC%%gawC^xydv%gnL%+9W>nrPen8zp`>MbXe}YdiqVe+akBlC#Czp G3jhG_eFeAx diff --git a/secrets/secrets.nix b/secrets/secrets.nix index cc57063..273f5ac 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -6,6 +6,7 @@ let wallfacer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOr8pQvLsNCHQdsBKWpziYTPjBkEcQy272kZ5Gqoaatt"; apollo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINsV8e8veX5/weeC8he+31aiNVZfQ82BpvSzARSM1uZF"; artemis = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd4wF1LicIvwpGQyajJsiUjeLV84nu4fsyJzxhbS+xK"; + ares = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAO6QaUz/k8azKpYe11HhCxW3agYAmv4axZyHNAsr/zF"; osbm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"; @@ -15,6 +16,8 @@ let pochita wallfacer apollo + artemis + ares ]; in { diff --git a/secrets/ssh-key-private.age b/secrets/ssh-key-private.age index 038c745321d5d1e15103828a5ee2897b252f39b0..a171c1a710ee470373ac392795a75378e0395dac 100644 GIT binary patch delta 1297 zcmeC=e9ARJr#?40Dm5q9t*Y4AEI-l3(;&py)1}BeB)=p)+0{ELFv2{ntSG=FvCzf2 zm@CZG-P1WZwJ^lrFgT~!-#ODHCAY#frPM!9zs$hL*P_tVAk)_)JEz3Yl}p!7p}06h zH#Nn`)YQ;YAb=!pJ4f zGq|iGB+uECE5P5-#5}?!TiZL|G{3yUKgqn*x9tlXe@ z;z#lDT&JSI$g+}jf(?qyNQQNdmY zMMXJ@MgD%iMJ^c@K3OToSrsNmnISo0rsX9@=@|wUmSF~5B?VsoRUwsur2&pEo)wm* z#+k{UM&2Q1;o`rsbsPlp7~G zmxmV^o8)$HJ zfnS-Iwy9HgGP-pI5&4#ejtW)jWqzT>Q6aA8DLF=E;ZA}2r6q|K#+BLG+WzH^d6s#m z^{EAk+R256j*eWOm3fH<=7#QO+7)I61|j7xiRPBYRTWMJk-3S1p2fwU<}R6uMivo9 z$>r$Qg%=x^CZ;PG=6EEAnw1)wmpP`FmX|nM-R0JkFFVk# zWM=1t2W5waJLXzC1*8;&Rl2y8CsrA{m*=PFR2KMKI+~bxW|o(QWjW?^t+?Qv9M4|F z#VJ?JIsM5YnfFZxR5g|y@mGs#ZK{vq^((npac!=YcQ)7A`o8VG)m^`)pIMa@F@NTn zuZ}!U`-@bbY*i83yX5Lz4Q`G@5qi(1$}(=)EfuF)(K_?s5uYov%R>JDlewW- zzN+nE*7RjlH?RNDH*+q_ouekn=~Fi`#NYe1!0YCk1nZebE`=)7d^6{ZMYPxWiWF?R zaHIO2i)__}h7^nNz6j&`Ow~hdGY-@ojNK9!tS-b5yleA=udYk>7*DwCa8*I@>9H#h z1bsu#8h&%-uUhFpwNQ51{`gZ4C0?I11payZg+(rjEM}9qapYUE_3gt6HKG4EC;Z6Q z{%dZMDzhq3cGFky#ridDj|9wbzxLB?J)0J^&L(%Ul9GR3wvD*6&9@TnW%cJwUN=WS zT*x7@N9#sm^Fi&zE36BzE)d*w*XH=kcMY@F$Lqg)x#^UrM9%!Va{tA*u-mQ42uQ_xsExFz}P3RT?D2(vR delta 1075 zcmaFL)yX+Qr{2A^Br>$Xq{PEK(>W?Ls4_S*Go)18uQ)s`+b7boqQKn6LOU|T%rz<^ znajdBFEKMK$)eoDH#@DU+}S-j%e_Q9&mbo%z{fSGJk&SW*eBJ^-JsClmrK`9p}06h zH#Nn`)YQ;YAKJG>-6 zC#BM)KtI@(E7>{KEY#dx+q^8yvnW5Y!r3Uu*UTU-sMs*C)VDI#EhW+;#5XmdFeNN> z;z#lD>_``PC$mCB&j2qE-*EG=h)hSPM4yNteP1sVQ^yR`sEF{2kkZs(cXt!6%p&JJ zkKE$i3X9}o%Ss==LidRDP}j;ZlfaN%?LgnikaGV_Lv729s?_|+@r>f(QQ?UdWl>2b zE?&i@zV0qr7U6+e+8Nm%6($*JWfeJT9tMt~ZXw1l9_86wB?iXs-bHDSiI#EX^!72)~CDM7xI&oYYF2c@`Ymn8aBL{x-j=%@HcdWIBP z1iN_TCI&`&6+0ScnM6h8n>ZD?8&;Nc8CAIyYr7g7nxqGnrYGiB7UhJL=BEWjI0dB^ zdj@;?yJTcVd0OOWRHWvk$3S?oVQFHzLRor9L4{LDKxsumfI)^~d1QT}X>n?HN{FXn zU}bPgR8UZUk%wVovbm$H0au8tsfn+5c7}FPp?_eJc9>DQTcm}Pg-f7WW?F%tZ*E|Q zbAgGGpQmwHGMBEdu0lqRrHg@?r*o;Vd0M7HwuNQ7b5vSho^eiamcD*)a)fD)Uqq#u zZ%9y;1((6Ql;FZiW=i!+cehBtFPU+N+4Fs)XxCQ%XNfkhoDx6Z=Osm--?Y&9$%mx} zdjEW4Yjf<&Wqr10!k#sPkv?vk8fjA}%F2ZO`eSU!`KZ+D5@+N}bDanKpJc^-Q-6Kv z?Y)z#9;*(lXWp}^(eB{04Aw1j!4qCwp2}Aw)GVs_lEbUzv~#UV$%Fl$`s#nI|9y1% z-%Sy9<_%^BQ>S|+)=lSok-(E~?PmJ$U)v7Lx|TT}Hh;}rzwNvsc_nnghLvR#Kd)I^ zp`+tuyS9v{)mSU$*zS)-#^1k{8uX-w<(0Zy>ReMk;J!gZYsIm>m%mC(>8&z5x3fb< z$fU`}EzWb{feQOl*;3s}ec`r&EVJwC^(RKE?E3u8W%c>bO}4S2;=gu?nQpTRevtov zYH!=-W%{?1ORu!|tjPKoe#!Rz-5X2y#3xL>@M7JXM=bsQY|CGVgwMIp-o9q-=d!~0 zCx8Dc%vC$MYe%YPrvA~m?K{t1{`2DKGUZCI>1s>*&jy4~y~7%Ca)Sla?-e^|tt?OK z3XxOMGM-XfYkjQn+1f*&5;}Ign$#tHZr0pmH!~(O3tIkNB=O`;`58YYj{X&ot^xp5 Cwy~A~ diff --git a/secrets/ssh-key-public.age b/secrets/ssh-key-public.age index 1d661c0939f1051179391945fa32c9067c85d24e..ca9c7225325a3ef877f0a6991d382d2814d52e5b 100644 GIT binary patch delta 976 zcmX@jwwz;vPJN(@kG5G+Sd@8qrn`A=l~0nhpQS;bexRX=he@unQ?@~+L8eh@c8Oz!Rab;yrNmZn4MrC49sJ5r) z#E;_PPObqSzCn)JMwX5_CWT%>PGP>zxtW#5spW>Q?p2wl*}3^yfr);pE{@q;Rat4y z?j|n!-o=%H$%T%kMg`?YVHS?zM#g0Uf$kou&Vk-u{w78)UPYmk;~B-n3rtNt^i3GSP zD>HQuEpgQ^38~DA2sJ7wkMQsbDatG7iVQCDOvxq+4H{)bi6E5@Mu*yPh$MQ0LeZx{;zlfxglH!bv@?aC+OrOkl0mr{9V(GDt)=qL!FAkLtG6C^b4vY_0xg_qf)ZdT+6czj7zc|gI#>xvrJ8svcrR% zDgx213okY-O-xtFE%hk=PWR9BNHHqU z%J$?+$u@HH%_yqZ&M9^+)s8TAP0h=2%_%A?$<;1%kM#HPw@A%Q_Hp-0iE<0%($&>f zC@Xb#EGaT@F-)(_@rf)5^b9vMtT1-8bgm38EGRWKD@Z9Y3$6;P@=5gNsyizEQg!0x z9oyD;MZMo5^<;MWg!B)Bu4dd9-X4Escww7w)13EDq%0N+Y3?j%QG_WY|~$9 zet1{RM(v}H1}`+4GtPUy{iV6=@-@XR%3LZTAMPLD-JTcHvFPN9H!Dje*V(+@{4Iay PNsaUU=O?RXA9Mr&KNMKn delta 754 zcmZ3^ahh#{PJOAiab~D{rCUT%wzi{LaagHYS+-ebRDgS?cTu{blcSSCa%Pp2ab z371i6L0)ExWmcANp?`_1t5Hs%lXph4K}CgSX{xzTsGoL`dsUFBfsb#X1(&X!LUD11 zZfc5=si~o*LZW4rQ&qV_a+0^Dxp$zSUsh#OmZ`s4xSNS~m2q~tYi6*wdr(SvX0fBE zxpRR$Hqyp6Z_&;%^l0Q&k*Zp3fDMQc>mW<(%P~>0{_$5tMIM znOqqX;OkiKADESG9+l}*S!|J%o|qAs=sWo=qjbNOq}F zg-MuyNP0$uQ+jfiV^oxuxgd6%1I7zO56CYj}@=S8_@W}Eo=>U+8tTAG*_JDYf9coY<6 z<~q9NC+1mj>FVk#m^nN8yE^-)`3bIV zB+(S(*6C(law6=YwMdofA<*QpKxDeJsfkmRM|h-vmP>Aco26$) zAeV1=Sy`2KUYSWrvU758_cSvNqv7>8YI+w1ULUD11 zZfc5=si~o*LZW4rQ&qV_c#%hrt3iH*OG#OPbBJN0nVX@%M|xmTNS3K-aAcB)g{6T> zUX_1lxPM?VSCT=wS(UbDeo9nIuxD~qkXf3)t9eL?YhIvNk*}Xeo~4N6-n-eo+cGl*_Mu}PM-P3<*wnW-Y!MnMyUoKzS>oxKF*F@ZdI9u z&IK-(<;7|GC1II~iG@x95zgV+VLl<{>18>tj-dvX8AzeS$*GTmlTt3f(geN-He5a)Z;;oSXu~(*wheQuNCT z6TJfS1H-E_vfcfv{L_82B0Rma&8tlOlR`ZwpJf!UFSV%1OD%QJ%62pi%1kma%rMl? zDX26HtW0vTNDk9Biww(2GpWc6N)O5B^70JNODWJd^K*3$D-UsZ57*Xrb2rIz%r`7b zcTCBT)HV(D4-Itkj0{Ugj{)rn-^9pr1xv5QWbJSRxBP(2O!HK?5|8@Al3>fE#1f|n zFV7O=ipqR<(^SiR|4^^+P%h(SlOp|KeXrCKW54Y1O7DPx#4?|-5Z_?GfYk7eD#KEr zusq}3oRBPSUv%pVBJwQ_9TkGJBQpYAik-q7okN0Bob)4nliWQGP4okEE3-0;Qnf8| z>l2Fu6a8F+0v)+BDqNgOOwzr|4ZWO7t31jx%aije3S5jW((;oMBmFXis{$ z6C=^B3okY-O-xtF@pE(wjtUGj&vmy5E~-p6)Gqb6$a4!SF*Ys^@+itkO%1gOa4&K+ zc2DPWOA7J|v+%7Ca4j~gNKDDhFg10L2+Inta?c7*^>Xn}_bPDmH>*g=kErzJ($&>f z$TW^Db*nTtFLKY!DK05;4oI)^N(%MPE~xZyDs;|CGEGjba5RXrtV#~#ivE$HeL5(3 z`W~0+pHntS-8K5sP_X-Z2e(4<#GTfaEPnNYJLEp7==0d{7{6>RIrv|e?^@x7l=6q= s=lRRm{B2mj{rZHN--5MQ#`JAi(3$>w$DUlSN5+%fOJ{9sl~(lu06*GB-v9sr delta 734 zcmbQtv7K##PJK>}U#@dzsAEcDL4ZeJNd9HU*ad^H5rT^>H&zDl&59Dt6BfFUiTM^3Dq@N%so$stWbXcGAwa2rl$< z&q{SRiYheB(JoA?bWU_ckAd)F!_vfb1?TKaQw#U>tWXbg?U1~Z#DMxxpPZb;^7LfC zkdz7|PtQnw-!gyqk|6Vle6Cy*FN4I=D1DDe&&bs9pirOGWEbBGk3eVRlH#<2P~X%r zC+DIR)9}g^6E0m{U4_W3q`cx>{VK=cw8C_KqoN|$Fbl&Br*Nmz3`6h0SM=l@N_h)Z8^-l>6^)>zXO>&WV$uB9lmI*gcM{BMwPIrHhvDe{t+ta#q^F4Qu zgf;HJ{Ol;xrdbT%{u#0OwNJlzO3m7=Nm{?vHTLDZC$pzyTy~kr|01dR-NiizKE^-Y G@E8Dau?0N< diff --git a/secrets/vaultwarden.age b/secrets/vaultwarden.age index 9f184fc7d30e1cd68872dbaf9c89e31cf6a13d3a..f60471cf83428cc06e4375d5178c4dc9e64482a6 100644 GIT binary patch delta 972 zcmX@kwwPmrPQ7V%VrWXJMTmJ(wqZe@aiE)bXr`-SkzrnmYe9*&uXd2Dd9ZtCs(x{~ zCzr9aWtMihg=J)5R;Z`5V`f%ZaztfiS*3xYr@M2pw_`+Tlx1i{j<$uVCzr0BLUD11 zZfc5=si~o*LZW4rQ&qWwX^ugFWoSu>SxB&7U{YavvRk=@Swxkwc7T~*sCk}mPFT2a zc}7rCM1Ey5mq~9J&TQtjVql~ zd`gnEEsd+P4U!9u3iC_~%rir?O%p?%j4IP7pJf!U&k9b~*3UL_cFE5UOwTei@J&nc z@~%ow%*iY_G0wC!%g)Gg^D43M(>Ds`3f0ajiF7qBcJ($0O7%>t2&fG5^fW6dHVE;K zO!RY%D5@~eN^~kKHVw8wj{)rn-^9pr1)qYjtO7IBO5-GV6X#M(LxcLPTqlpTh`eMc z%OZbApRl}?sNnp>R4><%d@f55v%*A+qH-rgH>X_h%B&REz@p$HH{&R`J5r5OCkdDDqOi-Ed264GfhIxlRR=PJf z@JVxZ)lPKGFw%F-b#?PgGq3PVcgr<$w{!`!(6$Wn3@bPCHmu4s@iX`2YXASkrQ-6& znVEum-MjZOdaB&pR<(P^8zE;Vy`IGfI!?MK>b^~!_`E|v!nxGUU3=deWvBCBr^@*- z+|>IeBCy}W=CCkF!Nb+7bXLheeYJm6plpcA*Dbp|Blz;>ygT{P^|rwN_ymS;CNpMa JMlN;u2mqvPO(FmQ delta 750 zcmZ3?ahz>}PQ7`Kwq;ILdSSVlt51}ho12fnb7f|_lSiPXK}wZbgmIp>cR+AbuBnM( zHdkU;pi4xQk71Q>ey*2eh(&TiW?`^zQJzJGLAs%%XO&ZEq>pb^esWr3GMBEMLUD11 zZfc5=si~o*LZW4rQ&qV_se`!WVaB`Nbft!g}QEEY%u~%tPS$LJUr?X*V znYWQ!hKp-Cmt{_=Nsec^nZ9;nWpY5JU#Uk~NsxDGh;c+(vW2CeepG}dvL z#E;_Po<-j2Nm=d{p3ZKbUWUG9mBs$K&PJ()Zj~;s1}1J{#Rdfy-eH-=Awk7lDJI&v z8NsE&iTR~oA?BvOjv2+l*~Wz?`B`qhInI%3!Is8F?xvBhSrx96;~B-nb20-eg1kZ# ztMVOl$_uM15)%_6N=nT$&ApBEgMEW5bF-5&l1)<#{VFZEiplLkEHCkPPAPOXsr1dO%yh~%2ro*k zDyqsebMbddPtEo84o=EOkAd)F!_vfbg%mUAZ2jy=7yqi_+{onge3SZ+MB|VO&wx_L zh|uJU{M0J*4DTrY@Zw;PbS~%YjHIIC0-q{(Z|?vTi;}DYxA5c)FQX!NeSg!`pbYJt zG~cAs!tel}KrUTfU4^JBm(mEYY_D{`s5~DRM<+`oU+v;zFV`Sf|7?#a$DpL7;&jh~ zAoHj^S1!HoY0qUOo>iuvd%JwK$@(6)8JWuuv_97QU9yHje1q5Y89m=BMatQx8Bf}x zcAjO@xo%y~__!DM_c!kfZ#)$>q2D+_h<{7T^T-FA3*{=C1=4=S&)F|7*eNc;{CWSL WMd8A>0@8fuE+0%%#ipLo+5!Nz4hCKT From 592a0223b1ef3df01aec1ce1e428e67ae508fb02 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 15 Dec 2025 22:21:15 +0300 Subject: [PATCH 1740/1768] add the ares config --- hosts/nixos/ares/configuration.nix | 22 ++++++++-- hosts/nixos/ares/hardware-configuration.nix | 48 +++++++++++++++++++++ modules/nixos/system/nix-settings.nix | 4 ++ 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 hosts/nixos/ares/hardware-configuration.nix diff --git a/hosts/nixos/ares/configuration.nix b/hosts/nixos/ares/configuration.nix index a3e4fd2..6141419 100644 --- a/hosts/nixos/ares/configuration.nix +++ b/hosts/nixos/ares/configuration.nix @@ -1,13 +1,15 @@ +{ inputs, ... }: { imports = [ - # ./hardware-configuration.nix + ./hardware-configuration.nix ../../../modules/nixos + inputs.jovian-nixos.nixosModules.default ]; osbmModules = { - desktopEnvironment = { - plasma.enable = true; - }; + # desktopEnvironment = { + # plasma.enable = true; + # }; familyUser.enable = true; programs = { adbFastboot.enable = true; @@ -20,6 +22,18 @@ i18n.enable = true; }; + jovian = { + devices.steamdeck = { + enable = true; + autoUpdate = true; + }; + steam = { + enable = true; + autoStart = true; + user = "osbm"; + }; + decky-loader.enable = true; + }; networking = { hostName = "ares"; diff --git a/hosts/nixos/ares/hardware-configuration.nix b/hosts/nixos/ares/hardware-configuration.nix new file mode 100644 index 0000000..3cc3979 --- /dev/null +++ b/hosts/nixos/ares/hardware-configuration.nix @@ -0,0 +1,48 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + modulesPath, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "usb_storage" + "usbhid" + "sd_mod" + "sdhci_pci" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/ec49c05b-3d2b-4d9f-8634-ab4f3597b843"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/E3FC-D8F9"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/f4477674-7104-43d7-b28c-6a8a8a86e8db"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/nixos/system/nix-settings.nix b/modules/nixos/system/nix-settings.nix index 0c26ad2..b1d74b7 100644 --- a/modules/nixos/system/nix-settings.nix +++ b/modules/nixos/system/nix-settings.nix @@ -38,6 +38,10 @@ "nvidia-settings" # blender with cuda is not foss?!? "blender" + + # steam + "steamdeck-hw-theme" + "steam-jupiter-unwrapped" ]; allowAliases = false; }; From e2ea78093836077d66d9afe199686680ca94f977 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 13:48:43 +0300 Subject: [PATCH 1741/1768] update flake.lock --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 6283f10..0104b94 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1765688338, - "narHash": "sha256-MjrytR2kiHYUnzX11cXaD31tS7kKdhM1KFaac0+KAig=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "be1a6b8a05afdd5d5fa69fcaf3c4ead7014c9fd8", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1766171975, + "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1765526639, - "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", + "lastModified": 1766225187, + "narHash": "sha256-6hcaU8qtmixsaEUbjPiOFd5aJPZxAIBokl5d7dkab3k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "457a55ed77a105088a47cb55b9eccf7768559451", + "rev": "bb53a85db9210204a98f771f10f1f5b4e06ccb2d", "type": "github" }, "original": { @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1765684049, - "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", + "lastModified": 1766038392, + "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", + "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", "type": "github" }, "original": { @@ -499,11 +499,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -919,11 +919,11 @@ ] }, "locked": { - "lastModified": 1764763336, - "narHash": "sha256-007DlZGjQ3ziQ5UMjt3GdjBAbgAtHgMwOxMY2v7/b7c=", + "lastModified": 1766109532, + "narHash": "sha256-WyJmJuH2JHHi0xRHQu+CLoh7LE1Wpnm5V15fEbmnMKI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "1ccd57f177539ed8c207b893c3f9798d88f87d2e", + "rev": "616a57af55edaac3bee4343feef116f954de5b2a", "type": "gitlab" }, "original": { @@ -984,11 +984,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { From c99444c472fcbc972cdd771da4f422de3c102c12 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 13:59:12 +0300 Subject: [PATCH 1742/1768] remove unused option --- modules/nixos/services/mailserver.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 42b7cde..df1475f 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -44,10 +44,6 @@ hashedPasswordFile = config.age.secrets."noreply-mail".path; }; }; - - # Use Let's Encrypt certificates. Note that this needs to set up a stripped - # down nginx and opens port 80. - certificateScheme = "acme-nginx"; }; }) From e61fb86afc924f14c22d1f4c525f99832fb0aa0d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 14:19:19 +0300 Subject: [PATCH 1743/1768] add acme --- modules/nixos/services/mailserver.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index df1475f..409d7c1 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -44,6 +44,9 @@ hashedPasswordFile = config.age.secrets."noreply-mail".path; }; }; + # reference an existing ACME configuration + x509.useACMEHost = config.mailserver.fqdn; + }; }) From 28bca23b69ce78e70ac8e129c429495035dab6d4 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 14:31:55 +0300 Subject: [PATCH 1744/1768] add mailserver acme setup --- modules/nixos/services/mailserver.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 409d7c1..8b729a8 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -50,6 +50,18 @@ }; }) + # Configure ACME certificate via nginx + (lib.mkIf + (config.osbmModules.services.nginx.enable && config.osbmModules.services.mailserver.enable) + { + services.nginx.virtualHosts."${config.mailserver.fqdn}" = { + forceSSL = true; + enableACME = true; + locations."/".return = "404"; # Just for ACME, no actual web content + }; + } + ) + # mailserver and impermanence (lib.mkIf ( From a647db06a50855458e290107286afa6d5e713b13 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 14:35:42 +0300 Subject: [PATCH 1745/1768] add ares --- modules/home-manager/programs/ssh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index fcfeaa1..919665b 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -53,6 +53,8 @@ in hashKnownHosts = true; compression = true; }; + ares = sshBlock "192.168.0.6"; + ares-ts = sshBlock "ares.curl-boga.ts.net"; # artemis }; }; From 0adc4ed5d2581c5ce64b240438a191ad7681b49d Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 14:58:29 +0300 Subject: [PATCH 1746/1768] enable plasma in ares --- hosts/nixos/ares/configuration.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hosts/nixos/ares/configuration.nix b/hosts/nixos/ares/configuration.nix index 6141419..8eb6fa1 100644 --- a/hosts/nixos/ares/configuration.nix +++ b/hosts/nixos/ares/configuration.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, lib, ... }: { imports = [ ./hardware-configuration.nix @@ -7,9 +7,9 @@ ]; osbmModules = { - # desktopEnvironment = { - # plasma.enable = true; - # }; + desktopEnvironment = { + plasma.enable = true; + }; familyUser.enable = true; programs = { adbFastboot.enable = true; @@ -31,9 +31,14 @@ enable = true; autoStart = true; user = "osbm"; + desktopSession = "plasma"; }; decky-loader.enable = true; }; + + # Disable SDDM since Jovian manages its own display manager + services.displayManager.sddm.enable = lib.mkForce false; + networking = { hostName = "ares"; From be8e3840fafd5a541c582ca4067190cfb854f983 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 16:38:02 +0300 Subject: [PATCH 1747/1768] i donnnoowwww --- hosts/nixos/artemis/configuration.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index c3364e9..211da3b 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -29,6 +29,15 @@ }; system = "aarch64-linux"; }; + # Kernel and filesystem configuration + boot = { + supportedFilesystems = [ + "ext4" + "vfat" + ]; + initrd.availableKernelModules = [ "ext4" ]; + }; + # Minimal essential packages environment.systemPackages = with pkgs; [ git From 7e6fe3a432b2dbd07c2654e6dcb9e88284a0ba86 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 17:04:28 +0300 Subject: [PATCH 1748/1768] try another --- hosts/nixos/artemis/configuration.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 211da3b..73e9335 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -29,15 +29,17 @@ }; system = "aarch64-linux"; }; - # Kernel and filesystem configuration - boot = { - supportedFilesystems = [ - "ext4" - "vfat" - ]; - initrd.availableKernelModules = [ "ext4" ]; + # Kernel and filesystem configuration for mobile-nixos + mobile.boot.stage-1.kernel = { + modules = [ "ext4" ]; # Modules to load in stage-1 + modular = true; # Enable kernel modules }; + boot.supportedFilesystems = [ + "ext4" + "vfat" + ]; + # Minimal essential packages environment.systemPackages = with pkgs; [ git From 1113ed75c257c52951de0aa96c54fa56f394b828 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 20 Dec 2025 17:39:43 +0300 Subject: [PATCH 1749/1768] ares dont need this --- hosts/nixos/ares/configuration.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/nixos/ares/configuration.nix b/hosts/nixos/ares/configuration.nix index 8eb6fa1..ef5bfa5 100644 --- a/hosts/nixos/ares/configuration.nix +++ b/hosts/nixos/ares/configuration.nix @@ -50,7 +50,5 @@ networkmanager.enable = true; }; - virtualisation.waydroid.enable = true; - system.stateVersion = "26.05"; # changing this is a great taboo of the nixos world } From cd805dc953de4f6b444955cbb8fa1eca0033721a Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 11:21:21 +0300 Subject: [PATCH 1750/1768] disable other desktop environments for now --- hosts/nixos/ymir/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 4f00b3f..90a67b5 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -6,9 +6,9 @@ osbmModules = { desktopEnvironment = { - plasma.enable = true; + # plasma.enable = true; niri.enable = true; - hyprland.enable = true; # im insane so i enable every DE + # hyprland.enable = true; # im insane so i enable every DE }; familyUser.enable = true; programs = { From f1dfdf07f685098e40239d937816ddd844080bdb Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 15:30:49 +0300 Subject: [PATCH 1751/1768] add luoji --- modules/home-manager/programs/ssh.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index 919665b..a895b7f 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -55,6 +55,8 @@ in }; ares = sshBlock "192.168.0.6"; ares-ts = sshBlock "ares.curl-boga.ts.net"; + luoji = sshBlock "192.168.0.7"; + luoji-ts = sshBlock "luoji.curl-boga.ts.net"; # artemis }; }; From 1e4ea24f66ea53bab86d3e1d48f0b83d85c1f0d1 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 15:33:00 +0300 Subject: [PATCH 1752/1768] mobile giving me trouble --- modules/home-manager/programs/ssh.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix index a895b7f..2e785c6 100644 --- a/modules/home-manager/programs/ssh.nix +++ b/modules/home-manager/programs/ssh.nix @@ -12,8 +12,8 @@ let hashKnownHosts = true; compression = true; }; - # sshBlockAtreus is the same as sshBlock but with 8090 as the port - sshBlockAtreus = hostname: { + # sshBlockDroid is the same as sshBlock but with 8090 as the port + sshBlockDroid = hostname: { inherit hostname; user = "osbm"; identityFile = "~/.ssh/id_ed25519"; @@ -31,8 +31,8 @@ in matchBlocks = { ymir = sshBlock "192.168.0.2"; ymir-ts = sshBlock "ymir.curl-boga.ts.net"; - atreus = sshBlockAtreus "192.168.0.3"; - atreus-ts = sshBlockAtreus "atreus.curl-boga.ts.net"; + atreus = sshBlockDroid "192.168.0.3"; + atreus-ts = sshBlockDroid "atreus.curl-boga.ts.net"; tartarus = sshBlock "192.168.0.4"; tartarus-ts = sshBlock "tartarus.curl-boga.ts.net"; pochita = sshBlock "192.168.0.9"; @@ -55,8 +55,8 @@ in }; ares = sshBlock "192.168.0.6"; ares-ts = sshBlock "ares.curl-boga.ts.net"; - luoji = sshBlock "192.168.0.7"; - luoji-ts = sshBlock "luoji.curl-boga.ts.net"; + luoji = sshBlockDroid "192.168.0.7"; + luoji-ts = sshBlockDroid "luoji.curl-boga.ts.net"; # artemis }; }; From f7414548ec28db7e7dd6e94f2d0728ef6cdd611e Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 17:20:14 +0300 Subject: [PATCH 1753/1768] try this home manager config --- flake.nix | 14 +++++++++----- hosts/nixOnDroidHosts/atreus/configuration.nix | 15 +++++++++++++++ hosts/nixOnDroidHosts/luoji/configuration.nix | 17 ++++++++++++++++- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 8824afb..30f520b 100644 --- a/flake.nix +++ b/flake.nix @@ -92,15 +92,19 @@ modules = [ ./hosts/nixos/${configName}/configuration.nix ]; }; nixosConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixos); + makeNixOnDroidConfig = + configName: + nix-on-droid.lib.nixOnDroidConfiguration { + extraSpecialArgs = { inherit inputs outputs; }; + pkgs = import nixpkgs { system = "aarch64-linux"; }; + modules = [ ./hosts/nixOnDroidHosts/${configName}/configuration.nix ]; + }; + nixOnDroidConfigNames = builtins.attrNames (builtins.readDir ./hosts/nixOnDroidHosts); treefmtEval = forAllSystems (system: treefmt-nix.lib.evalModule (makePkgs system) ./treefmt.nix); in { nixosConfigurations = nixpkgs.lib.genAttrs nixosConfigNames makeNixosConfig; - nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration { - extraSpecialArgs = { inherit inputs outputs; }; - pkgs = import nixpkgs { system = "aarch64-linux"; }; - modules = [ ./hosts/nixOnDroidHosts/atreus/configuration.nix ]; - }; + nixOnDroidConfigurations = nixpkgs.lib.genAttrs nixOnDroidConfigNames makeNixOnDroidConfig; darwinConfigurations.prometheus = nix-darwin.lib.darwinSystem { system = "x86_64-darwin"; modules = [ ./hosts/darwinHosts/prometheus/configuration.nix ]; diff --git a/hosts/nixOnDroidHosts/atreus/configuration.nix b/hosts/nixOnDroidHosts/atreus/configuration.nix index 28c4c0f..6202b78 100644 --- a/hosts/nixOnDroidHosts/atreus/configuration.nix +++ b/hosts/nixOnDroidHosts/atreus/configuration.nix @@ -1,5 +1,6 @@ { pkgs, + inputs, ... }: { @@ -12,6 +13,17 @@ experimental-features = nix-command flakes ''; + # Configure home-manager + home-manager = { + backupFileExtension = "hm-bak"; + useGlobalPkgs = true; + + config = { + home.stateVersion = "24.05"; + # Add your home-manager config here + }; + }; + build.activation.sshd = '' if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then $VERBOSE_ECHO "Generating host keys..." @@ -40,6 +52,9 @@ openssh just nh + # agenix tools + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix + age (pkgs.writeShellScriptBin "lg-rerouting" '' ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting '') diff --git a/hosts/nixOnDroidHosts/luoji/configuration.nix b/hosts/nixOnDroidHosts/luoji/configuration.nix index 3e1025d..6202b78 100644 --- a/hosts/nixOnDroidHosts/luoji/configuration.nix +++ b/hosts/nixOnDroidHosts/luoji/configuration.nix @@ -1,17 +1,29 @@ { pkgs, + inputs, ... }: { user.userName = "osbm"; # Read the changelog before changing this value - system.stateVersion = "25.11"; + system.stateVersion = "24.05"; # Set up nix for flakes nix.extraOptions = '' experimental-features = nix-command flakes ''; + # Configure home-manager + home-manager = { + backupFileExtension = "hm-bak"; + useGlobalPkgs = true; + + config = { + home.stateVersion = "24.05"; + # Add your home-manager config here + }; + }; + build.activation.sshd = '' if [ ! -e /etc/ssh/ssh_host_ed25519_key ]; then $VERBOSE_ECHO "Generating host keys..." @@ -40,6 +52,9 @@ openssh just nh + # agenix tools + inputs.agenix.packages.${pkgs.stdenv.hostPlatform.system}.agenix + age (pkgs.writeShellScriptBin "lg-rerouting" '' ${pkgs.lazygit}/bin/lazygit --path /storage/emulated/0/Documents/rerouting '') From 07c7e9831602b3b82722a8618a9abf0c981c47cc Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 19:30:01 +0300 Subject: [PATCH 1754/1768] add backup thing --- hosts/nixos/apollo/configuration.nix | 14 ++++ hosts/nixos/artemis/configuration.nix | 14 ++++ hosts/nixos/pochita/configuration.nix | 12 +++ hosts/nixos/tartarus/configuration.nix | 14 ++++ hosts/nixos/wallfacer/configuration.nix | 12 +++ hosts/nixos/ymir/configuration.nix | 12 +++ modules/nixos/options.nix | 94 +++++++++++++++++++++++ modules/nixos/services/backup-client.nix | 95 ++++++++++++++++++++++++ modules/nixos/services/backup-server.nix | 33 ++++++++ modules/nixos/services/default.nix | 2 + 10 files changed, 302 insertions(+) create mode 100644 modules/nixos/services/backup-client.nix create mode 100644 modules/nixos/services/backup-server.nix diff --git a/hosts/nixos/apollo/configuration.nix b/hosts/nixos/apollo/configuration.nix index 07e5a15..4693cab 100644 --- a/hosts/nixos/apollo/configuration.nix +++ b/hosts/nixos/apollo/configuration.nix @@ -15,6 +15,20 @@ immich.enable = true; actual.enable = true; # seafile.enable = true; + + # Backup server - exposes data for pull-based backups + backup-server = { + enable = true; + zfsSnapshots = { + enable = true; + # Keep snapshots for point-in-time recovery + frequent = 4; # 4 x 15min = 1 hour of frequent snapshots + hourly = 24; # 24 hours + daily = 7; # 1 week + weekly = 4; # 1 month + monthly = 12; # 1 year + }; + }; }; hardware = { diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 73e9335..497b7cb 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -14,6 +14,20 @@ desktopEnvironment.gnome.enable = true; hardware.systemd-boot.enable = false; # Mobile devices use different bootloader programs.graphical.enable = false; + + services = { + # Backup client - pulls vaultwarden backup from apollo + backup-client = { + enable = true; + backups = { + apollo-vaultwarden = { + remoteHost = "apollo"; + localPath = "/var/backups/apollo-vaultwarden"; + services = [ "vaultwarden" ]; + }; + }; + }; + }; }; # mobile-nixos needs aliases (uses nettools instead of net-tools) diff --git a/hosts/nixos/pochita/configuration.nix b/hosts/nixos/pochita/configuration.nix index 4b2ec0c..c601c37 100644 --- a/hosts/nixos/pochita/configuration.nix +++ b/hosts/nixos/pochita/configuration.nix @@ -18,6 +18,18 @@ wanikani-bypass-lessons.enable = true; wanikani-fetch-data.enable = true; wanikani-stats.enable = true; + + # Backup client - pulls full backup from apollo + backup-client = { + enable = true; + backups = { + apollo-full = { + remoteHost = "apollo"; # Tailscale hostname + localPath = "/var/backups/apollo"; + fullBackup = true; + }; + }; + }; }; desktopEnvironment.plasma.enable = true; programs.graphical.enable = false; diff --git a/hosts/nixos/tartarus/configuration.nix b/hosts/nixos/tartarus/configuration.nix index 9e6222b..6b17b8e 100644 --- a/hosts/nixos/tartarus/configuration.nix +++ b/hosts/nixos/tartarus/configuration.nix @@ -10,6 +10,20 @@ emulation.aarch64.enable = true; hardware.sound.enable = true; programs.steam.enable = true; + + services = { + # Backup client - pulls vaultwarden backup from apollo + backup-client = { + enable = true; + backups = { + apollo-vaultwarden = { + remoteHost = "apollo"; + localPath = "/var/backups/apollo-vaultwarden"; + services = [ "vaultwarden" ]; + }; + }; + }; + }; }; networking.hostName = "tartarus"; diff --git a/hosts/nixos/wallfacer/configuration.nix b/hosts/nixos/wallfacer/configuration.nix index 39fb62a..81a1589 100644 --- a/hosts/nixos/wallfacer/configuration.nix +++ b/hosts/nixos/wallfacer/configuration.nix @@ -8,6 +8,18 @@ hydra.enable = true; atticd.enable = true; cloudflared.enable = true; + + # Backup client - pulls full backup from apollo + backup-client = { + enable = true; + backups = { + apollo-full = { + remoteHost = "apollo"; # Tailscale hostname + localPath = "/var/backups/apollo"; + fullBackup = true; + }; + }; + }; }; }; diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 90a67b5..06d2592 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -25,6 +25,18 @@ }; services = { ollama.enable = true; + + # Backup client - pulls vaultwarden backup from apollo + backup-client = { + enable = true; + backups = { + apollo-vaultwarden = { + remoteHost = "apollo"; + localPath = "/var/backups/apollo-vaultwarden"; + services = [ "vaultwarden" ]; + }; + }; + }; }; i18n.enable = true; }; diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index 1c5ed84..4653f24 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -147,6 +147,100 @@ wanikani-bypass-lessons.enable = lib.mkEnableOption "wanikani-bypass-lessons"; wanikani-fetch-data.enable = lib.mkEnableOption "wanikani-fetch-data"; wanikani-stats.enable = lib.mkEnableOption "wanikani-stats"; + + # Backup server - exposes data for pull-based backups + backup-server = { + enable = lib.mkEnableOption "backup server (exposes data for pull-based backups)"; + + zfsSnapshots = { + enable = lib.mkEnableOption "automatic ZFS snapshots of /persist"; + + frequent = lib.mkOption { + type = lib.types.int; + default = 4; + description = "Number of frequent (15-min) snapshots to keep"; + }; + + hourly = lib.mkOption { + type = lib.types.int; + default = 24; + description = "Number of hourly snapshots to keep"; + }; + + daily = lib.mkOption { + type = lib.types.int; + default = 7; + description = "Number of daily snapshots to keep"; + }; + + weekly = lib.mkOption { + type = lib.types.int; + default = 4; + description = "Number of weekly snapshots to keep"; + }; + + monthly = lib.mkOption { + type = lib.types.int; + default = 12; + description = "Number of monthly snapshots to keep"; + }; + }; + }; + + # Backup client - pulls backups from remote servers + backup-client = { + enable = lib.mkEnableOption "backup client (pulls data from remote servers)"; + + backups = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + remoteHost = lib.mkOption { + type = lib.types.str; + description = "Remote host to backup from (e.g., apollo.tail-scale.ts.net)"; + }; + + remoteUser = lib.mkOption { + type = lib.types.str; + default = "root"; + description = "Remote user for SSH connection"; + }; + + localPath = lib.mkOption { + type = lib.types.str; + description = "Local path where backups will be stored"; + }; + + fullBackup = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to backup the entire /persist directory"; + }; + + services = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = "List of services to backup (e.g., ['vaultwarden', 'immich'])"; + example = [ + "vaultwarden" + "immich" + "forgejo" + ]; + }; + + schedule = lib.mkOption { + type = lib.types.str; + default = "daily"; + description = "Backup schedule (systemd timer format)"; + example = "daily"; + }; + }; + } + ); + default = { }; + description = "Backup configurations"; + }; + }; }; # Hardware diff --git a/modules/nixos/services/backup-client.nix b/modules/nixos/services/backup-client.nix new file mode 100644 index 0000000..5cc48a5 --- /dev/null +++ b/modules/nixos/services/backup-client.nix @@ -0,0 +1,95 @@ +# Backup client - pulls backups from remote servers via rsync +# Supports full backups and selective service backups over Tailscale +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.osbmModules.services.backup-client; + + # Create a backup job for each configured backup + makeBackupService = + name: backupCfg: + let + # Build rsync paths based on what we're backing up + sourcePaths = + if backupCfg.fullBackup then + [ "/persist" ] # Full backup of everything + else if backupCfg.services != [ ] then + # Selective service backups + map (service: "/persist/var/lib/${service}") backupCfg.services + ++ lib.optional (builtins.elem "vaultwarden" backupCfg.services) "/persist/backup/vaultwarden" + else + [ ]; # Empty list if nothing to backup + + # Rsync command for each source path + rsyncCommands = map (source: '' + echo "Backing up ${source} from ${backupCfg.remoteHost}..." + ${pkgs.rsync}/bin/rsync -avz --delete \ + -e "${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=accept-new" \ + ${backupCfg.remoteUser}@${backupCfg.remoteHost}:${source}/ \ + ${backupCfg.localPath}/${builtins.baseNameOf source}/ + '') sourcePaths; + in + { + description = "Backup ${name} from ${backupCfg.remoteHost}"; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + Type = "oneshot"; + User = "root"; + }; + + script = '' + set -e + + # Create backup directory if it doesn't exist + mkdir -p ${backupCfg.localPath} + + # Run rsync for each source path + ${lib.concatStringsSep "\n" rsyncCommands} + + echo "Backup ${name} completed successfully at $(date)" + ''; + }; + + makeBackupTimer = name: backupCfg: { + description = "Timer for ${name} backup"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = backupCfg.schedule; + Persistent = true; + RandomizedDelaySec = "30m"; # Randomize to avoid all backups running at once + }; + }; +in +{ + config = lib.mkIf cfg.enable { + # Create systemd services for each backup + systemd.services = lib.mapAttrs' ( + name: backupCfg: lib.nameValuePair "backup-${name}" (makeBackupService name backupCfg) + ) cfg.backups; + + # Create systemd timers for each backup + systemd.timers = lib.mapAttrs' ( + name: backupCfg: lib.nameValuePair "backup-${name}" (makeBackupTimer name backupCfg) + ) cfg.backups; + + # Ensure rsync and openssh are available + environment.systemPackages = with pkgs; [ + rsync + openssh + ]; + + # Ensure Tailscale is enabled for secure connections + assertions = [ + { + assertion = config.services.tailscale.enable; + message = "backup-client requires Tailscale to be enabled for secure connections"; + } + ]; + }; +} diff --git a/modules/nixos/services/backup-server.nix b/modules/nixos/services/backup-server.nix new file mode 100644 index 0000000..f0ad322 --- /dev/null +++ b/modules/nixos/services/backup-server.nix @@ -0,0 +1,33 @@ +# Backup server - exposes data for backup clients to pull +# Enables ZFS snapshots for local point-in-time recovery +{ + config, + lib, + ... +}: +let + cfg = config.osbmModules.services.backup-server; +in +{ + config = lib.mkIf cfg.enable { + # Enable ZFS auto-snapshots if requested + services.zfs.autoSnapshot = lib.mkIf cfg.zfsSnapshots.enable { + enable = true; + inherit (cfg.zfsSnapshots) + frequent + hourly + daily + weekly + monthly + ; + }; + + # Ensure SSH is enabled for backup access + assertions = [ + { + assertion = config.services.openssh.enable; + message = "backup-server requires openssh to be enabled"; + } + ]; + }; +} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index ea9cb1f..ff7e038 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -3,6 +3,8 @@ ./actual.nix ./anubis.nix ./atticd.nix + ./backup-client.nix + ./backup-server.nix ./cloudflared.nix ./ollama.nix ./openssh.nix From 31f7bcc54834fe2994f3b977e4caaa84fcccf3b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 19:37:39 +0300 Subject: [PATCH 1755/1768] dont add waybar everywhere --- modules/home-manager/programs/waybar.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/home-manager/programs/waybar.nix b/modules/home-manager/programs/waybar.nix index 129ae1e..6ed7256 100644 --- a/modules/home-manager/programs/waybar.nix +++ b/modules/home-manager/programs/waybar.nix @@ -1,6 +1,16 @@ { - programs.waybar = { - enable = true; - systemd.enable = true; - }; + lib, + nixosConfig, + ... +}: +{ + config = lib.mkMerge [ + # Auto-enable Waybar only if system has a desktop environment + (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { + programs.waybar = { + enable = lib.mkDefault true; + systemd.enable = true; + }; + }) + ]; } From e3b2433026f8a541d7b5cfb8712f9eb1376e80ce Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 19:48:17 +0300 Subject: [PATCH 1756/1768] update flake.lock --- flake.lock | 132 +++++++++-------------------------------------------- 1 file changed, 22 insertions(+), 110 deletions(-) diff --git a/flake.lock b/flake.lock index 0104b94..3c6651b 100644 --- a/flake.lock +++ b/flake.lock @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -121,24 +121,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -194,11 +176,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1766282146, + "narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707", "type": "github" }, "original": { @@ -243,36 +225,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "osbm-nvim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "osbm-nvim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "jovian-nixos": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -547,11 +499,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -563,11 +515,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764230294, - "narHash": "sha256-Z63xl5Scj3Y/zRBPAWq1eT68n2wBWGCIEF4waZ0bQBE=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d59e0290eefe0f12512043842d7096c4070f30e", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "type": "github" }, "original": { @@ -597,15 +549,14 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_3", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1764385708, - "narHash": "sha256-OW19qwRisjzD1vQknzGXbZ5yqtULI1FU1f6HZdKn5TA=", + "lastModified": 1766326623, + "narHash": "sha256-20uzo3X4mJBF+hfneJMdV/ycTm+4j6bpONaIQ6pq6Vc=", "owner": "nix-community", "repo": "nixvim", - "rev": "96d3538c32816992f30d858095aa93c9ee32fd45", + "rev": "710ade017755c3b292fd218965f3d282f13a23d7", "type": "github" }, "original": { @@ -684,30 +635,6 @@ "type": "gitlab" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "osbm-nvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "osbm-nvim": { "inputs": { "nix-formatter-pack": "nix-formatter-pack_2", @@ -715,11 +642,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1764412419, - "narHash": "sha256-7EbTmHOe+xi6KJ7ApasMqjylPdR5aFi1ICWqDxlT66U=", + "lastModified": 1766335679, + "narHash": "sha256-qnHVcAOcANivupqNG4xbF+JBuuYYJlJlLsYUVJhyWrQ=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "6f896c425bb07516e6730935d0f602a739c5db4c", + "rev": "9e5144b830fbe1b8bf641d70ab69160b4360fd09", "type": "github" }, "original": { @@ -919,11 +846,11 @@ ] }, "locked": { - "lastModified": 1766109532, - "narHash": "sha256-WyJmJuH2JHHi0xRHQu+CLoh7LE1Wpnm5V15fEbmnMKI=", + "lastModified": 1766321686, + "narHash": "sha256-icOWbnD977HXhveirqA10zoqvErczVs3NKx8Bj+ikHY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "616a57af55edaac3bee4343feef116f954de5b2a", + "rev": "7d433bf89882f61621f95082e90a4ab91eb0bdd3", "type": "gitlab" }, "original": { @@ -962,21 +889,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ From 28d6686fb3b8fb6109b14f3b2e78e997ba7e3c15 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 21:58:17 +0300 Subject: [PATCH 1757/1768] add these too --- modules/nixos/system/agenix.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/nixos/system/agenix.nix b/modules/nixos/system/agenix.nix index 3d9b0cc..5836764 100644 --- a/modules/nixos/system/agenix.nix +++ b/modules/nixos/system/agenix.nix @@ -37,6 +37,22 @@ group = "users"; mode = "644"; }; + + # Deploy same SSH key to root for backups + root-ssh-key-private = { + file = ../../../secrets/ssh-key-private.age; + path = "/root/.ssh/id_ed25519"; + owner = "root"; + group = "root"; + mode = "600"; + }; + root-ssh-key-public = { + file = ../../../secrets/ssh-key-public.age; + path = "/root/.ssh/id_ed25519.pub"; + owner = "root"; + group = "root"; + mode = "644"; + }; }; }; From 4fc9253fadf533ddd4439fcde2122465014807d5 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 22:00:08 +0300 Subject: [PATCH 1758/1768] permit root login --- modules/nixos/services/backup-server.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/nixos/services/backup-server.nix b/modules/nixos/services/backup-server.nix index f0ad322..dcdb933 100644 --- a/modules/nixos/services/backup-server.nix +++ b/modules/nixos/services/backup-server.nix @@ -22,6 +22,10 @@ in ; }; + # Allow root SSH login for backup clients to pull data + # Note: Configure root's authorized keys via users.users.root.openssh.authorizedKeys.keys + services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password"; + # Ensure SSH is enabled for backup access assertions = [ { From 09f14ac11b7e7b018177cd045437317882286ee3 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 22:46:49 +0300 Subject: [PATCH 1759/1768] update comment --- modules/nixos/services/backup-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/backup-server.nix b/modules/nixos/services/backup-server.nix index dcdb933..669373d 100644 --- a/modules/nixos/services/backup-server.nix +++ b/modules/nixos/services/backup-server.nix @@ -23,7 +23,7 @@ in }; # Allow root SSH login for backup clients to pull data - # Note: Configure root's authorized keys via users.users.root.openssh.authorizedKeys.keys + # Note: Root's authorized keys are already configured in system/users.nix services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password"; # Ensure SSH is enabled for backup access From 7992910061f23ade9088038fceee86d259b05fca Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 22:53:43 +0300 Subject: [PATCH 1760/1768] set user as root --- modules/nixos/services/backup-client.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/backup-client.nix b/modules/nixos/services/backup-client.nix index 5cc48a5..4bba8e4 100644 --- a/modules/nixos/services/backup-client.nix +++ b/modules/nixos/services/backup-client.nix @@ -28,6 +28,7 @@ let rsyncCommands = map (source: '' echo "Backing up ${source} from ${backupCfg.remoteHost}..." ${pkgs.rsync}/bin/rsync -avz --delete \ + --chown=root:root \ -e "${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=accept-new" \ ${backupCfg.remoteUser}@${backupCfg.remoteHost}:${source}/ \ ${backupCfg.localPath}/${builtins.baseNameOf source}/ From e42532f270bf2414259fe9ea668b64dfcca31c74 Mon Sep 17 00:00:00 2001 From: osbm Date: Sun, 21 Dec 2025 23:24:14 +0300 Subject: [PATCH 1761/1768] i want to have a safe space --- hosts/nixos/ymir/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/ymir/configuration.nix b/hosts/nixos/ymir/configuration.nix index 06d2592..a42c0a6 100644 --- a/hosts/nixos/ymir/configuration.nix +++ b/hosts/nixos/ymir/configuration.nix @@ -6,7 +6,7 @@ osbmModules = { desktopEnvironment = { - # plasma.enable = true; + plasma.enable = true; niri.enable = true; # hyprland.enable = true; # im insane so i enable every DE }; From 35a29b77892b7a70812b0bcd54fbbf1abf27b7bd Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 22 Dec 2025 15:07:30 +0300 Subject: [PATCH 1762/1768] lets try this to enable stuff on prometheus --- modules/home-manager/programs/swww.nix | 30 +++++++++++++----------- modules/home-manager/programs/waybar.nix | 5 ++-- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/home-manager/programs/swww.nix b/modules/home-manager/programs/swww.nix index 5f19f3c..3172488 100644 --- a/modules/home-manager/programs/swww.nix +++ b/modules/home-manager/programs/swww.nix @@ -1,19 +1,21 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { - home.packages = [ pkgs.swww ]; + config = lib.mkIf pkgs.stdenv.isLinux { + home.packages = [ pkgs.swww ]; - systemd.user.services.swww = { - Unit = { - Description = "Wayland wallpaper daemon"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; + systemd.user.services.swww = { + Unit = { + Description = "Wayland wallpaper daemon"; + PartOf = [ "graphical-session.target" ]; + After = [ "graphical-session.target" ]; + }; + + Service = { + ExecStart = "${pkgs.swww}/bin/swww-daemon"; + Restart = "on-failure"; + }; + + Install.WantedBy = [ "graphical-session.target" ]; }; - - Service = { - ExecStart = "${pkgs.swww}/bin/swww-daemon"; - Restart = "on-failure"; - }; - - Install.WantedBy = [ "graphical-session.target" ]; }; } diff --git a/modules/home-manager/programs/waybar.nix b/modules/home-manager/programs/waybar.nix index 6ed7256..94e0e92 100644 --- a/modules/home-manager/programs/waybar.nix +++ b/modules/home-manager/programs/waybar.nix @@ -1,12 +1,13 @@ { lib, + pkgs, nixosConfig, ... }: { config = lib.mkMerge [ - # Auto-enable Waybar only if system has a desktop environment - (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { + # Auto-enable Waybar only if system has a desktop environment and is Linux + (lib.mkIf (pkgs.stdenv.isLinux && nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) { programs.waybar = { enable = lib.mkDefault true; systemd.enable = true; From d4e60e4ccc88f06eea4ff2bc490f0590aeafea6f Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 22 Dec 2025 16:26:55 +0300 Subject: [PATCH 1763/1768] update flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3c6651b..8fcc784 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1766282146, - "narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=", + "lastModified": 1766387499, + "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", "owner": "nix-community", "repo": "home-manager", - "rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707", + "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", "type": "github" }, "original": { @@ -451,11 +451,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { From 7b7559466e886cba320f50bbbaa36ad43f9d29c4 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 22 Dec 2025 22:34:02 +0300 Subject: [PATCH 1764/1768] remove adb support on ares --- hosts/nixos/ares/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/nixos/ares/configuration.nix b/hosts/nixos/ares/configuration.nix index ef5bfa5..cb0459f 100644 --- a/hosts/nixos/ares/configuration.nix +++ b/hosts/nixos/ares/configuration.nix @@ -12,7 +12,6 @@ }; familyUser.enable = true; programs = { - adbFastboot.enable = true; steam.enable = true; }; hardware = { From 16d08d35463ab11be1062ba7dd46bbdce424d599 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 22 Dec 2025 22:34:22 +0300 Subject: [PATCH 1765/1768] enable hybernation in ares --- hosts/nixos/ares/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/nixos/ares/configuration.nix b/hosts/nixos/ares/configuration.nix index cb0459f..2c52203 100644 --- a/hosts/nixos/ares/configuration.nix +++ b/hosts/nixos/ares/configuration.nix @@ -15,7 +15,7 @@ steam.enable = true; }; hardware = { - hibernation.enable = false; + # hibernation.enable = false; sound.enable = true; }; i18n.enable = true; From bb20d698738c7a65a5e6e341ca01be07d9fb0a54 Mon Sep 17 00:00:00 2001 From: osbm Date: Mon, 22 Dec 2025 22:55:25 +0300 Subject: [PATCH 1766/1768] remove these --- hosts/nixos/artemis/configuration.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hosts/nixos/artemis/configuration.nix b/hosts/nixos/artemis/configuration.nix index 497b7cb..5650a77 100644 --- a/hosts/nixos/artemis/configuration.nix +++ b/hosts/nixos/artemis/configuration.nix @@ -43,16 +43,7 @@ }; system = "aarch64-linux"; }; - # Kernel and filesystem configuration for mobile-nixos - mobile.boot.stage-1.kernel = { - modules = [ "ext4" ]; # Modules to load in stage-1 - modular = true; # Enable kernel modules - }; - boot.supportedFilesystems = [ - "ext4" - "vfat" - ]; # Minimal essential packages environment.systemPackages = with pkgs; [ From 5e75f3d65c7e3aff32197322652abeb35ba990a6 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Dec 2025 21:38:49 +0300 Subject: [PATCH 1767/1768] update flake.lock --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 8fcc784..f3743fa 100644 --- a/flake.lock +++ b/flake.lock @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1766387499, - "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", + "lastModified": 1766553851, + "narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=", "owner": "nix-community", "repo": "home-manager", - "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", + "rev": "7eca7f7081036a7b740090994c9ec543927f89a7", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1766225187, - "narHash": "sha256-6hcaU8qtmixsaEUbjPiOFd5aJPZxAIBokl5d7dkab3k=", + "lastModified": 1766561058, + "narHash": "sha256-VFqsBWqFFBTBqKFw0fGw2a2mJjPP9HPW8nXEW2A5zJM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bb53a85db9210204a98f771f10f1f5b4e06ccb2d", + "rev": "9d0abe57d633a6e08d72865a761891a8c81e740f", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1766038392, - "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", + "lastModified": 1766524813, + "narHash": "sha256-N/sxS27+t9nGvGWqwwAceSMW/Y5ddcypS/aiTnZ7ScA=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", + "rev": "c2b36207f2c396c79dbed9d40536db221bd4e363", "type": "github" }, "original": { @@ -435,11 +435,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1766568855, + "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", "type": "github" }, "original": { From 1745064eadad59a9a3603335ae8bf9d7b99d74b7 Mon Sep 17 00:00:00 2001 From: osbm Date: Wed, 24 Dec 2025 21:48:35 +0300 Subject: [PATCH 1768/1768] update flake.lock --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index f3743fa..e4ae1e2 100644 --- a/flake.lock +++ b/flake.lock @@ -499,11 +499,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -552,11 +552,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1766326623, - "narHash": "sha256-20uzo3X4mJBF+hfneJMdV/ycTm+4j6bpONaIQ6pq6Vc=", + "lastModified": 1766443759, + "narHash": "sha256-iGDhUPOPyY9NOTNHkhNzZKoz3+OlBNGg451qtvPq/Ic=", "owner": "nix-community", "repo": "nixvim", - "rev": "710ade017755c3b292fd218965f3d282f13a23d7", + "rev": "1787eeda5a2ce35bcd57dbb482718b0d897786ae", "type": "github" }, "original": { @@ -642,11 +642,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1766335679, - "narHash": "sha256-qnHVcAOcANivupqNG4xbF+JBuuYYJlJlLsYUVJhyWrQ=", + "lastModified": 1766602086, + "narHash": "sha256-2uW+3Kxk92423NZFnwTjLDymQ/v12e1YWTfZJM423Bw=", "owner": "osbm", "repo": "osbm-nvim", - "rev": "9e5144b830fbe1b8bf641d70ab69160b4360fd09", + "rev": "99c87e956bfd0ee36ebc31073aab50e7dfa39432", "type": "github" }, "original": {