diff --git a/flake.lock b/flake.lock index 2105224c..b0ecb441 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735922141, - "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1735963510, - "narHash": "sha256-88Pl16zxKqGEFbw6U04R9AXU0j12EVvYHFRgPQ/4o3g=", + "lastModified": 1736222735, + "narHash": "sha256-1nCjLVbMarQ10b2m94L1DITVCpARdoIIWEEHElwJH3k=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "4e8e40a78eb6532d30690d975805be5dbba98255", + "rev": "20f78bb5ce8cace7352e41c125e95372ffdbc2e0", "type": "github" }, "original": { diff --git a/system/nix/default.nix b/system/nix/default.nix index b71d98b7..b5f724d6 100644 --- a/system/nix/default.nix +++ b/system/nix/default.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + environment.systemPackages = [pkgs.nvfetcher]; nix = { # gc kills ssds gc.automatic = false; @@ -42,6 +43,11 @@ }; }; + programs.nh = { + enable = true; + flake = "/home/sioodmy/dev/dotfiles"; + }; + # WE DONT WANT TO BUILD STUFF ON TMPFS # ITS NOT A GOOD IDEA systemd.services.nix-daemon = { diff --git a/system/services/default.nix b/system/services/default.nix index eccc1ec5..832d8f39 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -8,5 +8,6 @@ openDefaultPorts = true; }; + programs.adb.enable = true; boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576; } diff --git a/user/packages.nix b/user/packages.nix index 40b76aea..da82cb73 100644 --- a/user/packages.nix +++ b/user/packages.nix @@ -10,7 +10,6 @@ in { inherit (pkgs) ttyper - librewolf mpv tdesktop ytmdl diff --git a/user/theme/_sources/generated.json b/user/theme/_sources/generated.json index 2f1d2261..80456ca3 100644 --- a/user/theme/_sources/generated.json +++ b/user/theme/_sources/generated.json @@ -1,9 +1,9 @@ { - "theme": { + "wallpapers": { "cargoLocks": null, - "date": "2024-06-16", + "date": "2025-01-08", "extract": null, - "name": "theme", + "name": "wallpapers", "passthru": null, "pinned": false, "src": { @@ -11,12 +11,12 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "owner": "andersevenrud", - "repo": "nordic.nvim", - "rev": "c88388b2a5f6e621df2718c316b856d4971bb89d", - "sha256": "sha256-ipmt0xD2zTfoh8fyYG4+09uVL2ef98FE9VwWpWJtQks=", + "owner": "sioodmy", + "repo": "wallpapers", + "rev": "762c067796b6a4fddc6b8d051e70844d1701f1b7", + "sha256": "sha256-Er+ZnJIcRSYmsDkFyttJN6KdDxn4PVgfrkoXgrHzFyA=", "type": "github" }, - "version": "c88388b2a5f6e621df2718c316b856d4971bb89d" + "version": "762c067796b6a4fddc6b8d051e70844d1701f1b7" } } \ No newline at end of file diff --git a/user/theme/_sources/generated.nix b/user/theme/_sources/generated.nix index b830076b..56fd74ab 100644 --- a/user/theme/_sources/generated.nix +++ b/user/theme/_sources/generated.nix @@ -1,20 +1,16 @@ # This file was generated by nvfetcher, please do not modify it manually. +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { - fetchgit, - fetchurl, - fetchFromGitHub, - dockerTools, -}: { - theme = { - pname = "theme"; - version = "c88388b2a5f6e621df2718c316b856d4971bb89d"; + wallpapers = { + pname = "wallpapers"; + version = "762c067796b6a4fddc6b8d051e70844d1701f1b7"; src = fetchFromGitHub { - owner = "andersevenrud"; - repo = "nordic.nvim"; - rev = "c88388b2a5f6e621df2718c316b856d4971bb89d"; + owner = "sioodmy"; + repo = "wallpapers"; + rev = "762c067796b6a4fddc6b8d051e70844d1701f1b7"; fetchSubmodules = false; - sha256 = "sha256-ipmt0xD2zTfoh8fyYG4+09uVL2ef98FE9VwWpWJtQks="; + sha256 = "sha256-Er+ZnJIcRSYmsDkFyttJN6KdDxn4PVgfrkoXgrHzFyA="; }; - date = "2024-06-16"; + date = "2025-01-08"; }; } diff --git a/user/theme/default.nix b/user/theme/default.nix index 266b5f87..a99ebb0b 100644 --- a/user/theme/default.nix +++ b/user/theme/default.nix @@ -1,5 +1,5 @@ pkgs: rec { - opacity = 0.88; + opacity = 1.0; background = "2e3440"; text = "d8dee9"; @@ -45,7 +45,10 @@ pkgs: rec { base0F = "B48EAD"; accent = regular.blue; - wallpaper = ./wall.png; + wallpaper = let + path = "nord/2.png"; + wallpapers = (pkgs.callPackages ./_sources/generated.nix {}).wallpapers; + in "${wallpapers.src}/${path}"; bat = "Nord"; diff --git a/user/theme/nvfetcher.toml b/user/theme/nvfetcher.toml index 7f3505f2..26212640 100644 --- a/user/theme/nvfetcher.toml +++ b/user/theme/nvfetcher.toml @@ -1,3 +1,3 @@ -[theme] -src.git = "https://github.com/andersevenrud/nordic.nvim" -fetch.github = "andersevenrud/nordic.nvim" +[wallpapers] +src.git = "https://github.com/sioodmy/wallpapers" +fetch.github = "sioodmy/wallpapers" diff --git a/user/theme/wall.png b/user/theme/wall.png deleted file mode 100644 index 6da89c5b..00000000 Binary files a/user/theme/wall.png and /dev/null differ diff --git a/user/wrapped/hypr/configs/Hyprland.nix b/user/wrapped/hypr/configs/Hyprland.nix index 028a15b8..c97f7a26 100644 --- a/user/wrapped/hypr/configs/Hyprland.nix +++ b/user/wrapped/hypr/configs/Hyprland.nix @@ -147,7 +147,7 @@ in { "${mod}, P, pseudo," "${mod} ALT, ,resizeactive," - "${mod}, Return, exec, foot" + "${mod}, Return, exec, foot -e tmux" "${mod} SHIFT, L, exec, hyprlock" "${mod}, h, movefocus, l"