diff options
| -rw-r--r-- | flake.lock | 135 | ||||
| -rw-r--r-- | flake.nix | 28 | ||||
| -rw-r--r-- | home-manager/gaming.nix | 2 | ||||
| -rw-r--r-- | home-manager/home.nix | 4 | ||||
| -rw-r--r-- | machines/khad/default.nix | 3 | ||||
| -rw-r--r-- | machines/zenbook/default.nix | 6 | ||||
| -rw-r--r-- | modules/home-manager/swayidle.nix | 2 | ||||
| -rw-r--r-- | modules/home-manager/waybar.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/hyprland.nix | 2 |
9 files changed, 69 insertions, 115 deletions
@@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1778857089, - "narHash": "sha256-TclWRW2SdFeETLaiTG4BA8C8C4m/LppQEldncqyTzAQ=", + "lastModified": 1780756231, + "narHash": "sha256-tXQxKdG5716uB9/LIkLQqQwHKf5mRSpHoZhz3lyI2Cg=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "ab2b0af63fbc9fb779d684f19149b790978be8a8", + "rev": "6ecde03f47172753fe5a2f334f9d3facfb7e6784", "type": "github" }, "original": { @@ -276,16 +276,16 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1781981105, + "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "7bfff44b465909f69a442701293bc0badcf476dc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -293,7 +293,7 @@ "hugo-congo": { "flake": false, "locked": { - "narHash": "sha256-qlq9gmUVLV1TUJnj86+ETI1In2NXHye3GsUVxGji0UU=", + "narHash": "sha256-L5+cXePeaTr6XWznclyzTZTpJnR4QvlFi/ZHCNkaGOU=", "type": "file", "url": "https://github.com/jpanther/congo" }, @@ -379,11 +379,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1780428376, - "narHash": "sha256-EJ3Is/hOcKnuYtzwYDZfG5VXDHGYzTX187nFaQh0ftw=", + "lastModified": 1782070887, + "narHash": "sha256-rwKRD8h3bxVebEDNyoaPh+q0dqdqvrAE8+1T4Jo3xxs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "61321ce5c7eba171e243ae1ee1a1fca0b0736e35", + "rev": "5a7078d20a14bb199ef9bb81faa4faeaf5e92117", "type": "github" }, "original": { @@ -556,11 +556,11 @@ ] }, "locked": { - "lastModified": 1779475241, - "narHash": "sha256-Nw4DN0A5krWNcPBvuWe5Gz2yuxsUUPiDgtu6SVPJQeU=", + "lastModified": 1780251518, + "narHash": "sha256-fG9xbb1SOAAJ+2kJRakp3ch+BmA/3dEg/K3PoAZTKkw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3cd3972b2ee658a14d2610d8494e09259e530124", + "rev": "40ede2e7bdec80ba5d4c443160d905e9f841ae5f", "type": "github" }, "original": { @@ -647,11 +647,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1779970379, - "narHash": "sha256-ZHsxoYXXnfJtMVh1/yY+1Eh9hHcPBhE28Qvinauh+BQ=", + "lastModified": 1781738058, + "narHash": "sha256-wgKY6pbZbFpBXae+8bjvJtW1Z9qekZergGly44n2qZw=", "owner": "astro", "repo": "microvm.nix", - "rev": "0d49083ba2d7419b22908ac392777c16df9a032e", + "rev": "225b35c204e29efb5bbe9b55b1a38b07b3fca2af", "type": "github" }, "original": { @@ -681,24 +681,6 @@ "type": "github" } }, - "ndg": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1780375973, - "narHash": "sha256-TaL6EIEnShGwnAQ1JethckHvGMNxajSEpadPiUpFiVo=", - "owner": "feel-co", - "repo": "ndg", - "rev": "d7198ab8d30f2924ba444bf2fa3b9d1aa32c78de", - "type": "github" - }, - "original": { - "owner": "feel-co", - "repo": "ndg", - "type": "github" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -745,11 +727,11 @@ ] }, "locked": { - "lastModified": 1780210899, - "narHash": "sha256-4axz3OBPTKa6LIkXV8n0lc63MQU+et2CB5DGobEAi6k=", + "lastModified": 1782030356, + "narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "97df9dc0b7c924344b793a15c1e8e4522ebb854e", + "rev": "3017088b49efd404f78e3b104f553b97e4af786b", "type": "github" }, "original": { @@ -765,11 +747,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1780375694, - "narHash": "sha256-TznzgYVONg28KiSFB2rVdf/eLVIMtEQOxKt13Kzyrp8=", + "lastModified": 1782091909, + "narHash": "sha256-q9ygpiowWPeS/FzBz7gekF4uUamJSXH/TTMf4y0j23I=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "e6f8bec35104ca5955efe73742da58d2823684f7", + "rev": "794884dacd31b251bce5abf2cf324be3659d5322", "type": "github" }, "original": { @@ -845,22 +827,6 @@ "type": "github" } }, - "nixpkgs-old": { - "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -879,11 +845,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -927,41 +893,28 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "lastModified": 1781808408, + "narHash": "sha256-0sOb6OIaD/K1zHxBhpmlKvkADfe0n8+l4Jj2e1Q0r3w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", + "rev": "e8210c649915deed7080033cdbabcc19e40bb899", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1779560665, - "narHash": "sha256-NpH8iEQ5JHv/BtUuzTEXUMDxPLetCDzIv4OxL8H7Kps=", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre1004030.64c08a7ca051/nixexprs.tar.xz?lastModified=1779560665&rev=64c08a7ca051951c8eae34e3e3cb1e202fe36786" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1780256906, - "narHash": "sha256-C1/3ndIfVpxELsR2dojqwPylbOCdqYFh8+gIXSOrkvc=", + "lastModified": 1782071756, + "narHash": "sha256-OfcKKaoVOdI7y+LZp3MajAPWF0QyuBllwJkCCTe1Y1Q=", "owner": "nushell", "repo": "nu_scripts", - "rev": "3e869d0b5ad1fc76537226d0cc9cb1660f27bda6", + "rev": "800e6223ab0f91bf1097c4be2b9a3647b9d666e3", "type": "github" }, "original": { @@ -1013,7 +966,6 @@ "nix-minecraft": "nix-minecraft", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_4", - "nixpkgs-old": "nixpkgs-old", "nixpkgs-unstable": "nixpkgs-unstable", "nushell-scripts": "nushell-scripts", "sops-nix": "sops-nix", @@ -1028,11 +980,11 @@ ] }, "locked": { - "lastModified": 1777944972, - "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", + "lastModified": 1781943681, + "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", + "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", "type": "github" }, "original": { @@ -1104,17 +1056,16 @@ }, "unf": { "inputs": { - "ndg": "ndg", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1760178630, - "narHash": "sha256-oxRMTQtzIO1yFRhY++Ss8+ea1cTH40bD/+FAE+m5NFk=", + "lastModified": 1779596435, + "narHash": "sha256-ztzeJVOQDhQtE0z9DwtSWL+OyoWKZrAD4gzRRvUP9ug=", "ref": "refs/heads/main", - "rev": "8a6aa536039f1b207888b1369c5cabf0b131e07b", - "revCount": 5, + "rev": "4f5ab30ee524f09126b09f42f249c0aba756459d", + "revCount": 6, "type": "git", "url": "https://git.atagen.co/atagen/unf" }, @@ -1167,11 +1118,11 @@ ] }, "locked": { - "lastModified": 1778265244, - "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=", + "lastModified": 1780133819, + "narHash": "sha256-0YPKIY3dlnR7SPq7Z8ekFVvzFsfeiAtEj+QUI3KHrlI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968", + "rev": "4a170c0ba96fd37374f93d8f91c9ed91814828ac", "type": "github" }, "original": { @@ -2,9 +2,9 @@ description = "NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-old.url = "github:nixos/nixpkgs/nixos-25.05"; + # nixpkgs-old.url = "github:nixos/nixpkgs/nixos-25.05"; flake-utils.url = "github:numtide/flake-utils"; @@ -12,7 +12,7 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; # The `follows` keyword in inputs is used for inheritance. # Here, `inputs.nixpkgs` of home-manager isn't kept consistent with the `inputs.nixpkgs` of the current flake, # to not avoid problems caused by different versions of nixpkgs dependencies. @@ -392,17 +392,17 @@ home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; - picast = lib.nixosSystem { # anger at chromecast - specialArgs = { - pkgs-old = import nixpkgs-old { - system = "aarch64-linux"; - config.allowUnfree = true; - }; - }; - modules = minimalModuleConfig ++ [ ./machines/picast - home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } - ]; - }; + # picast = lib.nixosSystem { # anger at chromecast + # specialArgs = { + # pkgs-old = import nixpkgs-old { + # system = "aarch64-linux"; + # config.allowUnfree = true; + # }; + # }; + # modules = minimalModuleConfig ++ [ ./machines/picast + # home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } + # ]; + # }; microvm-test = lib.nixosSystem { # test system = "x86_64-linux"; modules = minimalModuleConfig ++ [ diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index 36f66ee..079e234 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -30,7 +30,7 @@ # luanti #upstream out of date lutris heroic - wineWowPackages.waylandFull + wineWow64Packages.waylandFull discord element-desktop diff --git a/home-manager/home.nix b/home-manager/home.nix index d2a3ebc..1892eeb 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -61,11 +61,11 @@ in { # ]; # }) # qutebrowser - neofetch + hyfetch kdePackages.yakuake qFlipper cava - helvum + # helvum kdePackages.filelight easyeffects mpv diff --git a/machines/khad/default.nix b/machines/khad/default.nix index 3f88856..8d74e32 100644 --- a/machines/khad/default.nix +++ b/machines/khad/default.nix @@ -139,13 +139,14 @@ enable = true; package = pkgs.wireshark; }; - light.enable = true; + # light.enable = true; mtr.enable = true; gnupg.agent = { enable = true; enableSSHSupport = true; }; }; + hardware.acpilight.enable = true; # List services that you want to enable: diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix index de7309c..7925a19 100644 --- a/machines/zenbook/default.nix +++ b/machines/zenbook/default.nix @@ -74,6 +74,7 @@ environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/zenbook/configuration.nix"''; environment.systemPackages = with pkgs; [ acpi # for battery utils + android-tools # ciscoPacketTracer8 ]; @@ -135,14 +136,15 @@ enable = true; # package = pkgs.wireshark; }; - light.enable = true; + # light.enable = true; mtr.enable = true; gnupg.agent = { enable = true; enableSSHSupport = true; }; - adb.enable = true; + # adb.enable = true; }; + hardware.acpilight.enable = true; # enable the OpenSSH daemon services.openssh.enable = true; diff --git a/modules/home-manager/swayidle.nix b/modules/home-manager/swayidle.nix index 19cd171..53143e2 100644 --- a/modules/home-manager/swayidle.nix +++ b/modules/home-manager/swayidle.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { services.swayidle = { enable = true; - systemdTarget = "hyprland-session.target"; + systemdTargets = [ "hyprland-session.target" ]; timeouts = let dpmsCommand = "${pkgs.hyprland}/bin/hyprctl dispatch dpms"; diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 459d651..3eabbe1 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -3,7 +3,7 @@ programs.waybar = { enable = true; systemd.enable = true; - systemd.target = "hyprland-session.target"; + systemd.targets = [ "hyprland-session.target" ]; style = '' @import "themes/mocha.css"; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 50eed9f..4335a5e 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -49,7 +49,7 @@ }; # monitor backlight control - light.enable = true; + # light.enable = true; # # thunar file manager(part of xfce) related options # thunar.plugins = with pkgs.xfce; [ |