From 71a3df098d9b078f37e51e515c2f67adf8e702e8 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Fri, 22 May 2026 00:44:44 +0300 Subject: [PATCH] flake update 2026-05-22 --- darwin/default.nix | 1 - flake.lock | 192 ++++++++---------- flake.nix | 10 +- hardware.nix | 1 - home/darwin.nix | 2 - home/dots/fish/auto-Hypr.fish | 4 - .../fish/conf.d/fish_frozen_key_bindings.fish | 1 - home/dots/fish/conf.d/fish_frozen_theme.fish | 27 --- home/dots/fish/config.fish | 19 -- home/dots/fish/fish_variables | 4 - home/hyprland.nix | 8 +- home/linux.nix | 8 +- home/shared.nix | 7 - machine.nix | 11 +- nixos/boot/default.nix | 8 +- nixos/default.nix | 1 + nixos/desktop/window-managers/hyprland.nix | 15 +- nixos/gaming/default.nix | 7 +- nixos/gaming/steam/default.nix | 3 - nixos/hardware/graphics/amd.nix | 5 +- nixos/hardware/graphics/default.nix | 26 ++- nixos/hardware/graphics/intel.nix | 5 +- nixos/hardware/graphics/nvidia.nix | 7 +- nixos/hardware/graphics/prime.nix | 4 +- nixos/networking/network-manager/default.nix | 5 +- nixos/networking/vpn/default.nix | 1 - nixos/services/appimage/default.nix | 1 + nixos/services/default.nix | 1 - nixos/services/flatpak/default.nix | 2 +- nixos/services/fwupd/default.nix | 2 +- nixos/services/kde_connect/default.nix | 2 +- nixos/services/performance/default.nix | 2 +- nixos/services/printing/default.nix | 11 +- nixos/services/samba/default.nix | 62 ------ nixos/services/ssh/default.nix | 2 +- nixos/system/fonts/default.nix | 2 - nixos/system/kmscon/default.nix | 16 +- nixos/system/locale/default.nix | 3 +- nixos/system/nix/default.nix | 2 +- nixos/users/default.nix | 5 +- nixos/virtualization/default.nix | 1 - nixos/virtualization/docker/default.nix | 2 +- nixos/virtualization/virt-manager/default.nix | 3 +- nixos/virtualization/vmware/default.nix | 5 - packages.nix | 5 - 45 files changed, 188 insertions(+), 323 deletions(-) delete mode 100644 home/dots/fish/auto-Hypr.fish delete mode 100644 home/dots/fish/conf.d/fish_frozen_key_bindings.fish delete mode 100644 home/dots/fish/conf.d/fish_frozen_theme.fish delete mode 100755 home/dots/fish/config.fish delete mode 100755 home/dots/fish/fish_variables delete mode 100644 nixos/services/samba/default.nix delete mode 100644 nixos/virtualization/vmware/default.nix diff --git a/darwin/default.nix b/darwin/default.nix index 8c5415e..d8094ad 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -1,6 +1,5 @@ { pkgs, - inputs, system, ... }: diff --git a/flake.lock b/flake.lock index e992c45..e6e0043 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1776876344, - "narHash": "sha256-Ubqb/agkuMJK+k19gjQgHux/eOYRc1sRGoOZOho8+VY=", + "lastModified": 1778620495, + "narHash": "sha256-Gu7UhWjwKCgSiVC3Qz/Rc7cYi9DNuDTBxYzg3kfLvfM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "648a13d0ee1e03a843b3e145b8ece15393058701", + "rev": "be35f75ac305f430f5f9d89b5f5a4af59ca7567e", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1776881435, - "narHash": "sha256-j8AobLjMzeKJugseObrVC4O5k7/aZCWoft2sCS3jWYs=", + "lastModified": 1779085181, + "narHash": "sha256-ZdiBlGOkI9tS3ggyNlJ5gU4qCkvGWLT3sbrnHEemN2o=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "1c61dfd1c3ad7762faa0db8b06c6af6c59cc4340", + "rev": "391e1e35d62d30dccd14ec3af01d58e5310b7d80", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1777002108, - "narHash": "sha256-PIZCIf6xUTOUqLFbEGH0mSwu2O/YfeAmYlgdAbP4dhs=", + "lastModified": 1779191960, + "narHash": "sha256-QqEC7SVMVf1vj9OoflWzP+nGewMrUNSBSf1dB8sUbqY=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "46476ae2538db486462aef8a9de37d19030cdaf2", + "rev": "65cbbfc17bb7e172cb06ef69037be5b0d517b2cd", "type": "github" }, "original": { @@ -95,7 +95,9 @@ }, "copetch": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1775829566, @@ -164,11 +166,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -226,11 +228,11 @@ ] }, "locked": { - "lastModified": 1777530617, - "narHash": "sha256-wykRypZGZHxuWkIR81ehffKPAUVJpr+OTDQEdEm7P9g=", + "lastModified": 1779314275, + "narHash": "sha256-AprEf5uAvzg8RFRxmU1Ofjm5LzCDkljOIIzKI9Zkp5Q=", "owner": "AlvaroParker", "repo": "helium-nix", - "rev": "fdcae8574a28e78678411e7c4fdb8ed56921cdcc", + "rev": "f299210473440333503d607f59d3b911539b69ed", "type": "github" }, "original": { @@ -246,11 +248,11 @@ ] }, "locked": { - "lastModified": 1777518431, - "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=", + "lastModified": 1779336838, + "narHash": "sha256-n1+l78hJRABp4cQHKeD0BVByT0vZLPqd09Tvoq8Q+d8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670", + "rev": "928d72376949e222ea4f07b44828a55b0136422e", "type": "github" }, "original": { @@ -267,11 +269,11 @@ ] }, "locked": { - "lastModified": 1776184304, - "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", + "lastModified": 1778805320, + "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c7524c68348ef79ce48308e0978611a050089b2", + "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92", "type": "github" }, "original": { @@ -349,17 +351,17 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1777555818, - "narHash": "sha256-DXP/6/nIXTy6MkCFQtcTQS5qRT5uQBS9YmjPO1Nj/3I=", + "lastModified": 1779392427, + "narHash": "sha256-0SiD8JBx6cU0KL1XjLMsR/nSZB5XY3uhrNnvfxH0CtY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "859bbb11e16029bfa5ad6a1418bde23f29bd7d86", + "rev": "8b7110cc68662a343b6839f292ac0f44a64c3364", "type": "github" }, "original": { @@ -431,11 +433,11 @@ ] }, "locked": { - "lastModified": 1777392029, - "narHash": "sha256-iTtzJsp4hXp7/Y+2kVaosPPNBeUJbFiqQcZVRUtC+dM=", + "lastModified": 1779209205, + "narHash": "sha256-asc7NpeB8vD66gvZeYcQkaWOs2X6Jgd29vBtP17vjxo=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "473804b3594dd829295484f1f479a560b8114f2d", + "rev": "1cb37fad68dff5f5840010c314fed5809b4ee66f", "type": "github" }, "original": { @@ -485,11 +487,11 @@ ] }, "locked": { - "lastModified": 1776426736, - "narHash": "sha256-rl7i4aY+9p8LysJp7o8uRWahCkpFznCgGHXszlTw7b0=", + "lastModified": 1777320127, + "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "7833ff33b2e82d3406337b5dcf0d1cec595d83e9", + "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", "type": "github" }, "original": { @@ -562,11 +564,11 @@ ] }, "locked": { - "lastModified": 1777492286, - "narHash": "sha256-PwuoEJQcjSKJNP5T55qhfDwIP0tw5zxEhfu8GDfKfeg=", + "lastModified": 1778234770, + "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "ec5c0c709706bad5b82f667fd8758eae442577ce", + "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2", "type": "github" }, "original": { @@ -587,11 +589,11 @@ ] }, "locked": { - "lastModified": 1777148232, - "narHash": "sha256-Uv0WZLhu89SafuSOmYDA7akrPt4wBRmsa1ucasO5aXg=", + "lastModified": 1777159683, + "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "fec9cf1abcc1011e46f0a0986f46bf93c6bf8b92", + "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", "type": "github" }, "original": { @@ -616,11 +618,11 @@ ] }, "locked": { - "lastModified": 1776728575, - "narHash": "sha256-z9eGphrArEBpl1O/GCH0wlY6z4K9vA6yWh2gAS6qytU=", + "lastModified": 1778410714, + "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "f3a80888783702a39691b684d099e16b83ed4702", + "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", "type": "github" }, "original": { @@ -635,14 +637,14 @@ "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1777227006, - "narHash": "sha256-A7GcOXjfo2xmZ3ERgN0j6GcqaVzqIf5zpYQcdfDaMr0=", + "lastModified": 1779306729, + "narHash": "sha256-ccC0CMMW6a4sz1L9Ze9uskiT3nvGMbRA5/ZAfUkYsZ0=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "0f7e2bea4088227a80502557f6c0e3b74949d6b5", + "rev": "ac9f02824490d781e39e252d1fab0114fed1d9c7", "type": "github" }, "original": { @@ -659,11 +661,11 @@ ] }, "locked": { - "lastModified": 1775037210, - "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", + "lastModified": 1779036909, + "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "06648f4902343228ce2de79f291dd5a58ee12146", + "rev": "56c666e108467d87d13508936aade6d567f2a501", "type": "github" }, "original": { @@ -674,11 +676,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -690,11 +692,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -705,27 +707,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1779273561, + "narHash": "sha256-O3UFKrh5oDyOwqD4Njdf7+SIxptOl3gHZyesYvNsIbw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1777187199, - "narHash": "sha256-RJlLGrl+xHndIVK1NbPkIsItePNB3X4PIe8UTk3AHnw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "facea5e538604efa4893c08770fe9fca5bf62c2f", + "rev": "8e72e9888e67ce593df16546cd31e0d75544ad0d", "type": "github" }, "original": { @@ -735,29 +721,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -775,11 +745,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777427472, - "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=", + "lastModified": 1779372755, + "narHash": "sha256-H9aGZWiEuFyBo8w2p+ctpbAOT+/OHQG8v9poS0qNCPM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186", + "rev": "8e37cecde14922eb8aecfe8eb6ca92a20f5c4ba6", "type": "github" }, "original": { @@ -798,11 +768,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777380063, - "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", + "lastModified": 1778983195, + "narHash": "sha256-hE3EFK5GoSdbO5WHZ8bZDUVYkofbDLQN/KK25z7IOOI=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", + "rev": "4116b41cdc89e186be7cb8b24a9b6022af95d742", "type": "github" }, "original": { @@ -833,11 +803,11 @@ ] }, "locked": { - "lastModified": 1776796298, - "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", + "lastModified": 1778507602, + "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", + "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", "type": "github" }, "original": { @@ -856,7 +826,7 @@ "hyprland-plugins": "hyprland-plugins", "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "noctalia": "noctalia", "zen-browser": "zen-browser" } @@ -1040,11 +1010,11 @@ ] }, "locked": { - "lastModified": 1777035886, - "narHash": "sha256-m1TNuBoSXUBSKhD9UVMkU90M0wFTPTfvIOOltO8IM8A=", + "lastModified": 1778265244, + "narHash": "sha256-8jlPtGSsv/CQY6tVVyLF4Jjd0gnS+Zbn9yk/V13A9nM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "ecfcdcc781f48821d83e1e2a0e30d7beca0eeb5e", + "rev": "813ea5ca9a1702a9a2d1f5836bc00172ef698968", "type": "github" }, "original": { @@ -1056,14 +1026,16 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1777530527, - "narHash": "sha256-EWEMj4tKScXvUD3mx7IQwrBrozKZEOy0Vdge5HwJZ+w=", + "lastModified": 1779377324, + "narHash": "sha256-svU6Ro4xiMxMA1KJGwQ/nfKwz3yXE/SONCw2Z1qTXHA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f540b026224e5218512e6fc814d1b5a10638bc1f", + "rev": "1ac4a5872e1d76a93329a4d0698d0de35b8bdd67", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dbebd38..1cebbdd 100644 --- a/flake.nix +++ b/flake.nix @@ -8,8 +8,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; - copetch.url = "github:elwrcl/copetch"; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + copetch = { + url = "github:elwrcl/copetch"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprland.url = "github:hyprwm/Hyprland"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; diff --git a/hardware.nix b/hardware.nix index a816785..4cc0d5b 100644 --- a/hardware.nix +++ b/hardware.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, modulesPath, ... }: diff --git a/home/darwin.nix b/home/darwin.nix index 643e34c..ae87ac2 100644 --- a/home/darwin.nix +++ b/home/darwin.nix @@ -1,7 +1,5 @@ { pkgs, - inputs, - system, ... }: diff --git a/home/dots/fish/auto-Hypr.fish b/home/dots/fish/auto-Hypr.fish deleted file mode 100644 index deee35e..0000000 --- a/home/dots/fish/auto-Hypr.fish +++ /dev/null @@ -1,4 +0,0 @@ -if test -z "$DISPLAY" ;and test "$XDG_VTNR" -eq 1 - mkdir -p ~/.cache - exec start-hyprland > ~/.cache/hyprland.log 2>&1 -end diff --git a/home/dots/fish/conf.d/fish_frozen_key_bindings.fish b/home/dots/fish/conf.d/fish_frozen_key_bindings.fish deleted file mode 100644 index 9228faf..0000000 --- a/home/dots/fish/conf.d/fish_frozen_key_bindings.fish +++ /dev/null @@ -1 +0,0 @@ -set --erase --universal fish_key_bindings diff --git a/home/dots/fish/conf.d/fish_frozen_theme.fish b/home/dots/fish/conf.d/fish_frozen_theme.fish deleted file mode 100644 index 7a3aab6..0000000 --- a/home/dots/fish/conf.d/fish_frozen_theme.fish +++ /dev/null @@ -1,27 +0,0 @@ -set --global fish_color_autosuggestion 555 brblack -set --global fish_color_cancel -r -set --global fish_color_command blue -set --global fish_color_comment red -set --global fish_color_cwd green -set --global fish_color_cwd_root red -set --global fish_color_end green -set --global fish_color_error brred -set --global fish_color_escape brcyan -set --global fish_color_history_current --bold -set --global fish_color_host normal -set --global fish_color_host_remote yellow -set --global fish_color_normal normal -set --global fish_color_operator brcyan -set --global fish_color_param cyan -set --global fish_color_quote yellow -set --global fish_color_redirection cyan --bold -set --global fish_color_search_match --background=111 -set --global fish_color_selection white --bold --background=brblack -set --global fish_color_status red -set --global fish_color_user brgreen -set --global fish_color_valid_path --underline -set --global fish_pager_color_completion normal -set --global fish_pager_color_description B3A06D yellow -i -set --global fish_pager_color_prefix cyan --bold --underline -set --global fish_pager_color_progress brwhite --background=cyan -set --global fish_pager_color_selected_background -r diff --git a/home/dots/fish/config.fish b/home/dots/fish/config.fish deleted file mode 100755 index 6b1fdd5..0000000 --- a/home/dots/fish/config.fish +++ /dev/null @@ -1,19 +0,0 @@ -function fish_prompt -d "Write out the prompt" - printf '%s@%s %s%s%s > ' $USER $hostname \ - (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) -end - -if status is-interactive - set fish_greeting - starship init fish | source - if test -f ~/.local/state/quickshell/user/generated/terminal/sequences.txt - cat ~/.local/state/quickshell/user/generated/terminal/sequences.txt - end - - alias clear "printf '\033[2J\033[3J\033[1;1H'" - alias celar "printf '\033[2J\033[3J\033[1;1H'" - alias claer "printf '\033[2J\033[3J\033[1;1H'" - alias ls 'eza --icons' - alias q 'qs -c ii' - -end diff --git a/home/dots/fish/fish_variables b/home/dots/fish/fish_variables deleted file mode 100755 index 7ae6f9c..0000000 --- a/home/dots/fish/fish_variables +++ /dev/null @@ -1,4 +0,0 @@ -SETUVAR __fish_initialized:4300 -SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher -SETUVAR _fisher_upgraded_to_4_4:\x1d diff --git a/home/hyprland.nix b/home/hyprland.nix index 4e38967..6005315 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,4 +1,8 @@ -{ pkgs, inputs, ... }: +{ + pkgs, + inputs, + ... +}: { imports = [ ./hypr/default.nix ]; @@ -7,7 +11,7 @@ enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; xwayland.enable = true; - systemd.enable = true; + systemd.enable = false; systemd.variables = [ "-all" ]; }; } diff --git a/home/linux.nix b/home/linux.nix index 27822cf..b87791e 100644 --- a/home/linux.nix +++ b/home/linux.nix @@ -72,15 +72,8 @@ home.packages = with pkgs; [ # wayland-specific - xdotool wl-clipboard waybar - wofi - fuzzel - swaylock - swayidle - feh - eww easyeffects swappy grim @@ -122,6 +115,7 @@ inputs.zen-browser.packages.${system}.default inputs.helium.packages.${system}.default inputs.noctalia.packages.${system}.default + inputs.copetch.packages.${system}.default pkgs.qt6Packages.qtwebsockets ]; } diff --git a/home/shared.nix b/home/shared.nix index ff74be8..f1f1ad7 100644 --- a/home/shared.nix +++ b/home/shared.nix @@ -37,7 +37,6 @@ xdg.configFile = { "fastfetch".source = ./dots/fastfetch; - "fish/conf.d".source = ./dots/fish/conf.d; }; home.packages = with pkgs; [ @@ -45,7 +44,6 @@ eza bat fd - micro fastfetch zoxide trash-cli @@ -53,7 +51,6 @@ tldr jq zip - p7zip rar dos2unix unzip @@ -64,7 +61,6 @@ git cachix btop - alacritty kitty xdg-utils ani-cli @@ -80,9 +76,7 @@ pamixer # editors - vim neovim - helix vscode zed-editor @@ -95,7 +89,6 @@ openssl pkg-config aubio - docker-compose cargo-tauri trunk dioxus-cli diff --git a/machine.nix b/machine.nix index e763c40..da14c78 100644 --- a/machine.nix +++ b/machine.nix @@ -1,11 +1,10 @@ { pkgs, - inputs, ... }: + let packages = import ./packages.nix { inherit pkgs; }; - system = pkgs.system; in { imports = [ @@ -21,13 +20,7 @@ in algorithm = "zstd"; priority = 100; }; - environment.systemPackages = packages.system ++ [ - inputs.helium.packages.${system}.default - inputs.zen-browser.packages.${system}.default - inputs.noctalia.packages.${system}.default - inputs.copetch.packages.${system}.default - pkgs.qt6Packages.qtwebsockets - ]; + environment.systemPackages = packages.system; environment.pathsToLink = [ "/share/applications" "/share/icons" diff --git a/nixos/boot/default.nix b/nixos/boot/default.nix index 3706366..01095b9 100644 --- a/nixos/boot/default.nix +++ b/nixos/boot/default.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: { imports = [ @@ -10,10 +13,9 @@ boot.kernelParams = [ "preempt=full" - "i915.enable_fbc=1" "mitigations=off" "usbcore.autosuspend=-1" - "transparent_hugepage=always" + "transparent_hugepage=madvise" ]; boot.loader = { diff --git a/nixos/default.nix b/nixos/default.nix index 9835414..f5e9c7b 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,4 +1,5 @@ { ... }: + { imports = [ ./boot diff --git a/nixos/desktop/window-managers/hyprland.nix b/nixos/desktop/window-managers/hyprland.nix index 2510d37..06de54b 100644 --- a/nixos/desktop/window-managers/hyprland.nix +++ b/nixos/desktop/window-managers/hyprland.nix @@ -1,6 +1,5 @@ { pkgs, - lib, inputs, ... }: @@ -17,20 +16,14 @@ xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - config.common.default = [ "hyprland" "gtk" ]; + config.common.default = [ + "hyprland" + "gtk" + ]; }; services = { dbus.enable = true; - pipewire = { - enable = true; - pulse.enable = true; - wireplumber.enable = true; - }; - gnome = { - gnome-keyring.enable = true; - gnome-settings-daemon.enable = lib.mkDefault false; - }; }; security.polkit.enable = true; diff --git a/nixos/gaming/default.nix b/nixos/gaming/default.nix index bb112a8..25a395c 100644 --- a/nixos/gaming/default.nix +++ b/nixos/gaming/default.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: { imports = [ @@ -14,4 +17,4 @@ protonup-qt mangohud ]; -} \ No newline at end of file +} diff --git a/nixos/gaming/steam/default.nix b/nixos/gaming/steam/default.nix index 82cab25..0d1ec0d 100644 --- a/nixos/gaming/steam/default.nix +++ b/nixos/gaming/steam/default.nix @@ -1,5 +1,4 @@ { - config, pkgs, ... }: @@ -30,7 +29,5 @@ capSysNice = true; }; - programs.bash.enable = true; - hardware.graphics.enable = true; hardware.steam-hardware.enable = true; } diff --git a/nixos/hardware/graphics/amd.nix b/nixos/hardware/graphics/amd.nix index 50782fc..02ca5c5 100644 --- a/nixos/hardware/graphics/amd.nix +++ b/nixos/hardware/graphics/amd.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: { hardware.graphics.extraPackages = with pkgs; [ diff --git a/nixos/hardware/graphics/default.nix b/nixos/hardware/graphics/default.nix index d841754..e2896dc 100644 --- a/nixos/hardware/graphics/default.nix +++ b/nixos/hardware/graphics/default.nix @@ -1,11 +1,21 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let driver = config.elars.hardware.graphics.driver; in { options.elars.hardware.graphics.driver = lib.mkOption { - type = lib.types.enum [ "intel" "amd" "nvidia" "hybrid-amd-nvidia" ]; + type = lib.types.enum [ + "intel" + "amd" + "nvidia" + "hybrid-amd-nvidia" + ]; default = "intel"; }; @@ -20,10 +30,12 @@ in (lib.mkIf (driver == "intel") (import ./intel.nix { inherit config lib pkgs; })) (lib.mkIf (driver == "amd") (import ./amd.nix { inherit config lib pkgs; })) (lib.mkIf (driver == "nvidia") (import ./nvidia.nix { inherit config lib pkgs; })) - (lib.mkIf (driver == "hybrid-amd-nvidia") (lib.mkMerge [ - (import ./amd.nix { inherit config lib pkgs; }) - (import ./nvidia.nix { inherit config lib pkgs; }) - (import ./prime.nix { inherit config lib pkgs; }) - ])) + (lib.mkIf (driver == "hybrid-amd-nvidia") ( + lib.mkMerge [ + (import ./amd.nix { inherit config lib pkgs; }) + (import ./nvidia.nix { inherit config lib pkgs; }) + (import ./prime.nix { inherit config lib pkgs; }) + ] + )) ]; } diff --git a/nixos/hardware/graphics/intel.nix b/nixos/hardware/graphics/intel.nix index df26c3d..a0215af 100644 --- a/nixos/hardware/graphics/intel.nix +++ b/nixos/hardware/graphics/intel.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: let wayland-intel-vaapi-driver = pkgs.intel-vaapi-driver.overrideAttrs (oldAttrs: { diff --git a/nixos/hardware/graphics/nvidia.nix b/nixos/hardware/graphics/nvidia.nix index 4d56d47..dc97219 100644 --- a/nixos/hardware/graphics/nvidia.nix +++ b/nixos/hardware/graphics/nvidia.nix @@ -1,11 +1,14 @@ -{ config, ... }: +{ + config, + ... +}: { services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { modesetting.enable = true; - open = false; # for 20xx series make true for 30xx and newer + open = false; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.stable; }; diff --git a/nixos/hardware/graphics/prime.nix b/nixos/hardware/graphics/prime.nix index 2c40942..811211d 100644 --- a/nixos/hardware/graphics/prime.nix +++ b/nixos/hardware/graphics/prime.nix @@ -3,7 +3,7 @@ { hardware.nvidia.prime = { offload.enable = true; - amdgpuBusId = "PCI:X:X:X"; # TODO - nvidiaBusId = "PCI:X:X:X"; # TODO + amdgpuBusId = "PCI:X:X:X"; # change to your AMD GPU's bus ID, e.g. "PCI:1:0:0" + nvidiaBusId = "PCI:X:X:X"; # change to your NVIDIA GPU's bus ID, e.g. "PCI:2:0:0" }; } diff --git a/nixos/networking/network-manager/default.nix b/nixos/networking/network-manager/default.nix index c103a6c..8951724 100644 --- a/nixos/networking/network-manager/default.nix +++ b/nixos/networking/network-manager/default.nix @@ -13,7 +13,10 @@ DNSOverTLS = "yes"; DNSSEC = "false"; Domains = [ "~." ]; - FallbackDNS = [ "1.1.1.1" "8.8.8.8" ]; + FallbackDNS = [ + "1.1.1.1" + "8.8.8.8" + ]; }; }; }; diff --git a/nixos/networking/vpn/default.nix b/nixos/networking/vpn/default.nix index 6e76c53..c2f8191 100644 --- a/nixos/networking/vpn/default.nix +++ b/nixos/networking/vpn/default.nix @@ -1,7 +1,6 @@ { ... }: { - #services.cloudflare-warp.enable = true; services.zapret = { enable = true; params = [ diff --git a/nixos/services/appimage/default.nix b/nixos/services/appimage/default.nix index a890a25..5398e80 100644 --- a/nixos/services/appimage/default.nix +++ b/nixos/services/appimage/default.nix @@ -1,4 +1,5 @@ { ... }: + { programs.appimage = { enable = true; diff --git a/nixos/services/default.nix b/nixos/services/default.nix index d4330e3..0393bc1 100644 --- a/nixos/services/default.nix +++ b/nixos/services/default.nix @@ -9,7 +9,6 @@ ./ollama ./performance ./printing - ./samba ./security ./ssh ]; diff --git a/nixos/services/flatpak/default.nix b/nixos/services/flatpak/default.nix index 7eb281b..e785c3f 100644 --- a/nixos/services/flatpak/default.nix +++ b/nixos/services/flatpak/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ...}: +{ ... }: { services.flatpak.enable = true; diff --git a/nixos/services/fwupd/default.nix b/nixos/services/fwupd/default.nix index 7b78ae0..52dc13e 100644 --- a/nixos/services/fwupd/default.nix +++ b/nixos/services/fwupd/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { services.fwupd.enable = true; diff --git a/nixos/services/kde_connect/default.nix b/nixos/services/kde_connect/default.nix index 823b4bb..3aeef6e 100644 --- a/nixos/services/kde_connect/default.nix +++ b/nixos/services/kde_connect/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { programs.kdeconnect.enable = true; diff --git a/nixos/services/performance/default.nix b/nixos/services/performance/default.nix index 8413e95..179718c 100644 --- a/nixos/services/performance/default.nix +++ b/nixos/services/performance/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { services.scx = { diff --git a/nixos/services/printing/default.nix b/nixos/services/printing/default.nix index 03eb2ee..624b538 100644 --- a/nixos/services/printing/default.nix +++ b/nixos/services/printing/default.nix @@ -1,9 +1,16 @@ -{ config, pkgs, ... }: +{ + pkgs, + ... +}: { services.printing = { enable = true; - drivers = [ pkgs.cnijfilter2 pkgs.gutenprint pkgs.gutenprintBin ]; + drivers = [ + pkgs.cnijfilter2 + pkgs.gutenprint + pkgs.gutenprintBin + ]; }; services.avahi = { diff --git a/nixos/services/samba/default.nix b/nixos/services/samba/default.nix deleted file mode 100644 index 1a9a782..0000000 --- a/nixos/services/samba/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - systemd.tmpfiles.rules = [ - "d /var/lib/samba/usershares 0755 elars users -" - ]; - - environment.etc."samba/smbusers".text = '' - nobody = guest - ''; - - services.samba = { - enable = false; - openFirewall = true; - settings = { - global = { - workgroup = "WORKGROUP"; - "server string" = config.networking.hostName; - "netbios name" = config.networking.hostName; - security = "user"; - "use sendfile" = "yes"; - "max protocol" = "SMB3"; - "min protocol" = "SMB2"; - "hosts allow" = "192.168.1.0/24 127.0.0.1 localhost"; - "hosts deny" = "0.0.0.0/0"; - "guest account" = "nobody"; - "map to guest" = "Bad User"; - "usershare path" = "/var/lib/samba/usershares"; - "usershare max shares" = "100"; - "usershare allow guests" = "yes"; - "usershare owner only" = "no"; - "usershare prefix allow list" = "/mnt /home"; - "idmap config * : backend" = "tdb"; - "idmap config * : range" = "3000-7999"; - "username map" = "/etc/samba/smbusers"; - }; - - "HDD" = { - path = "/mnt/HDD"; - browseable = "yes"; - public = "yes"; - "read only" = "no"; - "guest ok" = "yes"; - "guest only" = "yes"; - "create mask" = "0664"; - "directory mask" = "0775"; - "force user" = config.users.users.elars.name; - "force group" = "users"; - }; - }; - }; - - services.samba-wsdd = { - enable = false; - openFirewall = true; - }; -} diff --git a/nixos/services/ssh/default.nix b/nixos/services/ssh/default.nix index 658b492..f29c3fe 100644 --- a/nixos/services/ssh/default.nix +++ b/nixos/services/ssh/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { services.openssh.enable = true; diff --git a/nixos/system/fonts/default.nix b/nixos/system/fonts/default.nix index 7e43781..dbc6c34 100644 --- a/nixos/system/fonts/default.nix +++ b/nixos/system/fonts/default.nix @@ -15,11 +15,9 @@ ipaexfont nerd-fonts.jetbrains-mono nerd-fonts.caskaydia-cove - noto-fonts-cjk-sans nerd-fonts.symbols-only inputs.apple-fonts.packages.${system}.sf-pro inputs.apple-fonts.packages.${system}.sf-mono - nerd-fonts.jetbrains-mono ]; fontconfig = { diff --git a/nixos/system/kmscon/default.nix b/nixos/system/kmscon/default.nix index 5f33c53..a50279e 100644 --- a/nixos/system/kmscon/default.nix +++ b/nixos/system/kmscon/default.nix @@ -1,12 +1,18 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: + { services.kmscon = { enable = true; hwRender = true; - fonts = [{ - name = "JetBrainsMono Nerd Font"; - package = pkgs.nerd-fonts.jetbrains-mono; - }]; + fonts = [ + { + name = "JetBrainsMono Nerd Font"; + package = pkgs.nerd-fonts.jetbrains-mono; + } + ]; extraConfig = '' font-size=10 ''; diff --git a/nixos/system/locale/default.nix b/nixos/system/locale/default.nix index f227414..62a6635 100644 --- a/nixos/system/locale/default.nix +++ b/nixos/system/locale/default.nix @@ -1,4 +1,5 @@ -{ config, pkgs, ... }: +{ ... }: + { time.timeZone = "Europe/Istanbul"; i18n.defaultLocale = "en_US.UTF-8"; diff --git a/nixos/system/nix/default.nix b/nixos/system/nix/default.nix index f91cf79..a61e3b7 100644 --- a/nixos/system/nix/default.nix +++ b/nixos/system/nix/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { nix.settings = { diff --git a/nixos/users/default.nix b/nixos/users/default.nix index 4819cd9..e3f63e8 100644 --- a/nixos/users/default.nix +++ b/nixos/users/default.nix @@ -1,4 +1,7 @@ -{ pkgs, ... }: +{ + pkgs, + ... +}: { users.users.elars = { diff --git a/nixos/virtualization/default.nix b/nixos/virtualization/default.nix index 0972f87..3dcc990 100644 --- a/nixos/virtualization/default.nix +++ b/nixos/virtualization/default.nix @@ -3,7 +3,6 @@ { imports = [ ./docker - ./vmware ./virt-manager ]; } diff --git a/nixos/virtualization/docker/default.nix b/nixos/virtualization/docker/default.nix index 41a44a9..0582d99 100644 --- a/nixos/virtualization/docker/default.nix +++ b/nixos/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { virtualisation.docker.enable = true; diff --git a/nixos/virtualization/virt-manager/default.nix b/nixos/virtualization/virt-manager/default.nix index acedb61..0528c47 100644 --- a/nixos/virtualization/virt-manager/default.nix +++ b/nixos/virtualization/virt-manager/default.nix @@ -1,4 +1,5 @@ -{ config, pkgs, ... }: +{ ... }: + { virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; diff --git a/nixos/virtualization/vmware/default.nix b/nixos/virtualization/vmware/default.nix deleted file mode 100644 index 2e7a42c..0000000 --- a/nixos/virtualization/vmware/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: - -{ - virtualisation.vmware.host.enable = false; -} diff --git a/packages.nix b/packages.nix index 5f73dae..03f54e5 100644 --- a/packages.nix +++ b/packages.nix @@ -18,11 +18,6 @@ with pkgs; usbmuxd uxplay-fixed - # vm - virt-manager - libvirt - qemu - # hardware ddcutil libsecret