commit 23be6feb0663fdac9681a271f62a51d0ba948036
parent 193a1154e89d0f06be188df226d0d6afdf74c60d
Author: Milutin Popovic <milutin@popovic.xyz>
Date: Sat, 3 Jan 2026 22:06:21 +0000
oki
Diffstat:
7 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -69,16 +69,15 @@
]
},
"locked": {
- "lastModified": 1766553861,
- "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
+ "lastModified": 1767437240,
+ "narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
+ "rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@@ -115,11 +114,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1766568855,
- "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=",
+ "lastModified": 1767185284,
+ "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80",
+ "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
"type": "github"
},
"original": {
@@ -146,31 +145,31 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1766473571,
- "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
+ "lastModified": 1767379071,
+ "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
+ "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-25.11",
+ "ref": "nixos-unstable",
"type": "indirect"
}
},
- "nixpkgs_unstable": {
+ "nixpkgs_stable": {
"locked": {
- "lastModified": 1766651565,
- "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
+ "lastModified": 1767325753,
+ "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
+ "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
"type": "github"
},
"original": {
"id": "nixpkgs",
- "ref": "nixos-unstable",
+ "ref": "nixos-25.11",
"type": "indirect"
}
},
@@ -182,7 +181,7 @@
"nixos-facter-modules": "nixos-facter-modules",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2",
- "nixpkgs_unstable": "nixpkgs_unstable",
+ "nixpkgs_stable": "nixpkgs_stable",
"sops-nix": "sops-nix"
}
},
diff --git a/flake.nix b/flake.nix
@@ -2,8 +2,8 @@
description = "NixOS";
inputs = {
- nixpkgs.url = "nixpkgs/nixos-25.11";
- nixpkgs_unstable.url = "nixpkgs/nixos-unstable";
+ nixpkgs_stable.url = "nixpkgs/nixos-25.11";
+ nixpkgs.url = "nixpkgs/nixos-unstable";
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
nixos-hardware.url = "github:NixOS/nixos-hardware";
betterfox.url = "github:HeitorAugustoLN/betterfox-nix";
@@ -12,7 +12,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
- url = "github:nix-community/home-manager/release-25.11";
+ url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
@@ -22,6 +22,7 @@
};
outputs = {
self,
+ nixpkgs_stable,
nixpkgs,
disko,
home-manager,
@@ -90,7 +91,7 @@
};
nixos-server = let
hostName = "nixos-server";
- in nixpkgs.lib.nixosSystem {
+ in nixpkgs_stable.lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
diff --git a/justfile b/justfile
@@ -4,6 +4,9 @@ user := `whoami`
os:
sudo nixos-rebuild switch --flake ./#{{hostname}} --impure
+os_rollback:
+ sudo nixos-rebuild switch --flake --rollback
+
hm:
home-manager switch -b backup --flake ./#{{user}}
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -167,7 +167,7 @@ with pkgs; {
ruby
gem
php
- julia
+ julia-bin
python3
python313Packages.pip
rustup
diff --git a/system/host/host-frame.nix b/system/host/host-frame.nix
@@ -51,14 +51,11 @@
"iommu=pt"
"rtc_cmos.use_acpi_alarm=1"
];
- initrd.services.udev.rules = ''
- SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="9A:C7:16:D6:89:36", NAME="wlan0"
- '';
};
# netowrk
networking.hostName = "${hostName}";
- networking.wireless.iwd.enable = true;
+ networking.wireless.enable = true;
# time/locale
time.timeZone = "Europe/Lisbon";
@@ -126,10 +123,16 @@
};
};
+
systemd.sleep.extraConfig = ''
HibernateDelaySec=20m
'';
+ systemd.network.links."10-wlan0" = {
+ matchConfig.MACAddress = "14:AC:60:29:82:AB";
+ linkConfig.Name = "wlan0";
+ };
+
# hardware
hardware.bluetooth.enable = true;
security.rtkit.enable = true;
@@ -160,6 +163,8 @@
# fonts
fonts.packages = with pkgs; [
terminus_font
+ noto-fonts
+ noto-fonts-color-emoji
];
}
diff --git a/system/host/host-server.nix b/system/host/host-server.nix
@@ -64,14 +64,12 @@
extraGroups = [ "wheel" ];
initialPassword = "123";
shell = pkgs.zsh;
- ignoreShellProgramCheck = true;
openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjUjMsWMlPY0YNtSPMdmCIBnNHzT8PdN7Gc0a+RuQg2slRe7Gh1HgRPAX0pg3CIh0oNTDfuOGrOTcl/SdX+WdhChZJkcoKiDKPB98TCioJnYF9k1vouhx0P3soN/Bd4gQEd2Vx0+XTQzmK9VhFtBoNQt9Eh90ZGCrBtsfPB9odDuymotI9FPXSboUPAe3WttzzUeTpY3JurInHW2rCQsYIvti0ZGwdm6EwVjN+6aZ300uT6olrAc+6csyOZrdQQXm1G35x6MLKpYoyFoGQYkS/4vvHMbzj9F9zp8Y+aUZ0+iQvK2owhS7auzELuO2/nqwODCHXLxn8Sg15r0XJn4tVvgAxqvtG+i0SIeqjfrzsu+fg1n2tJGCAq96nyOCruYHcmLOQ0Z9d+hf04Y1thS4GCtNmqT/RGdboDI1xEmg3PaUUPgaL7pCiG+6OtTC/4F0/f/m6neRn219UAPshI7LZKT1aRsBCqKRnEmbUSKWa0ilDntCDsST2VcHwKk0Tjnb+UIvjoHJ2qQQao7i1dmzZ8oUu/9wpyt5aaNxxvcm6qfjht1TGw/1RBHyhOsPNrlHpzUtzbvDdVwHfO0/6eksb73kJ7WMqU+FutbF5ekogcUzkYMo6G7O6hDMFb+w405ontM5syg6OcYWTq2+kllbKiGETxQpizzuWKERCExpHWQ== mika@frame"
];
};
root = {
shell = pkgs.zsh;
- ignoreShellProgramCheck = true;
};
};
security.sudo.wheelNeedsPassword = false;
@@ -100,6 +98,11 @@
};
};
+ environment.variables = {
+ __ETC_ZSHRC_SOURCED = "1";
+ __ETC_ZSHENV_SOURCED = "1";
+ };
+
# packages
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [
@@ -111,14 +114,8 @@
tree
coreutils
stdenv
- dbus-broker
- pciutils
util-linux
pstree
-
- upower
- xsensors
- acpilight
];
# fonts
diff --git a/users/r2d2.nix b/users/r2d2.nix
@@ -19,7 +19,7 @@ in
stateVersion = "25.11";
};
- nixpkgs.config.allowUnfree = true;
+
home.packages = (with packageSets; lib.flatten [
system
shell
