diff --git a/base/env.nix b/base/env.nix index d8cf336..06be546 100644 --- a/base/env.nix +++ b/base/env.nix @@ -11,7 +11,5 @@ NIXOS_OZONE_WL = "1"; GOPATH = "$HOME/.go"; FLAKE = config.conf.nix_path; - # don't ask... marksman somehow requires this - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; }; } diff --git a/flake.lock b/flake.lock index 3753935..1a1242b 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1723405438, - "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=", + "lastModified": 1723920171, + "narHash": "sha256-dVCMrAe+D/5S91erhwQj2DSzHOVzAanWqoy+vPWB9DY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66", + "rev": "71d49670fe246cdaff4860b0effba0ab9f163b72", "type": "github" }, "original": { @@ -218,11 +218,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1723843436, - "narHash": "sha256-CBt5FNCMx+zYdvvDwwsiqoM66Ja6SMpxRR6z+VEwWN0=", + "lastModified": 1724091718, + "narHash": "sha256-v5gx+y+cVEk1e0QsVVVhoINd3L+y2UW9XRr7/6jjORo=", "owner": "DashieTM", "repo": "DashVim", - "rev": "abe622273c5627ccfdaf58a2664079147509e143", + "rev": "b319fb44c1095a42c50ec1297f051ce6311c21fa", "type": "github" }, "original": { @@ -790,11 +790,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -884,11 +884,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1723824059, - "narHash": "sha256-3AebH/B40viTNVJpgiQkfptVe4aRTfyffa8rjUNB0pU=", + "lastModified": 1723969407, + "narHash": "sha256-COChiv/1EsfN0aVQcDBPXqNR/T5sUXtalsuO1RGvwcY=", "ref": "refs/heads/main", - "rev": "c5feee1e357f3c3c59ebe406630601c627807963", - "revCount": 5098, + "rev": "1006663b6eaa55149e9a21aa8a34e41c85eb08ca", + "revCount": 5103, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1488,11 +1488,11 @@ }, "nur": { "locked": { - "lastModified": 1723905880, - "narHash": "sha256-j9xPPY4sVVmdt6n9q4/bH2IHYnzFJ96rWwBUVF9puPM=", + "lastModified": 1723992327, + "narHash": "sha256-w0DhauBqGC7zBlsm0i0IXVvhBGqBvsJPGnc5b9jffvA=", "owner": "nix-community", "repo": "nur", - "rev": "55a2281172b763189cfef53d02e843851cccc51a", + "rev": "adee26fc0c486560152c814b963ae27851eef658", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 08c6cba..c24ba8e 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ hyprdock.url = "github:DashieTM/hyprdock"; reset.url = "github:Xetibo/ReSet"; reset-plugins.url = "github:Xetibo/ReSet-Plugins"; - # nixvim.url = "github:nix-community/nixvim"; + dashvim = { url = "github:DashieTM/DashVim"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hardware/spaceship/configuration.nix b/hardware/spaceship/configuration.nix index b9d9af7..3b32325 100644 --- a/hardware/spaceship/configuration.nix +++ b/hardware/spaceship/configuration.nix @@ -14,6 +14,7 @@ in hostname = "spaceship"; }; mods = { + coding = { jetbrains = true; }; gaming = { enable = true; }; diff --git a/hm/default.nix b/hm/default.nix new file mode 100644 index 0000000..614704c --- /dev/null +++ b/hm/default.nix @@ -0,0 +1,37 @@ +self: { lib + , config + , pkgs + , options + , ... + }: +let + cfg = config.programs.dashvim; + system = pkgs.stdenv.hostPlatform.system; + # dashvim = (import ../lib { inherit system pkgs; inputs = self.inputs; config' = cfg; }); +in +{ + imports = [ ../modules ]; + meta.maintainers = with lib.maintainers; [ DashieTM ]; + options.programs.dashnix = with lib; { + enable = mkEnableOption "dashvim"; + + package = mkOption { + type = with types; nullOr package; + default = dashvim.build_dashvim; + defaultText = literalExpression '' + ReSet.packages.''${pkgs.stdenv.hostPlatform.system}.default + ''; + description = mdDoc '' + Package to run + ''; + }; + }; + config = lib.mkIf cfg.enable + (lib.optionalAttrs (options?home.packages) + { + home.packages = lib.optional (cfg.package != null) cfg.package; + } // + lib.optionalAttrs (options?environment.systemPackages) { + environment.systemPackages = lib.optional (cfg.package != null) cfg.package; + }); +} diff --git a/modules/programs/base_packages.nix b/modules/programs/base_packages.nix index 859b2f6..ffc3021 100644 --- a/modules/programs/base_packages.nix +++ b/modules/programs/base_packages.nix @@ -66,10 +66,13 @@ cantarell-fonts ]; - virtualisation.podman = { - enable = true; - dockerCompat = true; - defaultNetwork.settings.dns_enabled = true; + virtualisation = { + containers.enable = true; + podman = { + enable = true; + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; + }; }; services.upower.enable = true; diff --git a/modules/programs/coding.nix b/modules/programs/coding.nix index 2e41854..d4ff2b1 100644 --- a/modules/programs/coding.nix +++ b/modules/programs/coding.nix @@ -17,6 +17,14 @@ Enables dashvim package. ''; }; + jetbrains = lib.mkOption { + default = false; + example = true; + type = lib.types.bool; + description = '' + Enables jetbrains toolbox. + ''; + }; }; }; @@ -26,6 +34,7 @@ colorscheme = config.mods.stylix.colorscheme; }; home.packages = with pkgs; [ + (lib.mkIf config.mods.coding.jetbrains jetbrains-toolbox) #basics gitui gcc diff --git a/modules/programs/gpu.nix b/modules/programs/gpu.nix index e875745..d88aace 100644 --- a/modules/programs/gpu.nix +++ b/modules/programs/gpu.nix @@ -1,6 +1,14 @@ { lib, config, options, pkgs, ... }: { options.mods = { + nvidia.enable = lib.mkOption { + default = false; + type = lib.types.bool; + example = true; + description = '' + Enables nvidia support. + ''; + }; amdgpu.enable = lib.mkOption { default = false; type = lib.types.bool; @@ -40,6 +48,7 @@ "amdgpu.ppfeaturemask=0xffffffff" ]; }; + hardware = { graphics = let @@ -60,5 +69,15 @@ (lib.lists.optionals config.mods.vapi.rocm.enable rocm_packages); }; }; - }); + } // lib.optionalAttrs (options?hardware.graphics) (lib.mkIf config.mods.nvidia.enable { + hardware.nvidia = { + modesetting.enable = true; + # powerManagement.enable = false; + # powerManagement.finegrained = true; + open = true; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + services.xserver.videoDrivers = [ "nvidia" ]; + })); } diff --git a/modules/programs/starship.nix b/modules/programs/starship.nix index 22134ca..3846138 100644 --- a/modules/programs/starship.nix +++ b/modules/programs/starship.nix @@ -65,9 +65,10 @@ truncation_symbol = "…/"; }; git_branch = { + always_show_remote = true; symbol = ""; style = "bg:#5256c3 fg:#${scheme.base05}"; - format = "[ ](bg:#5256c3 fg:prev_bg)[$symbol $branch ]($style)"; + format = "[ ](bg:#5256c3 fg:prev_bg)[$symbol ($remote_name )$branch ]($style)"; }; git_status = { staged = "+\${count} (fg:#C4A000)";