diff --git a/configuration.nix b/configuration.nix index 83dbb71..b596b5d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -74,6 +74,7 @@ CPU_MAX_PERF_ON_AC = 100; CPU_MIN_PERF_ON_BAT = 0; CPU_MAX_PERF_ON_BAT = 20; + CPU_SCALING_MAX_FREQ_ON_AC = 5500000; CPU_SCALING_MAX_FREQ_ON_BAT = 1600000; PLATFORM_PROFILE_ON_AC="balanced"; @@ -139,9 +140,18 @@ # Enable the X11 windowing system. services.xserver.enable = true; + + #imports = [ + # ./system/greetd.nix + #]; # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.defaultSession = "gnome"; + services.xserver.displayManager.autoLogin = { + enable = true; + user = "delta"; + }; services.xserver.desktopManager.gnome.enable = true; #services.xserver.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; #gnome without deps, remove gnome.enable @@ -160,6 +170,23 @@ gnome-online-accounts.enable = false; }; + #bluetooth + services.blueman.enable = true; + + #thunar file manager + services.tumbler.enable = true; + services.gvfs.enable = true; + programs.thunar.enable = true; + programs.xfconf.enable = true; + programs.thunar.plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman + #thunar-dropbox-plugin + #thunar-media-tags-plugin + ]; + + + services.udev.packages = [ pkgs.gnome.gnome-settings-daemon ]; programs.dconf.enable = true; @@ -245,9 +272,10 @@ isNormalUser = true; description = "delta"; extraGroups = [ "networkmanager" "wheel" "libvirtd" ]; - #packages = with pkgs; [ - # inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin - #]; + packages = with pkgs; [ + #inputs.firefox.packages.${pkgs.system}.firefox-nightly- + inputs.anyrun.packages.${pkgs.system}.anyrun + ]; }; # Allow unfree packages @@ -272,6 +300,14 @@ micro oath-toolkit expect + ffmpegthumbnailer + webp-pixbuf-loader + freetype + poppler + f3d + nufraw-thumbnailer + unstable.curl + #firefox_nightly ]; systemd.services.NetworkManager-wait-online.enable = false; # Sometimes it stops the PC from shutdown :/ diff --git a/flake.lock b/flake.lock index d4b5a90..060daa8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,59 @@ { "nodes": { + "anyrun": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1701453400, + "narHash": "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=", + "owner": "Kirottu", + "repo": "anyrun", + "rev": "e14da6c37337ffa3ee1bc66965d58ef64c1590e5", + "type": "github" + }, + "original": { + "owner": "Kirottu", + "repo": "anyrun", + "type": "github" + } + }, + "attic": { + "inputs": { + "crane": [ + "chaotic", + "crane" + ], + "flake-compat": [ + "chaotic", + "flake-compat" + ], + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1707922053, + "narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=", + "rev": "6eabc3f02fae3683bffab483e614bebfcd476b21", + "revCount": 193, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.193%2Brev-6eabc3f02fae3683bffab483e614bebfcd476b21/018da817-367d-75ac-bd41-470d92844bf2/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" + } + }, "cachix": { "locked": { "lastModified": 1635350005, @@ -16,20 +70,159 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "attic": "attic", + "compare-to": "compare-to", + "conduit": "conduit", + "crane": "crane", + "fenix": "fenix", + "flake-compat": "flake-compat", + "flake-schemas": "flake-schemas", + "flake-utils": "flake-utils", + "home-manager": "home-manager", + "jovian": "jovian", + "jujutsu": "jujutsu", + "niri": "niri", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "systems": "systems", + "yafas": "yafas" + }, + "locked": { + "lastModified": 1708450303, + "narHash": "sha256-DPfm8RAdeu0W0t5brQx6oEFDoVHAn62GbLF1PAqFXyA=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "bcc38cf311e845079573850249306490e07e6c2a", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, + "compare-to": { + "locked": { + "lastModified": 1695341185, + "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", + "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", + "revCount": 2, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" + } + }, + "conduit": { + "inputs": { + "attic": [ + "chaotic", + "attic" + ], + "crane": [ + "chaotic", + "crane" + ], + "fenix": [ + "chaotic", + "fenix" + ], + "flake-compat": [ + "chaotic", + "flake-compat" + ], + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nix-filter": [ + "chaotic", + "nix-filter" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708220210, + "narHash": "sha256-qsiApRdQEk9Sd3u/iiFt7idUEdsccHc3TcxmsHy3CJ4=", + "owner": "famedly", + "repo": "conduit", + "rev": "be1e2e93073d88ef1972a3c99014a7d14d731b85", + "type": "gitlab" + }, + "original": { + "owner": "famedly", + "ref": "next", + "repo": "conduit", + "type": "gitlab" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706473297, + "narHash": "sha256-FbxuYIrHaXpsYCLtI1gCNJhd+qvERjPibXL3ctmVaCs=", + "rev": "fe812ef0dad5bb93a56c599d318be176d080281d", + "revCount": 493, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.1/018d51be-1c17-765e-babc-c9e3bc8a5a14/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1706768574, + "narHash": "sha256-4o6TMpzBHO659EiJTzd/EGQGUDdbgwKwhqf3u6b23U8=", + "rev": "668102037129923cd0fc239d864fce71eabdc6a3", + "revCount": 1762, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1762%2Brev-668102037129923cd0fc239d864fce71eabdc6a3/018d63bb-6455-7a2f-98c6-74a36b8216a4/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz" + } + }, "firefox": { "inputs": { "cachix": "cachix", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "mozilla": "mozilla", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs-unstable" + ] }, "locked": { - "lastModified": 1708217961, - "narHash": "sha256-RQNcQRu6LYZgrGo9ZNfP4PMUW16r4pIGoNmhhDPpQIU=", + "lastModified": 1708442136, + "narHash": "sha256-JVaRVCbzYJFJXFToC9/zEKd4jLIpzTliFzjppopJB7k=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "8e53e0b26e93e03e668060ded53da7eb2751b7d4", + "rev": "5b57d5f5566e04f71406db0643d4a3ba116d9589", "type": "github" }, "original": { @@ -39,6 +232,21 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz" + } + }, + "flake-compat_2": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -53,9 +261,64 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "anyrun", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-schemas": { + "locked": { + "lastModified": 1693491534, + "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", + "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", + "revCount": 21, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" + } + }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "chaotic", + "systems" + ] + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "revCount": 90, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.90%2Brev-1ef2e671c3b0c19053962c07dbda38332dcebf26/018d0c5a-ac7d-77f2-bef1-1527903ad3cc/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" }, "locked": { "lastModified": 1705309234, @@ -72,6 +335,26 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1702537497, + "narHash": "sha256-br4Z7OFEHWN8oOnKf40BoS6QFt1EyVLqwaVGBG7/DT8=", + "rev": "7a88cdedbda35f808ed2f329a7a811e0511870f9", + "revCount": 3192, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3192%2Brev-7a88cdedbda35f808ed2f329a7a811e0511870f9/018c6725-7e9b-7e8e-bb57-f493c0e4f7dc/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/nix-community/home-manager/0.1.%2A.tar.gz" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -92,17 +375,65 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708148641, + "narHash": "sha256-UliMMpx84PPA+0mcyBj2yuKNawOX7L4u/wO8j9QGHVk=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "f318a856ff3177fdea6044d6c77dd49992330a31", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, + "jujutsu": { + "inputs": { + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1708414713, + "narHash": "sha256-r13AUTu7e0zYRc46NppEJLTUj71Z3obOwrixlqp8JI4=", + "owner": "martinvonz", + "repo": "jj", + "rev": "106483ad6a9d58768124079d0c4142d27fc4e92d", + "type": "github" + }, + "original": { + "owner": "martinvonz", + "repo": "jj", + "type": "github" + } + }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1707653303, - "narHash": "sha256-DSnssBCh1rPPyxGxFawGzWJjfmDB5AL18QHzzDMarqc=", + "lastModified": 1708258113, + "narHash": "sha256-SYqkbLHSe4UxgcNwUHrMPnRmX/oJFzRILrpyn5dsJVE=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "48d8001225a9148f1a97ee519ad53d8272cd8c73", + "rev": "42e4c0c8b04cecec07e796ce8efcb5378e93a319", "type": "github" }, "original": { @@ -111,6 +442,19 @@ "type": "github" } }, + "more-waita": { + "flake": false, + "locked": { + "lastModified": 1706758996, + "narHash": "sha256-+xvRSsGc7ERFxiTj1HT7G29OCQkR0nUZ6+WN03D3AEQ=", + "type": "tarball", + "url": "https://github.com/somepaulo/MoreWaita/archive/refs/heads/main.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/somepaulo/MoreWaita/archive/refs/heads/main.zip" + } + }, "mozilla": { "flake": false, "locked": { @@ -127,29 +471,104 @@ "type": "github" } }, - "nixpkgs": { + "niri": { + "inputs": { + "crane": [ + "chaotic", + "crane" + ], + "fenix": [ + "chaotic", + "fenix" + ], + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nix-filter": [ + "chaotic", + "nix-filter" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "lastModified": 1708418992, + "narHash": "sha256-BHF67chY8L1Os7/sJeEPQVl0yFJgmtJZRqppEnfuRTw=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "c4c07841d7c9f7b86e0142c795282cdf3ef53213", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1708161998, + "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "84d981bae8b5e783b3b548de505b22880559515f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1707612395, - "narHash": "sha256-iqWiOQY+OwL0Yqdqy1dEWsMMpht+0eSlmtpZ5Rws16Y=", + "lastModified": 1708217146, + "narHash": "sha256-nGfEv7k78slqIR5E0zzWSx214d/4/ZPKDkObLJqVLVw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "240f2ff0ed2aac2b91efa29ba3d325526824205b", + "rev": "e623008d8a46517470e6365505f1a3ce171fa46a", "type": "github" }, "original": { @@ -158,6 +577,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1708118438, @@ -174,31 +609,77 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1708161998, - "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "84d981bae8b5e783b3b548de505b22880559515f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { + "anyrun": "anyrun", + "chaotic": "chaotic", "firefox": "firefox", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "home-manager": "home-manager_2", + "more-waita": "more-waita", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1706735270, + "narHash": "sha256-IJk+UitcJsxzMQWm9pa1ZbJBriQ4ginXOlPyVq+Cu40=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "42cb1a2bd79af321b0cc503d2960b73f34e2f92b", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "chaotic", + "jujutsu", + "flake-utils" + ], + "nixpkgs": [ + "chaotic", + "jujutsu", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707444620, + "narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "78503e9199010a4df714f29a4f9c00eb2ccae071", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -212,6 +693,30 @@ "repo": "default", "type": "github" } + }, + "yafas": { + "inputs": { + "flake-schemas": [ + "chaotic", + "flake-schemas" + ], + "systems": [ + "chaotic", + "systems" + ] + }, + "locked": { + "lastModified": 1695926485, + "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", + "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", + "revCount": 4, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/UbiqueLambda/yafas/0.1.4%2Brev-7772afd6686458ca0ddbc599a52cf5d337367653/018add18-ebb4-72c6-93fe-d1d8da361703/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index deffbd0..4ed222f 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,18 @@ home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; firefox.url = "github:nix-community/flake-firefox-nightly"; + firefox.inputs.nixpkgs.follows = "nixpkgs-unstable"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + chaotic.inputs.nixpkgs.follows = "nixpkgs-unstable"; + more-waita = { + url = "https://github.com/somepaulo/MoreWaita/archive/refs/heads/main.zip"; + flake = false; + }; + anyrun.url = "github:Kirottu/anyrun"; + anyrun.inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - outputs = inputs @ { nixpkgs, nixpkgs-unstable, home-manager, firefox, ... }: { + outputs = inputs @ { nixpkgs, nixpkgs-unstable, home-manager, firefox, anyrun, chaotic, ... }: { nixosConfigurations.dlaptop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { @@ -18,6 +27,7 @@ ./configuration.nix ./hardware-configuration.nix home-manager.nixosModules.home-manager + chaotic.nixosModules.default { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home.nix b/home.nix index 9a16971..7ab80d9 100644 --- a/home.nix +++ b/home.nix @@ -21,21 +21,25 @@ ./theme.nix ]; + services.blueman-applet.enable = true; + + programs.tmux.enable = true; + programs.vscode = { enable = true; package = unstable.vscodium; }; home.packages = (with pkgs; [ - git - firefox - rustdesk + git + firefox + rustdesk wl-clipboard wl-clipboard-x11 (callPackage ./audiorelay.nix {}) (callPackage ./spotify.nix {}) - (unstable.telegram-desktop.overrideAttrs (oldAttrs: { + (telegram-desktop.overrideAttrs (oldAttrs: { patches = (oldAttrs.patches or []) ++ [ (fetchpatch { url = "https://raw.githubusercontent.com/Layerex/telegram-desktop-patches/master/0001-Disable-sponsored-messages.patch"; @@ -59,13 +63,22 @@ #discord ]) ++ (with unstable; [ - xfce.thunar - btop - htop - chromium - foot - kitty - alacritty + xfce.thunar + btop + htop + chromium + foot + kitty + alacritty + dig + nwg-displays + nwg-drawer + imagemagick + fastfetch + hyfetch + pavucontrol + wget + wlogout # ]); # ]) ++ (with pkgs.gnome; [ diff --git a/programs/anyrun/default.nix b/programs/anyrun/default.nix new file mode 100644 index 0000000..a595fa1 --- /dev/null +++ b/programs/anyrun/default.nix @@ -0,0 +1,34 @@ + programs.anyrun = { + enable = true; + config = { + plugins = [ + # An array of all the plugins you want, which either can be paths to the .so files, or their packages + #inputs.anyrun.packages.${pkgs.system}.applications + #./some_plugin.so + "${inputs.anyrun.packages.${pkgs.system}.anyrun-with-all-plugins}/lib/kidex" + ]; + width = { fraction = 0.3; }; + position = "top"; + verticalOffset = { absolute = 0; }; + hideIcons = false; + ignoreExclusiveZones = false; + layer = "overlay"; + hidePluginInfo = false; + closeOnClick = false; + showResultsImmediately = false; + maxEntries = null; + }; + #extraCss = '' + # .some_class { + # background: red; + # } + #''; + + extraConfigFiles."some-plugin.ron".text = '' + Config( + // for any other plugin + // this file will be put in ~/.config/anyrun/some-plugin.ron + // refer to docs of xdg.configFile for available options + ) + ''; + }; diff --git a/programs/default.nix b/programs/default.nix index 5df66a7..8758feb 100644 --- a/programs/default.nix +++ b/programs/default.nix @@ -7,5 +7,6 @@ #./rofi #./waybar #./zsh + ./anyrun ]; } diff --git a/programs/hypr/default.nix b/programs/hypr/default.nix index 741a1bd..166bd3b 100644 --- a/programs/hypr/default.nix +++ b/programs/hypr/default.nix @@ -22,7 +22,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ #monitor=,preferred,auto,1.066667 #monitor=,preferred,90,1.066667 - monitor=eDP-1,preferred,auto,1 + monitor=eDP-1,preferred,auto,1.5 #monitor=eDP-1,preferred,auto,1.066667 #source = ~/.config/hypr/monitors.conf #source = ~/.config/hypr/workspaces.conf diff --git a/programs/hypr/hyprland-environment.nix b/programs/hypr/hyprland-environment.nix index 1ea4e1b..a03056c 100644 --- a/programs/hypr/hyprland-environment.nix +++ b/programs/hypr/hyprland-environment.nix @@ -18,6 +18,8 @@ #XDG_CURRENT_DESKTOP = "Hyprland"; #XDG_SESSION_DESKTOP = "Hyprland"; #XDG_SESSION_TYPE = "wayland"; + + MOZ_USE_XINPUT2 = "1"; }; }; } diff --git a/system/greetd.nix b/system/greetd.nix index a70cb02..6b29834 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -1,19 +1,18 @@ { pkgs, inputs, ... }: let tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet"; - hyprland-session = "${inputs.hyprland.packages.${pkgs.system}.hyprland}/share/wayland-sessions"; in { services.greetd = { enable = true; - settings = { - default_session = { - command = "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}"; - user = "greeter"; - }; - }; }; + environment.etc."greetd/environments".text = '' + Hyprland + fish + bash + ''; + # this is a life saver. # literally no documentation about this anywhere. # might be good to write about this...