diff --git a/flake.lock b/flake.lock index f732535..d527f10 100644 --- a/flake.lock +++ b/flake.lock @@ -320,7 +320,8 @@ "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim" + "nixvim": "nixvim", + "zen-browser": "zen-browser" } }, "systems": { @@ -352,6 +353,26 @@ "repo": "default", "type": "github" } + }, + "zen-browser": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743216975, + "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ed0a138..90c4770 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = "github:fufexan/nix-gaming"; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { @@ -45,9 +47,6 @@ # Other options beside 'alejandra' include 'nixpkgs-fmt' formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; - nixosModules = builtins.listToAttrs ( (map (x: { name = x; diff --git a/home-manager/modules/chromium/default.nix b/home-manager/modules/chromium/default.nix deleted file mode 100644 index 4bc2a70..0000000 --- a/home-manager/modules/chromium/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.lily.chromium; -in { - options.lily.chromium = { - enable = lib.mkEnableOption "activate chromium"; - }; - config = lib.mkIf cfg.enable { - programs.chromium = { - enable = true; - extensions = [ - {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin - {id = "pkehgijcmpdhfbdbbnkijodmdjhbjlgp";} # privacy badger - {id = "ldpochfccmkkmhdbclfhpagapcfdljkj";} # decentraleyes - {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # sponsor block - {id = "gebbhagfogifgggkldgodflihgfeippi";} # return youtube dislike (just cuz) - ]; - commandLineArgs = [ - "--enable-features=UseOzonePlatform" - "--ozone-platform=wayland" - ]; - }; - }; -} diff --git a/home-manager/modules/ghostty/default.nix b/home-manager/modules/ghostty/default.nix deleted file mode 100644 index 5226865..0000000 --- a/home-manager/modules/ghostty/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - lib, - ... -}: let - cfg = config.lily.ghostty; -in { - options.lily.ghostty = { - enable = lib.mkEnableOption "activate ghostty"; - }; - - config = lib.mkIf cfg.enable { - home.file.".config/ghostty/shaders" = { - source = ./shaders; - recursive = true; - }; - programs.ghostty = { - enable = true; - - settings = { - background-blur-radius = 0; - #theme = "dark:catppuccin-mocha,light:catppuccin-latte"; - window-theme = "dark"; - background-opacity = 0.75; - minimum-contrast = 1.1; - window-padding-x = 5; - window-padding-y = 5; - gtk-adwaita = false; - gtk-titlebar = false; - # custom-shader = "shaders/crt.glsl"; - # custom-shader = "shaders/glow.glsl"; - confirm-close-surface = false; - custom-shader-animation = true; - }; - }; - }; -} diff --git a/home-manager/modules/ghostty/shaders/crt.glsl b/home-manager/modules/ghostty/shaders/crt.glsl deleted file mode 100644 index ecce90d..0000000 --- a/home-manager/modules/ghostty/shaders/crt.glsl +++ /dev/null @@ -1,153 +0,0 @@ -// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions -// over time, then it does a glow effect in a perceptual color space -// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo -// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl -// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn - -// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ -float f(float x) { - if (x >= 0.0031308) { - return 1.055 * pow(x, 1.0 / 2.4) - 0.055; - } else { - return 12.92 * x; - } -} - -float f_inv(float x) { - if (x >= 0.04045) { - return pow((x + 0.055) / 1.055, 2.4); - } else { - return x / 12.92; - } -} - -// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ -vec4 toOklab(vec4 rgb) { - vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); - float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; - float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; - float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; - float l_ = pow(l, 1.0 / 3.0); - float m_ = pow(m, 1.0 / 3.0); - float s_ = pow(s, 1.0 / 3.0); - return vec4( - 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, - 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, - 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, - rgb.a - ); -} - -vec4 toRgb(vec4 oklab) { - vec3 c = oklab.rgb; - float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; - float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; - float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; - float l = l_ * l_ * l_; - float m = m_ * m_ * m_; - float s = s_ * s_ * s_; - vec3 linear_srgb = vec3( - 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, - -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, - -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s - ); - return vec4( - clamp(f(linear_srgb.r), 0.0, 1.0), - clamp(f(linear_srgb.g), 0.0, 1.0), - clamp(f(linear_srgb.b), 0.0, 1.0), - oklab.a - ); -} - -// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f -const vec3[24] samples = { - vec3(0.1693761725038636, 0.9855514761735895, 1), - vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), - vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), - vec3(1.554155680728463, -1.2588090085709776, 0.5), - vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), - vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), - vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), - vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), - vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), - vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), - vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), - vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), - vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), - vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), - vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), - vec3(-3.6548858794907493, -1.6253643308191343, 0.25), - vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), - vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), - vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), - vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), - vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), - vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), - vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), - vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) -}; - -float offsetFunction(float iTime) { - float amount = 1.0; - const float periods[4] = {6.0, 16.0, 19.0, 27.0}; - for (int i = 0; i < 4; i++) { - amount *= 1.0 + 0.5 * sin(iTime*periods[i]); - } - //return amount; - return amount * periods[3]; -} - -const float DIM_CUTOFF = 0.35; -const float BRIGHT_CUTOFF = 0.65; -const float ABBERATION_FACTOR = 0.05; - -void mainImage(out vec4 fragColor, in vec2 fragCoord) { - vec2 uv = fragCoord.xy / iResolution.xy; - - // Sample the original color - vec4 originalColor = texture(iChannel0, uv); - - // Check if the pixel is part of the text (assuming alpha > 0.0) - if (originalColor.a > 0.0) { - float amount = offsetFunction(iTime); - - vec3 col; - col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; - col.g = texture( iChannel0, uv ).g; - col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; - - vec4 splittedColor = vec4(col, originalColor.a); // Keep the original alpha - vec4 source = toOklab(splittedColor); - vec4 dest = source; - - if (source.x > DIM_CUTOFF) { - dest.x *= 1.2; - // dest.x = 1.2; - } else { - vec2 step = vec2(1.414) / iResolution.xy; - vec3 glow = vec3(0.0); - for (int i = 0; i < 24; i++) { - vec3 s = samples[i]; - float weight = s.z; - vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); - if (c.x > DIM_CUTOFF) { - glow.yz += c.yz * weight * 0.3; - if (c.x <= BRIGHT_CUTOFF) { - glow.x += c.x * weight * 0.05; - } else { - glow.x += c.x * weight * 0.10; - } - } - } - // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); - // dest.x = lightness_diff; - // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; - dest.xyz += glow.xyz; - } - - fragColor = toRgb(dest); - } else { - // If the pixel is background, set alpha to 0.0 for transparency - fragColor = vec4(originalColor.rgb, 0.0); - } -} diff --git a/home-manager/modules/ghostty/shaders/glow.glsl b/home-manager/modules/ghostty/shaders/glow.glsl deleted file mode 100644 index 83bef9c..0000000 --- a/home-manager/modules/ghostty/shaders/glow.glsl +++ /dev/null @@ -1,145 +0,0 @@ -// First it does a "chromatic aberration" by splitting the rgb signals by a product of sin functions -// over time, then it does a glow effect in a perceptual color space -// Based on kalgynirae's Ghostty passable glow shader and NickWest's Chromatic Aberration shader demo -// Passable glow: https://github.com/kalgynirae/dotfiles/blob/main/ghostty/glow.glsl -// "Chromatic Aberration": https://www.shadertoy.com/view/Mds3zn - -// sRGB linear -> nonlinear transform from https://bottosson.github.io/posts/colorwrong/ -float f(float x) { - if (x >= 0.0031308) { - return 1.055 * pow(x, 1.0 / 2.4) - 0.055; - } else { - return 12.92 * x; - } -} - -float f_inv(float x) { - if (x >= 0.04045) { - return pow((x + 0.055) / 1.055, 2.4); - } else { - return x / 12.92; - } -} - -// Oklab <-> linear sRGB conversions from https://bottosson.github.io/posts/oklab/ -vec4 toOklab(vec4 rgb) { - vec3 c = vec3(f_inv(rgb.r), f_inv(rgb.g), f_inv(rgb.b)); - float l = 0.4122214708 * c.r + 0.5363325363 * c.g + 0.0514459929 * c.b; - float m = 0.2119034982 * c.r + 0.6806995451 * c.g + 0.1073969566 * c.b; - float s = 0.0883024619 * c.r + 0.2817188376 * c.g + 0.6299787005 * c.b; - float l_ = pow(l, 1.0 / 3.0); - float m_ = pow(m, 1.0 / 3.0); - float s_ = pow(s, 1.0 / 3.0); - return vec4( - 0.2104542553 * l_ + 0.7936177850 * m_ - 0.0040720468 * s_, - 1.9779984951 * l_ - 2.4285922050 * m_ + 0.4505937099 * s_, - 0.0259040371 * l_ + 0.7827717662 * m_ - 0.8086757660 * s_, - rgb.a - ); -} - -vec4 toRgb(vec4 oklab) { - vec3 c = oklab.rgb; - float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b; - float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b; - float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b; - float l = l_ * l_ * l_; - float m = m_ * m_ * m_; - float s = s_ * s_ * s_; - vec3 linear_srgb = vec3( - 4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s, - -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s, - -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s - ); - return vec4( - clamp(f(linear_srgb.r), 0.0, 1.0), - clamp(f(linear_srgb.g), 0.0, 1.0), - clamp(f(linear_srgb.b), 0.0, 1.0), - oklab.a - ); -} - -// Bloom samples from https://gist.github.com/qwerasd205/c3da6c610c8ffe17d6d2d3cc7068f17f -const vec3[24] samples = { - vec3(0.1693761725038636, 0.9855514761735895, 1), - vec3(-1.333070830962943, 0.4721463328627773, 0.7071067811865475), - vec3(-0.8464394909806497, -1.51113870578065, 0.5773502691896258), - vec3(1.554155680728463, -1.2588090085709776, 0.5), - vec3(1.681364377589461, 1.4741145918052656, 0.4472135954999579), - vec3(-1.2795157692199817, 2.088741103228784, 0.4082482904638631), - vec3(-2.4575847530631187, -0.9799373355024756, 0.3779644730092272), - vec3(0.5874641440200847, -2.7667464429345077, 0.35355339059327373), - vec3(2.997715703369726, 0.11704939884745152, 0.3333333333333333), - vec3(0.41360842451688395, 3.1351121305574803, 0.31622776601683794), - vec3(-3.167149933769243, 0.9844599011770256, 0.30151134457776363), - vec3(-1.5736713846521535, -3.0860263079123245, 0.2886751345948129), - vec3(2.888202648340422, -2.1583061557896213, 0.2773500981126146), - vec3(2.7150778983300325, 2.5745586041105715, 0.2672612419124244), - vec3(-2.1504069972377464, 3.2211410627650165, 0.2581988897471611), - vec3(-3.6548858794907493, -1.6253643308191343, 0.25), - vec3(1.0130775986052671, -3.9967078676335834, 0.24253562503633297), - vec3(4.229723673607257, 0.33081361055181563, 0.23570226039551587), - vec3(0.40107790291173834, 4.340407413572593, 0.22941573387056174), - vec3(-4.319124570236028, 1.159811599693438, 0.22360679774997896), - vec3(-1.9209044802827355, -4.160543952132907, 0.2182178902359924), - vec3(3.8639122286635708, -2.6589814382925123, 0.21320071635561041), - vec3(3.3486228404946234, 3.4331800232609, 0.20851441405707477), - vec3(-2.8769733643574344, 3.9652268864187157, 0.20412414523193154) -}; - -float offsetFunction(float iTime) { - float amount = 1.0; - const float periods[4] = {6.0, 16.0, 19.0, 27.0}; - for (int i = 0; i < 4; i++) { - amount *= 1.0 + 0.5 * sin(iTime*periods[i]); - } - //return amount; - return amount * periods[3]; -} - -const float DIM_CUTOFF = 0.35; -const float BRIGHT_CUTOFF = 0.65; -const float ABBERATION_FACTOR = 0.05; - -void mainImage(out vec4 fragColor, in vec2 fragCoord) { - vec2 uv = fragCoord.xy / iResolution.xy; - - float amount = offsetFunction(iTime); - - vec3 col; - col.r = texture( iChannel0, vec2(uv.x-ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).r; - col.g = texture( iChannel0, uv ).g; - col.b = texture( iChannel0, vec2(uv.x+ABBERATION_FACTOR*amount / iResolution.x, uv.y) ).b; - - vec4 splittedColor = vec4(col, 1.0); - vec4 source = toOklab(splittedColor); - vec4 dest = source; - - if (source.x > DIM_CUTOFF) { - dest.x *= 1.2; - // dest.x = 1.2; - } else { - vec2 step = vec2(1.414) / iResolution.xy; - vec3 glow = vec3(0.0); - for (int i = 0; i < 24; i++) { - vec3 s = samples[i]; - float weight = s.z; - vec4 c = toOklab(texture(iChannel0, uv + s.xy * step)); - if (c.x > DIM_CUTOFF) { - glow.yz += c.yz * weight * 0.3; - if (c.x <= BRIGHT_CUTOFF) { - glow.x += c.x * weight * 0.05; - } else { - glow.x += c.x * weight * 0.10; - } - } - } - // float lightness_diff = clamp(glow.x - dest.x, 0.0, 1.0); - // dest.x = lightness_diff; - // dest.yz = dest.yz * (1.0 - lightness_diff) + glow.yz * lightness_diff; - dest.xyz += glow.xyz; - dest.a = 0.5; - } - - fragColor = toRgb(dest); -} diff --git a/home-manager/modules/git/default.nix b/home-manager/modules/git/default.nix index 9dd52b3..183f808 100644 --- a/home-manager/modules/git/default.nix +++ b/home-manager/modules/git/default.nix @@ -15,9 +15,9 @@ in { lfs.enable = true; extraConfig = { user = { - name = "Lily"; - email = "Caznix01@gmail.com"; - signingKey = "Caznix"; + name = "Lily Vex"; + email = "lesson085@gmail.com"; + signingKey = "Placeholder"; }; commit.gpgsign = true; init.defaultBranch = "main"; diff --git a/home-manager/modules/kitty/default.nix b/home-manager/modules/kitty/default.nix new file mode 100644 index 0000000..cf0b4c3 --- /dev/null +++ b/home-manager/modules/kitty/default.nix @@ -0,0 +1,22 @@ +{ + config, + lib, + ... +}: let + cfg = config.lily.kitty; +in { + options.lily.kitty = { + enable = lib.mkEnableOption "activate kitty"; + }; + + config = lib.mkIf cfg.enable { + programs.kitty = { + enable = true; + + settings = { + confirm_os_window_close = 0; + window_padding_width = 5; + }; + }; + }; +} diff --git a/home-manager/modules/zed/default.nix b/home-manager/modules/zed/default.nix deleted file mode 100644 index 9d3fe02..0000000 --- a/home-manager/modules/zed/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.lily.zed; -in { - options.lily.zed = { - enable = lib.mkEnableOption "activate zed"; - }; - - config = lib.mkIf cfg.enable { - programs.zed-editor = { - enable = true; - extensions = ["nix" "toml" "elixir" "make"]; - - ## everything inside of these brackets are Zed options. - userSettings = { - assistant = { - enabled = true; - version = "2"; - default_open_ai_model = null; - ### PROVIDER OPTIONS - ### zed.dev models { claude-3-5-sonnet-latest } requires github connected - ### anthropic models { claude-3-5-sonnet-latest claude-3-haiku-latest claude-3-opus-latest } requires API_KEY - ### copilot_chat models { gpt-4o gpt-4 gpt-3.5-turbo o1-preview } requires github connected - default_model = { - provider = "zed.dev"; - model = "claude-3-5-sonnet-latest"; - }; - - # inline_alternatives = [ - # { - # provider = "copilot_chat"; - # model = "gpt-3.5-turbo"; - # } - # ]; - }; - - node = { - path = lib.getExe pkgs.nodejs; - npm_path = lib.getExe' pkgs.nodejs "npm"; - }; - - hour_format = "hour24"; - auto_update = false; - terminal = { - alternate_scroll = "off"; - blinking = "off"; - copy_on_select = false; - dock = "bottom"; - detect_venv = { - on = { - directories = [".env" "env" ".venv" "venv"]; - activate_script = "default"; - }; - }; - font_family = "JetBrains Mono"; - font_features = null; - font_size = null; - line_height = "comfortable"; - option_as_meta = false; - button = false; - shell = { - program = "zsh"; - }; - toolbar = { - title = true; - }; - working_directory = "current_project_directory"; - }; - - lsp = { - rust-analyzer = { - binary = { - path = "/run/current-system/sw/bin/rust-analyzer"; - path_lookup = false; - }; - }; - nix = { - binary = { - path = "${pkgs.nixd}/bin/nixd"; - path_lookup = false; - }; - }; - }; - - vim_mode = false; # Not yet... - load_direnv = "shell_hook"; - base_keymap = "VSCode"; - theme = { - mode = "system"; - light = "One Light"; - dark = "Andromeda"; - }; - show_whitespaces = "all"; - ui_font_size = 16; - buffer_font_size = 16; - }; - }; - }; -} diff --git a/home-manager/nix/home.nix b/home-manager/nix/home.nix index b22df90..44c5b44 100644 --- a/home-manager/nix/home.nix +++ b/home-manager/nix/home.nix @@ -42,7 +42,7 @@ # Or define it inline, for example: # (final: prev: { # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; + # patches = [ ./change-hello-to-hi.patch ]; # }); # }) ]; @@ -57,15 +57,12 @@ username = "lily"; homeDirectory = "/home/lily"; packages = with pkgs; # installs a package - [ vesktop + inputs.zen-browser.packages."${system}".default (prismlauncher.override { jdks = [jdk23 jdk8 jdk17 jdk21]; }) - itch - inputs.nix-gaming.packages.${pkgs.system}.viper - kdePackages.kate ]; }; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 00cfd63..0118353 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -8,13 +8,10 @@ }; lily = { hyprland.enable = true; - ghostty.enable = true; + kitty.enable = true; neovim.enable = true; rofi.enable = true; - vscode.enable = true; - zed.enable = true; waybar.enable = true; - chromium.enable = true; }; home.packages = with pkgs; [ vesktop diff --git a/machines/nix/configuration.nix b/machines/nix/configuration.nix index 05600e5..1978450 100644 --- a/machines/nix/configuration.nix +++ b/machines/nix/configuration.nix @@ -25,12 +25,10 @@ ]; lily = { users.lily.enable = true; - laptop.enable = true; common.enable = true; containers = { enable = true; - podman = true; - # docker = false; + docker = true; }; nvidia.enable = true; desktop = { @@ -64,7 +62,6 @@ platformOptimizations.enable = true; localNetworkGameTransfers.openFirewall = true; gamescopeSession.enable = true; - extraCompatPackages = let gamePkgs = inputs.nix-gaming.packages.${pkgs.hostPlatform.system}; in [pkgs.proton-ge-bin gamePkgs.northstar-proton]; }; }; diff --git a/machines/nix/hardware-configuration.nix b/machines/nix/hardware-configuration.nix index 6be9341..8ca010a 100644 --- a/machines/nix/hardware-configuration.nix +++ b/machines/nix/hardware-configuration.nix @@ -1,44 +1,38 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/95c3ec11-8329-4b54-a690-97c31250a110"; - fsType = "btrfs"; - options = ["subvol=@"]; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/c42aa8fb-f19a-41eb-9ff3-f77d4c1d7ba7"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/9666-823F"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/F2AC-C759"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = [ - {device = "/dev/disk/by-uuid/5fd02c5b-4ce0-46be-8771-9c1b0d280d8d";} - ]; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp92s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index c57a737..37ae81c 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -57,7 +57,7 @@ in { # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # Only available from driver 515.43.04+ # Currently alpha-quality/buggy, so false is currently the recommended setting. - open = true; + open = false; # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.stable;