From 4cee5b33c55c5e44ba8b53018f04698c45b696e9 Mon Sep 17 00:00:00 2001 From: cnst Date: Wed, 26 Jun 2024 19:25:27 +0200 Subject: [PATCH] mirror test --- flake.lock | 54 +++++++++--------- home/modules/default.nix | 1 + home/modules/firefox/default.nix | 33 ++++++++--- home/modules/firefox/default.nixbak | 12 ++++ home/modules/hypr/default.nix | 1 + home/modules/mako/default.nix | 1 + home/modules/shell/default.nix | 12 +--- home/modules/zellij/default.nix | 86 +++++++++++++++++++++++++++++ hosts/extra/nix-ld/default.nix | 6 +- hosts/extra/steam/default.nix | 1 + hosts/hardware/cnix.nix | 14 ++++- 11 files changed, 171 insertions(+), 50 deletions(-) create mode 100644 home/modules/firefox/default.nixbak create mode 100644 home/modules/zellij/default.nix diff --git a/flake.lock b/flake.lock index bc39e778..d141e2c4 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1719325051, - "narHash": "sha256-spZNPBy/DQNmW9XXfJaVzyH1JkeNsmdVNe9UkjMETxA=", + "lastModified": 1719415093, + "narHash": "sha256-5A8VJhHMl+cHQa/gjt2pBU5P2/rjsmLvQO3zZD0pslw=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "75c19b1374bf9115855506c740200e13e5a4ec56", + "rev": "cc6559f0809abd5e0479debdb5316f821a661b37", "type": "github" }, "original": { @@ -177,11 +177,11 @@ ] }, "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "hardware": { "locked": { - "lastModified": 1719322773, - "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=", + "lastModified": 1719413427, + "narHash": "sha256-WS087+fEO804gWvwqEfclbLFw6xdrrtZZULSyQafMdg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "caabc425565bbd5c8640630b0bf6974961a49242", + "rev": "901bc809b5d3e73a609a167385df23311d81b39c", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1718018037, - "narHash": "sha256-03rLBd/lKecgaKz0j5ESUf9lDn5R0SJatZTKLL5unWE=", + "lastModified": 1719226092, + "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0ab08b23ce3c3f75fe9a5598756b6fb8bcf0b414", + "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1719180626, - "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", + "lastModified": 1719418488, + "narHash": "sha256-Hu75KIbGLJA8qe42rO5WkRQ+E+BuzjS42bNEZcy9zT8=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", + "rev": "607f969f5dca2dc100cbc53e24ab49ac24ef8987", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1719211247, - "narHash": "sha256-GaEckCf2RaHzoEDj/j07BIV6eyDOT5wCFVSdbbkZ87U=", + "lastModified": 1719410911, + "narHash": "sha256-jnL8LSx1wJvJTBBRwjaggFUzc9q0/KXbvPmP3tyeyag=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "820da0e6b6127df9ad05ef3af40d767577e21ba1", + "rev": "86c00892c3ae4869eb99b677b48ee111409a93f1", "type": "github" }, "original": { @@ -332,11 +332,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1719138008, - "narHash": "sha256-+rM0RjvuW6/vzxdJxEU6KvQEF159NXrgB+irtS044Cc=", + "lastModified": 1719349695, + "narHash": "sha256-rnBC/8Y0CECztfoMKBxxo4hzd4TBu1bu9CnwpWDaB1U=", "owner": "neovim", "repo": "neovim", - "rev": "be999e6a0e5b251b2b37500d06636d4167334c6e", + "rev": "9dc09a4cdde9fad4e7861b9467276260bd9b82a9", "type": "github" }, "original": { @@ -347,11 +347,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719145550, - "narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=", + "lastModified": 1719253556, + "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", "type": "github" }, "original": { diff --git a/home/modules/default.nix b/home/modules/default.nix index 1524ea48..8f50ceba 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -1,5 +1,6 @@ { imports = [ + ./zellij ./firefox ./git ./hypr diff --git a/home/modules/firefox/default.nix b/home/modules/firefox/default.nix index ba3b060e..4a9f7d60 100644 --- a/home/modules/firefox/default.nix +++ b/home/modules/firefox/default.nix @@ -1,12 +1,27 @@ { - programs.firefox = { - enable = true; - }; + pkgs, + lib, + config, + inputs, + ... +}: - xdg.mimeApps.defaultApplications = { - "text/html" = [ "firefox.desktop" ]; - "text/xml" = [ "firefox.desktop" ]; - "x-scheme-handler/http" = [ "firefox.desktop" ]; - "x-scheme-handler/https" = [ "firefox.desktop" ]; - }; +let + firefoxFlake = inputs.firefox-nightly.packages.${pkgs.stdenv.hostPlatform.system}; + _firefoxNightly = firefoxFlake.firefox-nightly-bin; + + _chrome = pkgs.google-chrome.override { commandLineArgs = [ "--force-dark-mode" ]; }; +in +{ + home.packages = lib.mkMerge [ + (lib.mkIf (pkgs.hostPlatform.system == "x86_64-linux") ( + with pkgs; + [ + # browsers + _firefoxNightly + pkgs.firefox-bin + _chrome + ] + )) + ]; } diff --git a/home/modules/firefox/default.nixbak b/home/modules/firefox/default.nixbak new file mode 100644 index 00000000..ba3b060e --- /dev/null +++ b/home/modules/firefox/default.nixbak @@ -0,0 +1,12 @@ +{ + programs.firefox = { + enable = true; + }; + + xdg.mimeApps.defaultApplications = { + "text/html" = [ "firefox.desktop" ]; + "text/xml" = [ "firefox.desktop" ]; + "x-scheme-handler/http" = [ "firefox.desktop" ]; + "x-scheme-handler/https" = [ "firefox.desktop" ]; + }; +} diff --git a/home/modules/hypr/default.nix b/home/modules/hypr/default.nix index 40345e55..aab36e74 100644 --- a/home/modules/hypr/default.nix +++ b/home/modules/hypr/default.nix @@ -26,6 +26,7 @@ ]; home.sessionVariables = { + BROWSER = "firefox"; MOZ_ENABLE_WAYLAND = 1; NIXOS_OZONE_WL = 1; SDL_VIDEODRIVER = "wayland"; diff --git a/home/modules/mako/default.nix b/home/modules/mako/default.nix index 49330173..45010a1d 100644 --- a/home/modules/mako/default.nix +++ b/home/modules/mako/default.nix @@ -21,6 +21,7 @@ max-history=50 outer-margin=25 icon-location=right + max-icon-size=48 ''; }; } diff --git a/home/modules/shell/default.nix b/home/modules/shell/default.nix index d881a156..f50d420e 100644 --- a/home/modules/shell/default.nix +++ b/home/modules/shell/default.nix @@ -1,15 +1,5 @@ { config, ... }: { - programs.starship = { - enable = true; - settings = { - add_newline = false; - # character = { - # success_symbol = "[➜](bold green)"; - # error_symbol = "[➜](bold red)"; - # }; - }; - }; programs.zsh = { enable = true; enableCompletion = true; @@ -39,7 +29,7 @@ eval $(thefuck --alias) eval $(thefuck --alias FUCK) - eval "$(starship init zsh)" + eval "$(zellij setup --generate-auto-start zsh)" ''; }; } diff --git a/home/modules/zellij/default.nix b/home/modules/zellij/default.nix new file mode 100644 index 00000000..25e2c09b --- /dev/null +++ b/home/modules/zellij/default.nix @@ -0,0 +1,86 @@ +{ + home.shellAliases = { + zj = "zellij"; + }; + + programs.zellij = { + enable = true; + enableZshIntegration = true; + + settings = { + # Make zellij UI more compact + ui = { + pane_frames = { + hide_session_name = true; + }; + }; + default_layout = "compact"; + copy_command = "wl-copy"; + on_force_close = "detach"; + default_shell = "zsh"; + default_mode = "normal"; + + theme = "gruvbox-dark"; + + themes = { + gruvbox-dark = { + fg = [ + 213 + 196 + 161 + ]; + bg = [ + 40 + 40 + 40 + ]; + black = [ + 60 + 56 + 54 + ]; + red = [ + 204 + 36 + 29 + ]; + green = [ + 152 + 151 + 26 + ]; + yellow = [ + 215 + 153 + 33 + ]; + blue = [ + 69 + 133 + 136 + ]; + magenta = [ + 177 + 98 + 134 + ]; + cyan = [ + 104 + 157 + 106 + ]; + white = [ + 251 + 241 + 199 + ]; + orange = [ + 214 + 93 + 14 + ]; + }; + }; + }; + }; +} diff --git a/hosts/extra/nix-ld/default.nix b/hosts/extra/nix-ld/default.nix index a4308d71..6d7f3494 100644 --- a/hosts/extra/nix-ld/default.nix +++ b/hosts/extra/nix-ld/default.nix @@ -1 +1,5 @@ -{ programs.nix-ld.enable = true; } +{ + programs.nix-ld = { + enable = true; + }; +} diff --git a/hosts/extra/steam/default.nix b/hosts/extra/steam/default.nix index 6d919295..28476e2b 100644 --- a/hosts/extra/steam/default.nix +++ b/hosts/extra/steam/default.nix @@ -17,6 +17,7 @@ keyutils gamescope mangohud + steam-run ]; }; }; diff --git a/hosts/hardware/cnix.nix b/hosts/hardware/cnix.nix index 96332f22..585e984c 100644 --- a/hosts/hardware/cnix.nix +++ b/hosts/hardware/cnix.nix @@ -1,9 +1,17 @@ -{ pkgs, ... }: +{ + pkgs, + lib, + config, + inputs, + ... +}: +let + _nvtop = pkgs.nvtopPackages.amd; +in { zramSwap.enable = true; security.rtkit.enable = true; - hardware = { pulseaudio.enable = false; bluetooth = { @@ -13,6 +21,8 @@ graphics = { enable = true; extraPackages = with pkgs; [ + _nvtop + lact libva vaapiVdpau libvdpau-va-gl