diff --git a/blue/configuration.nix b/blue/configuration.nix index f752d7c..e3cd396 100644 --- a/blue/configuration.nix +++ b/blue/configuration.nix @@ -6,7 +6,6 @@ { imports = [ - ./hardware-configuration.nix ]; @@ -70,57 +69,6 @@ variables = { PATH = "$HOME/.cargo/bin"; }; - systemPackages = with pkgs; [ - acpi - binutils - bluez - bluez-tools - btop - direnv - fd - file - fzf - fzy - gnupg - gptfdisk - htop - interception-tools - jq - nano - neovim - nix-index - nmap - ntfs3g - ntfsprogs - openhantek6022 - pax-utils - pciutils - pstree - psutils - ripgrep - rsync - silver-searcher - strace - tig - unrar - unzip - usbutils - vimpc - vulkan-extension-layer - vulkan-loader - vulkan-tools - vulkan-tools-lunarg - vulkan-validation-layers - wget - xdg-utils - zip - z-lua - swaylock - dmidecode - dnsmasq - dhcpcd - uutils-coreutils - ]; }; programs = { @@ -197,7 +145,7 @@ windowManager.i3.enable = true; }; - udev.packages = [ pkgs.openocd pkgs.rtl-sdr pkgs.openhantek6022 ]; + udev.packages = [ pkgs.rtl-sdr pkgs.openhantek6022 ]; tlp = { enable = true; diff --git a/flake.lock b/flake.lock index 5ac8ef8..2dba681 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1691599243, - "narHash": "sha256-Lw3VRCFFbjQLxZu37rL/o2RBb95VG8iThEhEkqo3SV8=", + "lastModified": 1693972774, + "narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a8f8f48320c64bd4e3a266a850bbfde2c6fe3a04", + "rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c", "type": "github" }, "original": { @@ -123,11 +123,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1690066826, - "narHash": "sha256-6L2qb+Zc0BFkh72OS9uuX637gniOjzU6qCDBpjB2LGY=", + "lastModified": 1693675694, + "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce45b591975d070044ca24e3003c830d26fea1c8", + "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1691472822, - "narHash": "sha256-XVfYZ2oB3lNPVq6sHCY9WkdQ8lHoIDzzbpg8bB6oBxA=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41c7605718399dcfa53dd7083793b6ae3bc969ff", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1693626178, + "narHash": "sha256-Rpiy6lIOu4zny8tfGuIeN1ji9eSz9nPmm9yBhh/4IOM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "bfb7dfec93f3b5d7274db109f2990bc889861caf", "type": "github" }, "original": { @@ -234,11 +234,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1690199016, - "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", + "lastModified": 1693898833, + "narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", + "rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ee13bb9..93da671 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,22 @@ } ]; }; + + blue = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + {_module.args = inputs;} + ./blue/configuration.nix + ./blue/hardware-configuration.nix + ./packages.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.akill = import ./home/home.nix; + } + ]; + }; }; devShell.x86_64-linux = pkgs.mkShell { diff --git a/home/home.nix b/home/home.nix index 15b45bb..d3ae925 100644 --- a/home/home.nix +++ b/home/home.nix @@ -53,7 +53,7 @@ in { slang = "eng,en"; alang = "eng,en"; hwdec = "auto"; - vo = "dmabuf-wayland"; + vo = "gpu-next"; ao = "pipewire"; script-opts-set = "ytdl_hook-ytdl_path=yt-dlp,sponsorblock-local_database=no,sponsorblock-skip_categories=[sponsor,intro,selfpromo]"; ytdl-format = "bestvideo[height<=?1080]+bestaudio/best"; @@ -127,7 +127,7 @@ in { qutebrowser = { enable = true; - package = pkgs.qutebrowser-qt6; + package = pkgs.qutebrowser; keyBindings = { normal = { "j" = "scroll-px 0 25"; diff --git a/home/home_packages.nix b/home/home_packages.nix index e4d92c6..661c8c7 100644 --- a/home/home_packages.nix +++ b/home/home_packages.nix @@ -32,7 +32,7 @@ imv jellyfin-media-player kdenlive - kicad + /*kicad*/ kodi-wayland libnotify libreoffice diff --git a/home/i3status-rust.nix b/home/i3status-rust.nix index 5a56de7..e344e7f 100644 --- a/home/i3status-rust.nix +++ b/home/i3status-rust.nix @@ -31,12 +31,7 @@ } { block = "net"; - device = "wlan0"; - interval = 2; - } - { - block = "net"; - device = "enp5s0"; + device = "eno1"; interval = 2; } { diff --git a/home/sway.nix b/home/sway.nix index 101fbc1..860c94b 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -33,16 +33,21 @@ modifier = "Mod4"; output = { eDP-1 = { - bg = "~/pic/weird_dragon.jpg stretch"; /* + bg = "~/pic/weird_dragon.jpg stretch"; scale = "1.4"; */ }; + + HDMI-A-4 = { + res = "1920x1080"; + }; }; + input = { - "1:1:AT_Translated_Set_2_keyboard" = {repeat_delay = "150";}; - "1:1:AT_Translated_Set_2_keyboard" = {repeat_rate = "70";}; - "2:7:SynPS/2_Synaptics_TouchPad" = {tap = "enabled";}; + "type:keyboard" = { repeat_delay = "150"; }; + "type:keyboard" = { repeat_rate = "70"; }; + "*TouchPad" = { tap = "enabled"; }; }; bars = [