From dbbddb3e6fdfd0ed121872ef029fed64e29e08e6 Mon Sep 17 00:00:00 2001 From: 4Lost Date: Mon, 30 Sep 2024 16:03:24 +0200 Subject: [PATCH] fix PC --- flake.lock | 158 ++++++++++++++++------------- hardware-configuration-desktop.nix | 7 +- home/programs/default-desktop.nix | 4 +- machines/configuration-desktop.nix | 5 +- machines/configuration-laptop.nix | 2 +- 5 files changed, 101 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index 31ed856..422a6ef 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1726153070, + "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1727514110, + "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1727514110, + "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", "type": "github" }, "original": { @@ -332,11 +332,11 @@ ] }, "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", + "lastModified": 1724947644, + "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", + "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -398,11 +398,11 @@ ] }, "locked": { - "lastModified": 1723796332, - "narHash": "sha256-V1eO+6leWxL4etUpgxi81kC9mOUIPo/gy4GXPqcgQ6E=", + "lastModified": 1727674961, + "narHash": "sha256-IkD7D2+zKyRXlNQ8sg+4dZZAfjkSNVSrWiVpVzY4jZw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b67c560eb553aa29f7e4efa729af61ff4d45c786", + "rev": "23cdd6c58fe389f6c3da06b157b512fedd9d5f5a", "type": "github" }, "original": { @@ -414,11 +414,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1723747612, - "narHash": "sha256-e7QFAYeZSjhQ1H0mk2awv2KcXlsepzXki3uYEUBXZ8Q=", + "lastModified": 1727649824, + "narHash": "sha256-P7a5cu/kHSp0kI2DR048BaEblSvDAlmLsNr9SPa1zI4=", "owner": "neovim", "repo": "neovim", - "rev": "fd65422b99c7cc69e5053a852244cfc9d46d7b65", + "rev": "20251be15a4ad3f6e7016450ca3338d52b2f0951", "type": "github" }, "original": { @@ -435,11 +435,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1727507295, + "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", "type": "github" }, "original": { @@ -450,11 +450,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -495,8 +495,8 @@ "nixpkgs_4": { "locked": { "lastModified": 0, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", - "path": "/nix/store/7v6l2v247fmdgfpbs3w91mf6rinai4yk-source", + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "path": "/nix/store/5w3dp0m37794iffsbm9vd9f1xmmhda6i-source", "type": "path" }, "original": { @@ -519,11 +519,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723778908, - "narHash": "sha256-pWxo0rqf6qf2IHtomEASq5gEzkSB78dD1wizytvU/EM=", + "lastModified": 1727645871, + "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", "owner": "nix-community", "repo": "nixvim", - "rev": "6ab17b1b2e6bc2c10718025105d452dd929cc058", + "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nur": { "locked": { - "lastModified": 1723815900, - "narHash": "sha256-USeM2VAo6DDN8yq6Ve02+ZQB8bqqSBqBfOfkuOmtzUE=", + "lastModified": 1727704090, + "narHash": "sha256-auUJYF6Ub5piXrgxzZzqY0J/QW1/wgctAJuJPG6w3Gs=", "owner": "nix-community", "repo": "NUR", - "rev": "4b5ae3627ff2bbe71adc1502f1321fcbb52006da", + "rev": "df308e60dadeb95306861905b0a334f006d9a7db", "type": "github" }, "original": { @@ -556,11 +556,11 @@ ] }, "locked": { - "lastModified": 1723367906, - "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", + "lastModified": 1727452028, + "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=", "owner": "NuschtOS", "repo": "search", - "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", + "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3", "type": "github" }, "original": { @@ -580,6 +580,27 @@ "xmonad-contrib": "xmonad-contrib" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "wpaperd", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721528458, + "narHash": "sha256-uruH/EV8Rpa/CRxn8CiMzhoA6tJe8qO5c8NdgP1g0rM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "0b2b2da1dad1c675c45d9e23c75674de969de83b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -648,11 +669,11 @@ ] }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1727431250, + "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", "type": "github" }, "original": { @@ -663,11 +684,11 @@ }, "unstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -682,14 +703,15 @@ "nixpkgs": [ "nixpkgs" ], + "rust-overlay": "rust-overlay", "systems": "systems_2" }, "locked": { - "lastModified": 1722260997, - "narHash": "sha256-FPV2mSUEvzKtH/z0Dhwg6aqqX/NNmxS/5tPJFubkmaA=", + "lastModified": 1725357452, + "narHash": "sha256-6ThcLPPfdEDtAEX91WIa6zf8piPIqRvdG68+m3JWXvM=", "owner": "danyspin97", "repo": "wpaperd", - "rev": "0e23789330b806666af9de5f02beb89340e4a046", + "rev": "62af4392f3e447592f768f5420821a344d190107", "type": "github" }, "original": { @@ -706,11 +728,11 @@ "unstable": "unstable" }, "locked": { - "lastModified": 1722277235, - "narHash": "sha256-fuEgR51OPzwff+ygFhBqJm51oA17rR0KtPfuDLv0Fp0=", + "lastModified": 1727679381, + "narHash": "sha256-EyaSYRNdZGvWDjDb9Gk3hPcXNQqwg7pyVp3SOBJ7TBo=", "owner": "xmonad", "repo": "xmonad", - "rev": "a58ccac7ba46414915de6c7f2b4da08b37784016", + "rev": "aadb8df59bca896b198420757aff570e53bd9c9c", "type": "github" }, "original": { @@ -729,11 +751,11 @@ "xmonad": "xmonad" }, "locked": { - "lastModified": 1722984780, - "narHash": "sha256-S9IivsvYeWD/AtAgKUHH0amVfug0qOAPXjNvXbafXag=", + "lastModified": 1726510493, + "narHash": "sha256-0kGVX0iKFHlC2Kgx+bdX68P0qqPQdudSgi11bsvaNJY=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "ec5c751b35c1c9b07bd4361617f7c4076aeaa85f", + "rev": "42340e0f76a7a934f2a4a8d0da3165f74f68e6be", "type": "github" }, "original": { diff --git a/hardware-configuration-desktop.nix b/hardware-configuration-desktop.nix index b338997..0244581 100644 --- a/hardware-configuration-desktop.nix +++ b/hardware-configuration-desktop.nix @@ -8,19 +8,20 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/cc8b74bc-c622-40cb-9b38-13730d1af830"; + { device = "/dev/disk/by-uuid/fcd3cb1a-9ca3-42a1-981d-84b8a709eb26"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/8E6E-28B5"; + { device = "/dev/disk/by-uuid/1A1E-0B59"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ ]; diff --git a/home/programs/default-desktop.nix b/home/programs/default-desktop.nix index 89393c4..7be04e7 100644 --- a/home/programs/default-desktop.nix +++ b/home/programs/default-desktop.nix @@ -1,8 +1,8 @@ { imports = [ ./default.nix - ./audacity-desktop - ./autorandr/default-desktop.nix + #./audacity-desktop + #./autorandr/default-desktop.nix ./zathura/default-desktop.nix ]; } diff --git a/machines/configuration-desktop.nix b/machines/configuration-desktop.nix index 57ce0d1..b179fca 100644 --- a/machines/configuration-desktop.nix +++ b/machines/configuration-desktop.nix @@ -6,9 +6,12 @@ # Hostname networking.hostName = "eliasDesktop"; + services.blueman.enable = true; + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; environment.systemPackages = with pkgs; [ - gnome.networkmanager-vpnc + networkmanager-vpnc networkmanagerapplet ]; } diff --git a/machines/configuration-laptop.nix b/machines/configuration-laptop.nix index 465efed..bf9ca8b 100644 --- a/machines/configuration-laptop.nix +++ b/machines/configuration-laptop.nix @@ -11,7 +11,7 @@ hardware.bluetooth.powerOnBoot = true; environment.systemPackages = with pkgs; [ - gnome.networkmanager-vpnc + networkmanager-vpnc networkmanagerapplet ]; }