diff --git a/flake.lock b/flake.lock index 4150849..c366b82 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1727449354, - "narHash": "sha256-iQki21EbLc9+cxh0c1sZA3Y80mBHYWMNcT/33EVeJsE=", + "lastModified": 1728524457, + "narHash": "sha256-R+GJ3H1PvRUHLm45muY1KEezhfgIl8l7HJ36DySZMu0=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "5a1bc8dcc6a73e1d64b9291c9c466a637746e6cf", + "rev": "5611dd61df02e0bc5d62bb3f5388821d8854faff", "type": "github" }, "original": { @@ -88,18 +88,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -116,11 +110,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -136,11 +130,11 @@ ] }, "locked": { - "lastModified": 1727531434, - "narHash": "sha256-b+GBgCWd2N6pkiTkRZaMFOPztPO4IVTaclYPrQl2uLk=", + "lastModified": 1729010169, + "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=", "owner": "nix-community", "repo": "disko", - "rev": "b709e1cc33fcde71c7db43850a55ebe6449d0959", + "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76", "type": "github" }, "original": { @@ -219,11 +213,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -240,11 +234,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -298,11 +292,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1725688145, - "narHash": "sha256-WCdR85Psl7yfl1/gDruytzZcDUtj+V3GBxwb0kMWbts=", + "lastModified": 1728804768, + "narHash": "sha256-WG8KWmT72SA1XrmixxJwI1RRWrT9D97kkYSE5OfOJdg=", "owner": "GermanBread", "repo": "declarative-flatpak", - "rev": "1cd36d4068cdeb3fa3fb815f8c9bfbc1217f445d", + "rev": "42cc2c4d97a03889d551cc82c43a0b124fd403f6", "type": "github" }, "original": { @@ -345,11 +339,11 @@ ] }, "locked": { - "lastModified": 1727514110, - "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -426,11 +420,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -447,11 +441,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -493,11 +487,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1729028850, + "narHash": "sha256-eOhjiU+3TCaSYZESYhU2ZTUQKrBcer9cQ/XpVkergAg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "bd01eac8c7cfa9b7e25304f0e7f0fed80de63f9d", "type": "github" }, "original": { @@ -514,11 +508,11 @@ ] }, "locked": { - "lastModified": 1727507295, - "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", + "lastModified": 1728901530, + "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", + "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", "type": "github" }, "original": { @@ -529,11 +523,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -561,11 +555,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -606,11 +600,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727645871, - "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", + "lastModified": 1729015933, + "narHash": "sha256-raKxsI2SGe/vF2PvzFatd/Sl9eVUCuCUUVg7cINFVbQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", + "rev": "429f2e8d1aa61181c0ec72bdafe022fbb6a092d6", "type": "github" }, "original": { @@ -628,11 +622,11 @@ ] }, "locked": { - "lastModified": 1727452028, - "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=", + "lastModified": 1728905062, + "narHash": "sha256-W/lClt0bRgFRO0WFtytX/LEILpPNq+FOjIfESpkeu5c=", "owner": "NuschtOS", "repo": "search", - "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3", + "rev": "f82d3e1c1c9d1eaeb91878519e2d27b27c66ce84", "type": "github" }, "original": { @@ -655,11 +649,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -690,11 +684,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { @@ -711,11 +705,11 @@ "steam-fetcher": "steam-fetcher" }, "locked": { - "lastModified": 1726919015, - "narHash": "sha256-8GZJ3saNsVR7HMCdENQtjW86VCE/OXi5zaqWp1fpTxg=", + "lastModified": 1727727564, + "narHash": "sha256-2osQZUXfRID9/09vBsNff/lVbtAq0uoX4zmtYds304Q=", "owner": "nekowinston", "repo": "satisfactory-server-flake", - "rev": "33c8cedc9edd797caf787bafaf10c3f12a6d8d52", + "rev": "c83c713cfd39e2c708051e5533c1a4d1b5d5a7b1", "type": "github" }, "original": { @@ -726,11 +720,11 @@ }, "stablepkgs": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -778,11 +772,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1728312564, - "narHash": "sha256-z01cTK5VeLFOUekhAXrJHLDzE74uAxxMwE2p6+Wp9Sg=", + "lastModified": 1728900372, + "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", "owner": "danth", "repo": "stylix", - "rev": "63426a59e714c4389c5a8e559dee05a0087a3043", + "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", "type": "github" }, "original": { @@ -855,16 +849,17 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, @@ -892,11 +887,11 @@ ] }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -910,11 +905,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": { diff --git a/flake.nix b/flake.nix index 05f14c6..c7815f4 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ ./modules/aagl.nix inputs.aagl.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote - inputs.stylix.nixosModules.stylix +# inputs.stylix.nixosModules.stylix { nix.settings = inputs.aagl.nixConfig; } # Setup cachix for aagl projects # Imports home-manager module for use within nixos, not reccomended for use WITH standalone version @@ -88,7 +88,7 @@ # ./home-manager/librewolf.nix inputs.flatpaks.homeManagerModules.default inputs.nixvim.homeManagerModules.default -# inputs.stylix.HomeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine + inputs.stylix.homeManagerModules.stylix # Not compatible with NixOS module as they will interfere with one another, use this when building on a non-NixOS machine ]; }; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 449b2e1..3c098aa 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -26,27 +26,27 @@ services.gnome-keyring.enable = true; # used for protonmail-bridge and nextcloud-client # Cursor configuration that I hope to one day understand, currently has a scaling issue but thats probably my fault - home.pointerCursor = - let - getFrom = url: hash: name: { - gtk.enable = true; - x11.enable = true; - name = name; - size = 24; - package = - pkgs.runCommand "moveUp" {} '' - mkdir -p $out/share/icons - ln -s ${pkgs.fetchzip { - url = url; - hash = hash; - }} $out/share/icons/${name} - ''; - }; - in - getFrom - "https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz" - "sha256-BvVE9qupMjw7JRqFUj1J0a4ys6kc9fOLBPx2bGaapTk=" - "Fuchsia-Pop"; +# home.pointerCursor = +# let +# getFrom = url: hash: name: { +# gtk.enable = true; +# x11.enable = true; +# name = name; +# size = 24; +# package = +# pkgs.runCommand "moveUp" {} '' +# mkdir -p $out/share/icons +# ln -s ${pkgs.fetchzip { +# url = url; +# hash = hash; +# }} $out/share/icons/${name} +# ''; +# }; +# in +# getFrom +# "https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz" +# "sha256-BvVE9qupMjw7JRqFUj1J0a4ys6kc9fOLBPx2bGaapTk=" +# "Fuchsia-Pop"; # General use home packages that dont require a separate module home.packages = with pkgs; [ @@ -54,7 +54,7 @@ grimblast powerline-fonts nix-output-monitor - bitwarden-desktop +# bitwarden-desktop xwaylandvideobridge virtualbox wofi @@ -85,9 +85,9 @@ lines = 3; columns = 200; }; - font.normal = { - family = "hack"; - }; +# font.normal = { +# family = "hack"; +# }; # keyboard.bindings = [ # { # key = "K"; diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix index a246b8a..5d1ec1a 100644 --- a/home-manager/hyprland.nix +++ b/home-manager/hyprland.nix @@ -45,7 +45,7 @@ "$mod, F, exec, firefox" "$mod, 1, exec, alacritty" "$mod, D, exec, vesktop" - "$mod, space, exec, wofi --show drun" + "$mod, space, exec, wofi --show drun, run" # Screenshot tool ", Print, exec, grimblast copy area" diff --git a/home-manager/stylix.nix b/home-manager/stylix.nix index 9e805e7..a17bc4d 100644 --- a/home-manager/stylix.nix +++ b/home-manager/stylix.nix @@ -1,7 +1,7 @@ { config, ... }: { -# stylix = { -# enable = true; -## base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml"; -# stylix.image = /home/blue/Pictures/wallpaper.png; -# }; + stylix = { + enable = true; +# base16Scheme = "${pkgs.base16-schemes}/share/themes/icy.yaml"; + image = ./wallpaper.png; + }; } diff --git a/home-manager/wallpaper.png b/home-manager/wallpaper.png new file mode 100644 index 0000000..a6de491 Binary files /dev/null and b/home-manager/wallpaper.png differ diff --git a/modules/packages.nix b/modules/packages.nix index 10b9eb1..1eb7098 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -40,6 +40,7 @@ davinci-resolve ardour v4l-utils + libreoffice ]) ++