From f88ed30f0388a8f0f678f52366649fdc5fcf8680 Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 14:08:29 +1000 Subject: [PATCH 01/10] update --- Justfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Justfile b/Justfile index 3b50b49..fcd13e7 100644 --- a/Justfile +++ b/Justfile @@ -4,9 +4,11 @@ up: boot: nixos-rebuild boot --flake . --use-remote-sudo -switch: +commit: git add . git commit -a -m "update" + +switch: commit nixos-rebuild switch --flake . --use-remote-sudo debug: From ccbf3a9f2ffa0d289904e92012d849f6b8a317aa Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 14:20:09 +1000 Subject: [PATCH 02/10] update --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 +++- home/aly.nix | 3 +++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index ce4a9c4..94794dc 100644 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,22 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "v0.6.0", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1758346548, @@ -40,6 +56,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 4565376..65d64cd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,19 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = inputs@{ nixpkgs, home-manager, ... }: { + outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, ... }: { nixosConfigurations = { "aly-laptop" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + nix-flatpak.nixosModules.nix-flatpak ./hw/aly-laptop.nix ./system/aly-laptop.nix ./system/global.nix diff --git a/home/aly.nix b/home/aly.nix index 7e5d313..88444f8 100644 --- a/home/aly.nix +++ b/home/aly.nix @@ -3,6 +3,9 @@ { home.username = "aly"; home.homeDirectory = "/home/aly"; + services.flatpak.packages = [ + "com.moonlight_stream.Moonlight" + ]; xresources.properties = { "Xcursor.size" = 16; "Xft.dpi" = 172; From d96e35afcb1487ae2c099bb4b83cfb14bdfd1016 Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 14:23:46 +1000 Subject: [PATCH 03/10] update --- home/aly.nix | 3 --- system/global.nix | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/aly.nix b/home/aly.nix index 88444f8..7e5d313 100644 --- a/home/aly.nix +++ b/home/aly.nix @@ -3,9 +3,6 @@ { home.username = "aly"; home.homeDirectory = "/home/aly"; - services.flatpak.packages = [ - "com.moonlight_stream.Moonlight" - ]; xresources.properties = { "Xcursor.size" = 16; "Xft.dpi" = 172; diff --git a/system/global.nix b/system/global.nix index 8ffbaae..b43935c 100644 --- a/system/global.nix +++ b/system/global.nix @@ -12,6 +12,9 @@ networking.networkmanager.enable = true; services.flatpak.enable = true; + services.flatpak.packages = [ + "com.moonlight_stream.Moonlight" + ]; services.pulseaudio.enable = false; services.pipewire = { enable = true; From 5c80400b09703b25e50782569e5a64116fbf2b27 Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 14:28:15 +1000 Subject: [PATCH 04/10] update --- Justfile | 10 +++++++++- flake.lock | 43 ++++++++++++++++++++++++++++++++++++++++--- flake.nix | 6 +++++- 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/Justfile b/Justfile index fcd13e7..e2ba6d3 100644 --- a/Justfile +++ b/Justfile @@ -1,6 +1,9 @@ up: nix flake update +check: + nix flake check + boot: nixos-rebuild boot --flake . --use-remote-sudo @@ -8,9 +11,14 @@ commit: git add . git commit -a -m "update" -switch: commit +_switch: commit nixos-rebuild switch --flake . --use-remote-sudo +push: + git push origin --all + +switch: _switch push + debug: nixos-rebuild switch --flake . --use-remote-sudo --show-trace --verbose diff --git a/flake.lock b/flake.lock index 94794dc..955145d 100644 --- a/flake.lock +++ b/flake.lock @@ -37,13 +37,49 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751903740, + "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1758346548, - "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -57,6 +93,7 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 65d64cd..cd925e4 100644 --- a/flake.nix +++ b/flake.nix @@ -6,9 +6,13 @@ url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-generators = { + url = "github:nix-community/nixos-generators"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, ... }: { + outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, nixos-generators, ... }: { nixosConfigurations = { "aly-laptop" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; From 857800ea1b30a0c7654fd328ed93b768e4cae9e2 Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 16:10:07 +1000 Subject: [PATCH 05/10] update --- system/global.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/global.nix b/system/global.nix index b43935c..527f401 100644 --- a/system/global.nix +++ b/system/global.nix @@ -35,7 +35,7 @@ settings = { X11Forwarding = true; PermitRootLogin = "no"; # disable root login - PasswordAuthentication = false; # disable password login + PasswordAuthentication = true; # disable password login }; openFirewall = true; }; From 4b173b160a8c9372bd9133e9de5cbc27b792933f Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 16:11:08 +1000 Subject: [PATCH 06/10] update --- data/authorized_keys.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/authorized_keys.nix b/data/authorized_keys.nix index e661a7e..0ceb696 100644 --- a/data/authorized_keys.nix +++ b/data/authorized_keys.nix @@ -1,5 +1,5 @@ [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJTqgIA+klcgOz+LSxwj6ZPP+pFrviu171Dgif0oIVlIxA8PGupKataDLrAAKOunpGgMTLGnEDLfWAsC1BxdG9qxdUphDuoXlY4hXWypsm01bEMbEPyomHrDS9SABbAl15/cGdEricBCBqUa6j+rs7nZcKLDSr4jkNDKxEGmJCVodquM8F+u4DN0MYgN+yoKTIijMVPK7uzFB3X1OdLQB770R/nGRd3p180Ixs8BKmbp2Mc5rrSQ+bFOQQbM8E7jDv3SCRzbKBr7I6VvASi62bpXaAlXbcRcXciyaPLdWAcwqDNIkMrlTVeF947d9enDin0PX+wQAlgm3kWgJpuHSK1eScZd+NLuD6IXTQyse5cMoEtqUGcp4SXN6hqc1EthQ4wWAmCQPw5SUCd53I0fSwRA9Ik3mCX6UlLw2M41Q+zd3axXeNDG1gtDyWoafHKM38JZrCk+d56xOH9J43esDgH7gZtno+Nspt/YkgHCbV6BB0mxjkgSGj/EhgQUjrWpU= aly@DESKTOP-QJO3LML" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGa9sXpYiDXy6L9dQHcKkK45PBgZHo0PCz/ejmvhDW6Z aly@aurora" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOIteUtsZCWRz7CdEZwatVoJZOHyhoDxoECidQjUSrU+ u0_a315@localhost" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPAPHB5cZxUF6btKjT8yNLcwWBxXf+Jb9x2iPszWY5l7 aly@alyssd" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPx69hgnDfNMM8nuNdRRnhHSto6BvBBYkEL8mzNtKpVG aly@aly-ubuntu-vm" From 07d90cf34e79eebc014493ee8c420972101d5b4b Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 16:30:59 +1000 Subject: [PATCH 07/10] update --- flake.lock | 45 ++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 7 ++++++- home/aly.nix | 14 ++++++++++++-- 3 files changed, 62 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 955145d..16a53ea 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -89,12 +110,34 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758692227, + "narHash": "sha256-KWnbECfBbE5IhYngdZgRGC6i2q6hMRQ9kJYPwVfZoWg=", + "owner": "nix-community", + "repo": "NUR", + "rev": "3e3550dd41e11e38cce8ee9961ef8de3d4d185ab", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nur": "nur" } } }, diff --git a/flake.nix b/flake.nix index cd925e4..0f22020 100644 --- a/flake.nix +++ b/flake.nix @@ -10,13 +10,18 @@ url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; }; + nur = { + url = "github:nix-community/NUR"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, nixos-generators, ... }: { + outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, nixos-generators, nur, ... }: { nixosConfigurations = { "aly-laptop" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ + nur.modules.nixos.default nix-flatpak.nixosModules.nix-flatpak ./hw/aly-laptop.nix ./system/aly-laptop.nix diff --git a/home/aly.nix b/home/aly.nix index 7e5d313..5a1c0c5 100644 --- a/home/aly.nix +++ b/home/aly.nix @@ -5,15 +5,25 @@ home.homeDirectory = "/home/aly"; xresources.properties = { "Xcursor.size" = 16; - "Xft.dpi" = 172; + "Xft.dpi" = 150; }; home.packages = with pkgs; [ - gnome-tweaks firefox obs-studio rpi-imager + gnome-tweaks obs-studio rpi-imager google-cloud-sdk neofetch nnn zip xz unzip p7zip ripgrep jq yq-go mtr iperf3 dnsutils ldns aria2 socat nmap ipcalc file which tree gnused gnutar gawk zstd gnupg btop iotop iftop strace ltrace lsof sysstat lm_sensors ethtool pciutils usbutils nix-output-monitor ]; + + programs.firefox = { + enable = true; + profiles.default.extensions = { + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin bitwarden darkreader indie-wiki-buddy sponsorblock + ]; + }; + }; + programs.git = { enable = true; userName = "alydev"; From f4de386eb1dd26a5dd6e6678528c78e5894ecdab Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 16:34:01 +1000 Subject: [PATCH 08/10] update --- Justfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Justfile b/Justfile index e2ba6d3..338ff70 100644 --- a/Justfile +++ b/Justfile @@ -9,15 +9,15 @@ boot: commit: git add . - git commit -a -m "update" + -git commit -a -m "update" -_switch: commit +_switch: nixos-rebuild switch --flake . --use-remote-sudo push: git push origin --all -switch: _switch push +switch: commit _switch push debug: nixos-rebuild switch --flake . --use-remote-sudo --show-trace --verbose From 7036a39268f3a9adb5581b7e521e3d624967a84e Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 16:36:47 +1000 Subject: [PATCH 09/10] update --- home/aly.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/home/aly.nix b/home/aly.nix index 5a1c0c5..5e26656 100644 --- a/home/aly.nix +++ b/home/aly.nix @@ -5,7 +5,7 @@ home.homeDirectory = "/home/aly"; xresources.properties = { "Xcursor.size" = 16; - "Xft.dpi" = 150; + "Xft.dpi" = 300; }; home.packages = with pkgs; [ gnome-tweaks obs-studio rpi-imager google-cloud-sdk @@ -17,10 +17,13 @@ programs.firefox = { enable = true; - profiles.default.extensions = { - packages = with pkgs.nur.repos.rycee.firefox-addons; [ - ublock-origin bitwarden darkreader indie-wiki-buddy sponsorblock - ]; + profiles.default = { + settings.extensions.autoDisableScopes = 0; + extensions = { + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin bitwarden darkreader indie-wiki-buddy sponsorblock + ]; + }; }; }; From 5fb21f3813276dc71b02f74309da1ee8cc2b5f15 Mon Sep 17 00:00:00 2001 From: alydev Date: Wed, 24 Sep 2025 16:39:22 +1000 Subject: [PATCH 10/10] update --- home/aly.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/aly.nix b/home/aly.nix index 5e26656..ba4e506 100644 --- a/home/aly.nix +++ b/home/aly.nix @@ -18,7 +18,6 @@ programs.firefox = { enable = true; profiles.default = { - settings.extensions.autoDisableScopes = 0; extensions = { packages = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin bitwarden darkreader indie-wiki-buddy sponsorblock