From 5941de0c7f88684103b15eb2cfb390254c64cb70 Mon Sep 17 00:00:00 2001 From: cnst Date: Wed, 10 Jul 2024 19:18:50 +0200 Subject: [PATCH] ugly fix while python is being dealt with --- flake.lock | 208 +++++++--------------------- flake.nix | 10 +- home/core/gui/anyrun/default.nix | 33 +---- home/core/gui/anyrun/style-dark.css | 10 +- home/core/gui/gtk/default.nix | 2 +- home/core/gui/xdg/default.nix | 4 - home/core/tui/shell/cnst.nix | 2 +- home/extra/neovim/default.nix | 2 + home/users/cnst/imports.nix | 9 +- nixos/extra/gaming.nix | 2 +- nixos/hosts/cnix/default.nix | 2 + nixos/hosts/cnix/imports.nix | 3 +- nixos/hosts/cnix/system.nix | 35 ++--- nixos/services/dbus.nix | 5 +- nixos/services/fwupd.nix | 3 + nixos/services/greetd.nix | 2 +- 16 files changed, 102 insertions(+), 230 deletions(-) create mode 100644 nixos/services/fwupd.nix diff --git a/flake.lock b/flake.lock index 94aa6609..212e63d9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1717576207, - "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", - "owner": "anyrun-org", - "repo": "anyrun", - "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", - "type": "github" - }, - "original": { - "owner": "anyrun-org", - "repo": "anyrun", - "type": "github" - } - }, "cachix": { "locked": { "lastModified": 1635350005, @@ -68,11 +48,11 @@ ] }, "locked": { - "lastModified": 1720268913, - "narHash": "sha256-skLFEbUQ0Q9w4G/tNEBE+bsOD2d6n+Kxa6NEZm1/68g=", + "lastModified": 1720614517, + "narHash": "sha256-7S1YZizLtG0ofYnSCc453n7YZlVmoyNlM+UXlucpgnE=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "c94974e671073ae9cf9b7b3c335c35ff43c04a27", + "rev": "207c323786ca4ab0b7750dfa522699cfd9f09da8", "type": "github" }, "original": { @@ -147,7 +127,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "anyrun", + "lanzaboote", "nixpkgs" ] }, @@ -166,27 +146,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -207,7 +166,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -230,7 +189,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -268,7 +227,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -284,21 +243,6 @@ "type": "github" } }, - "flake-utils_4": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_4", @@ -313,11 +257,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1720524665, + "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", "type": "github" }, "original": { @@ -372,11 +316,11 @@ }, "hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1720515935, + "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "a111ce6b537df12a39874aa9672caa87f8677eda", "type": "github" }, "original": { @@ -387,7 +331,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -414,11 +358,11 @@ ] }, "locked": { - "lastModified": 1720327769, - "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", + "lastModified": 1720470846, + "narHash": "sha256-7ftA4Bv5KfH4QdTRxqe8/Hz2YTKo+7IQ9n7vbNWgv28=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", + "rev": "2fb5c1e0a17bc6059fa09dc411a43d75f35bb192", "type": "github" }, "original": { @@ -431,9 +375,9 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, @@ -458,11 +402,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719749459, - "narHash": "sha256-sAZRJNJ9FRUPvseuH21kmh9s+Q6AfQWPNxKVm534wgk=", + "lastModified": 1720354218, + "narHash": "sha256-cyl6Cxqo4bNmwLXi8/qIc3U1vRJ9VyIBUL/j3is4x58=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "a15b020a1d0fc483386eb001ec6735b8a30bec81", + "rev": "5865544e7c012ecaa952f5c6cf5878c1676b52b4", "type": "github" }, "original": { @@ -490,7 +434,7 @@ "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", @@ -499,11 +443,11 @@ ] }, "locked": { - "lastModified": 1720256686, - "narHash": "sha256-ihHXj+fp/BVpc86rCNN+Qbnpg6OrbeI+jxz6VRyzcy0=", + "lastModified": 1720592831, + "narHash": "sha256-x+g48Jl5De2oOfFazKbEP8IabXaeAKmF3JLcQyADYvE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9822e0611d49ae70278ac20c9d7b68e4797b2fab", + "rev": "ec4631892b2515261158b1b12900758a9eb5a660", "type": "github" }, "original": { @@ -515,11 +459,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1720175946, - "narHash": "sha256-9tiW0rkQZGhnNaIP6gWj7N/iTlCLFdD5r37R1jVOs3s=", + "lastModified": 1720555545, + "narHash": "sha256-1rWj8M6J/pd4NtNJlnucdteZ+YzSIA5YJVdk/T2ssfo=", "owner": "neovim", "repo": "neovim", - "rev": "3c53e8f78511d6db9a6c804e5a479ba38c33102d", + "rev": "f3c7fb9db176f32606e83eb47cc7549300191d2f", "type": "github" }, "original": { @@ -528,50 +472,29 @@ "type": "github" } }, - "nix-gl": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713543440, - "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", - "owner": "nix-community", - "repo": "nixgl", - "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixgl", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717794163, + "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1719708727, - "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=", + "lastModified": 1720313561, + "narHash": "sha256-arht1SYnZ5hJl1COIuqbdRi8ibpnNtc9zUZLmU9xqTs=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6", + "rev": "770d42db0b8203bdd84ddbd707a49fe0a3638863", "type": "github" }, "original": { @@ -598,11 +521,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720110830, - "narHash": "sha256-E5dN9GDV4LwMEduhBLSkyEz51zM17XkWZ3/9luvNOPs=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c0d0be00d4ecc4b51d2d6948e37466194c1e6c51", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -614,27 +537,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717794163, - "narHash": "sha256-Ch6ZpFPVvi7Bb6gmmuufpTEFkXqa43pC94XMfU5FEt0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "121f68ed7c6c32de5a8ce91a08ef25713d1c4755", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1720031269, - "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", + "lastModified": 1720418205, + "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", + "rev": "655a58a72a6601292512670343087c2d75d859c1", "type": "github" }, "original": { @@ -673,17 +580,15 @@ }, "root": { "inputs": { - "anyrun": "anyrun", "firefox-nightly": "firefox-nightly", "flake-utils": "flake-utils_2", "hardware": "hardware", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "neovim-nightly-overlay": "neovim-nightly-overlay", - "nix-gl": "nix-gl", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", - "systems": "systems_4" + "systems": "systems_3" } }, "rust-overlay": { @@ -713,16 +618,16 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -742,21 +647,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", diff --git a/flake.nix b/flake.nix index aff748a5..044781ec 100644 --- a/flake.nix +++ b/flake.nix @@ -16,11 +16,11 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-gl = { - url = "github:nix-community/nixgl"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - anyrun.url = "github:anyrun-org/anyrun"; + #nix-gl = { + # url = "github:nix-community/nixgl"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; + # anyrun.url = "github:anyrun-org/anyrun"; # Neovim Nightly neovim-nightly-overlay = { url = "github:nix-community/neovim-nightly-overlay"; diff --git a/home/core/gui/anyrun/default.nix b/home/core/gui/anyrun/default.nix index 734a8678..7859bf4b 100644 --- a/home/core/gui/anyrun/default.nix +++ b/home/core/gui/anyrun/default.nix @@ -10,37 +10,6 @@ programs.anyrun = { enable = true; - config = { - plugins = with inputs.anyrun.packages.${pkgs.system}; [ - applications - # randr - rink - shell - symbols - ]; - - width.fraction = 0.25; - y.fraction = 0.3; - hidePluginInfo = true; - closeOnClick = true; - }; - - extraCss = builtins.readFile (./. + "/style-dark.css"); - - extraConfigFiles = { - "applications.ron".text = '' - Config( - desktop_actions: false, - max_entries: 5, - terminal: Some("foot"), - ) - ''; - - "shell.ron".text = '' - Config( - prefix: ">" - ) - ''; - }; + #extraCss = builtins.readFile (./. + "/style-dark.css"); }; } diff --git a/home/core/gui/anyrun/style-dark.css b/home/core/gui/anyrun/style-dark.css index 55f24f0c..6895967f 100644 --- a/home/core/gui/anyrun/style-dark.css +++ b/home/core/gui/anyrun/style-dark.css @@ -8,7 +8,15 @@ #entry, #plugin, #main { - background: transparent; + background: #ffffff; +} + +#window { + font-size: 60px; + background-image: url("/home/cnst/.config/waybar/images/nixblueflake.svg"); + background-position: center; + background-repeat: no-repeat; + background-size: 60px 60px; } #match.activatable { diff --git a/home/core/gui/gtk/default.nix b/home/core/gui/gtk/default.nix index 99fb9094..7a282639 100644 --- a/home/core/gui/gtk/default.nix +++ b/home/core/gui/gtk/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { home.pointerCursor = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; size = 24; }; gtk = { diff --git a/home/core/gui/xdg/default.nix b/home/core/gui/xdg/default.nix index d390fa75..b7507c07 100644 --- a/home/core/gui/xdg/default.nix +++ b/home/core/gui/xdg/default.nix @@ -16,10 +16,6 @@ templates = "${config.home.homeDirectory}/documents/templates"; videos = "${config.home.homeDirectory}/media/videos"; }; - portal = { - enable = true; - extraPortals = [pkgs.xdg-desktop-portal-gtk]; - }; }; dconf = { settings = { diff --git a/home/core/tui/shell/cnst.nix b/home/core/tui/shell/cnst.nix index 5a3efa79..975a9575 100644 --- a/home/core/tui/shell/cnst.nix +++ b/home/core/tui/shell/cnst.nix @@ -22,7 +22,7 @@ enable = true; plugins = [ "git" - "thefuck" + # "thefuck" ]; theme = "robbyrussell"; }; diff --git a/home/extra/neovim/default.nix b/home/extra/neovim/default.nix index 4c5bcb6b..93f2613b 100644 --- a/home/extra/neovim/default.nix +++ b/home/extra/neovim/default.nix @@ -64,6 +64,8 @@ with pkgs; let python312Packages.jedi-language-server ruff ruff-lsp + openusd + materialx ]; rust = [ diff --git a/home/users/cnst/imports.nix b/home/users/cnst/imports.nix index f20fcc7e..33f2f1ed 100644 --- a/home/users/cnst/imports.nix +++ b/home/users/cnst/imports.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { imports = [ # core.gui - ../../core/gui/anyrun ../../core/gui/gtk ../../core/gui/mako ../../core/gui/waybar @@ -20,8 +19,8 @@ home = { packages = with pkgs; [ # misc.gui - gnome.file-roller - gnome.gnome-calculator + file-roller + gnome-calculator keepassxc nwg-look oculante @@ -40,7 +39,7 @@ ranger # misc.system - gnome.adwaita-icon-theme + adwaita-icon-theme grimblast hyprpicker networkmanagerapplet @@ -49,7 +48,7 @@ qt6.qtwayland slurp swaybg - thefuck + # thefuck wireguard-tools wl-clipboard wpa_supplicant diff --git a/nixos/extra/gaming.nix b/nixos/extra/gaming.nix index de56f962..e90bc253 100644 --- a/nixos/extra/gaming.nix +++ b/nixos/extra/gaming.nix @@ -22,7 +22,7 @@ wineWowPackages.staging wineWowPackages.waylandFull winetricks - python312Packages.pygame-sdl2 + # python312Packages.pygame-sdl2 libGL ffmpeg ]; diff --git a/nixos/hosts/cnix/default.nix b/nixos/hosts/cnix/default.nix index 70f74398..f05198c1 100644 --- a/nixos/hosts/cnix/default.nix +++ b/nixos/hosts/cnix/default.nix @@ -32,6 +32,8 @@ in { ]; }; + programs.dconf.enable = true; + imports = [ inputs.home-manager.nixosModules.home-manager ./imports.nix diff --git a/nixos/hosts/cnix/imports.nix b/nixos/hosts/cnix/imports.nix index d4f829fb..65f09315 100644 --- a/nixos/hosts/cnix/imports.nix +++ b/nixos/hosts/cnix/imports.nix @@ -26,7 +26,7 @@ # extra ../../extra/gaming.nix - ../../extra/workstation + #../../extra/workstation # ../../extra/nix-ld ]; @@ -41,6 +41,7 @@ sbctl # Util + anyrun curl fzf gnome-disk-utility diff --git a/nixos/hosts/cnix/system.nix b/nixos/hosts/cnix/system.nix index abbc4898..249e24ff 100644 --- a/nixos/hosts/cnix/system.nix +++ b/nixos/hosts/cnix/system.nix @@ -3,6 +3,19 @@ outputs, ... }: { + programs = { + nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/cnst/.nix-config"; + }; + }; + security.rtkit.enable = true; + + environment.localBinInPath = true; + + console.useXkbConfig = true; home-manager = { useGlobalPkgs = true; useUserPackages = true; @@ -11,26 +24,14 @@ }; }; nixpkgs = { - overlays = []; + overlays = [ + (_: prev: { + python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};}; + }) + ]; config = { allowUnfree = true; input-fonts.acceptLicense = true; }; }; - - programs = { - nh = { - enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; - flake = "/home/cnst/.nix-config"; - }; - dconf.enable = true; - }; - - security.rtkit.enable = true; - - environment.localBinInPath = true; - - console.useXkbConfig = true; } diff --git a/nixos/services/dbus.nix b/nixos/services/dbus.nix index 5cd9edc6..41ed5f2b 100644 --- a/nixos/services/dbus.nix +++ b/nixos/services/dbus.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { - services = { - dbus.packages = with pkgs; [ + services.dbus = { + enable = true; + packages = with pkgs; [ gcr ]; }; diff --git a/nixos/services/fwupd.nix b/nixos/services/fwupd.nix new file mode 100644 index 00000000..a62f7091 --- /dev/null +++ b/nixos/services/fwupd.nix @@ -0,0 +1,3 @@ +{ + services.fwupd.enable = true; +} diff --git a/nixos/services/greetd.nix b/nixos/services/greetd.nix index ea74553e..29247ecf 100644 --- a/nixos/services/greetd.nix +++ b/nixos/services/greetd.nix @@ -8,7 +8,7 @@ # user = "cnst"; # }; default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet -r --remember-session"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet -r --remember-session --asterisks"; user = "greeter"; }; };