diff --git a/flake.lock b/flake.lock index e0325df..7cdee51 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,11 +23,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -22,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { @@ -39,7 +55,29 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "spicetify-nix": "spicetify-nix" + } + }, + "spicetify-nix": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721103144, + "narHash": "sha256-vHGUl/kagv0/QsPXMW+caSPyuvHvMUJSV80cbe+0/2M=", + "owner": "Gerg-L", + "repo": "spicetify-nix", + "rev": "085ddf8abc78a7f1682c99715584e8735f4903cf", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "spicetify-nix", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index ae5d3a2..0609f41 100644 --- a/flake.nix +++ b/flake.nix @@ -8,37 +8,34 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + + spicetify-nix = { + url = "github:Gerg-L/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = - { - self, - home-manager, - nixpkgs, - ... - }@inputs: + { home-manager, nixpkgs, ... }@inputs: let system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; in { nixosConfigurations."nixos" = let specialArgs = inputs; - modules = [ - ./nixos.nix - - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - home-manager.extraSpecialArgs = inputs; - home-manager.users.wizardlink = import ./home-manager.nix; - } - ]; + modules = [ ./nixos.nix ]; in nixpkgs.lib.nixosSystem { inherit system specialArgs modules; }; - formatter."${system}" = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + homeConfigurations.wizardlink = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + + extraSpecialArgs = inputs; + modules = [ ./home-manager.nix ]; + }; + + formatter."${system}" = pkgs.nixfmt-rfc-style; }; } diff --git a/home-manager.nix b/home-manager.nix index 97ffff1..20f111a 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -7,6 +7,7 @@ # Import configurations for better modularity. imports = [ + ./programs/alacritty.nix ./programs/emacs ./programs/fish ./programs/git.nix @@ -15,9 +16,9 @@ ./programs/neovim ./programs/obs-studio.nix ./programs/rofi + ./programs/spotify ./programs/tmux ./programs/waybar.nix - ./programs/wezterm ]; # Home Manager needs a bit of information about you and the paths it should @@ -78,6 +79,7 @@ pavucontrol qbittorrent qdirstat + speedcrunch vesktop vlc yt-dlp @@ -90,12 +92,15 @@ ## Entertainment jellyfin-media-player - spotify # Gaming protontricks wineWowPackages.stagingFull winetricks + + # Games + mindustry-wayland + shattered-pixel-dungeon xonotic ## Libraries @@ -130,9 +135,9 @@ # Create an FHS environment using the command `fhs`, enabling the execution of non-NixOS packages in NixOS! ( let - base = pkgs.appimageTools.defaultFhsEnvArgs; + base = appimageTools.defaultFhsEnvArgs; in - pkgs.buildFHSUserEnv ( + buildFHSUserEnv ( base // { name = "fhs"; @@ -237,8 +242,19 @@ dxvk.enableAsync = True ''; + ".local/share/SpeedCrunch/color-schemes/catppuccin-frappe.json" = { + recursive = true; + source = builtins.fetchurl { + url = "https://raw.githubusercontent.com/catppuccin/speedcrunch/34f2b382de0188d2fd85f59a8a366f313fc30a71/themes/catppuccin-frappe.json"; + sha256 = "sha256:0imx5a53p3ls5kddplgr7mbpbidrmzl9qiwpv7r8jjmsf8yxs0i4"; + }; + }; + # My utility scripts - ".local/share/scripts".source = ./scripts; + ".local/share/scripts" = { + source = ./scripts; + recursive = true; + }; }; ## Theming @@ -264,10 +280,7 @@ iconTheme = { name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { - accent = "lavender"; - flavor = "frappe"; - }; + package = pkgs.papirus-icon-theme.override { color = "violet"; }; }; }; @@ -279,11 +292,12 @@ # Configure XDG xdg.mimeApps.defaultApplications = { - "text/html" = "firefox"; - "video/x-matroska" = "vlc"; - "x-scheme-handler/about" = "firefox"; - "x-scheme-handler/http" = "firefox"; - "x-scheme-handler/https" = "firefox"; - "x-scheme-handler/unknown" = "firefox"; + "text/html" = [ "firefox.desktop" ]; + "video/mp4" = [ "vlc.desktop" ]; + "video/x-matroska" = [ "vlc.desktop" ]; + "x-scheme-handler/about" = [ "firefox.desktop" ]; + "x-scheme-handler/http" = [ "firefox.desktop" ]; + "x-scheme-handler/https" = [ "firefox.desktop" ]; + "x-scheme-handler/unknown" = [ "firefox.desktop" ]; }; } diff --git a/nixos.nix b/nixos.nix index 579e986..c2e9087 100644 --- a/nixos.nix +++ b/nixos.nix @@ -53,7 +53,6 @@ # Add AMD drivers. boot.initrd.kernelModules = [ "amdgpu" ]; - services.xserver.videoDrivers = [ "amdgpu" ]; # TODO: FIX IT BEING BEING OVERWRITTEN boot.extraModulePackages = [ @@ -71,6 +70,27 @@ efi.canTouchEfiVariables = true; }; + # Configure options for mounted volumes. + fileSystems = { + "/".options = [ "compress=zstd" ]; + "/home".options = [ "compress=zstd" ]; + "/nix".options = [ + "compress=zstd" + "noatime" + ]; + "/mnt/extra".options = [ "nofail" ]; + "/mnt/internal".options = [ "nofail" ]; + "/mnt/media".options = [ "nofail" ]; + "/mnt/ssd".options = [ "nofail" ]; + }; + + # Enable btrf's auto scrubbing of volumes. + services.btrfs.autoScrub = { + enable = true; + interval = "weekly"; + fileSystems = [ "/" ]; + }; + networking.hostName = "nixos"; # Define your hostname. # Enable networking @@ -110,6 +130,7 @@ description = "Alexandre Cavalheiro"; extraGroups = [ "docker" + "gamemode" "libvirtd" "networkmanager" "openrazer" @@ -197,23 +218,11 @@ ## DESKTOP ## ## - # Enable XServer - services.xserver = { - enable = true; - - xrandrHeads = [ - { - output = "DP-2"; - primary = true; - } - "DP-3" - ]; - }; - # Enable SDDM. services.displayManager.sddm = { enable = true; - theme = "${import ./theming/sddm.nix { inherit pkgs; }}"; + wayland.enable = true; + theme = "${import ./theming/sddm { inherit pkgs; }}"; }; # Enable Hyprland @@ -249,24 +258,17 @@ ]; }; - ## - ## INPUT ## - ## - - # Configure keymap in X11 - services.xserver = { - xkb = { - layout = "us"; - variant = ""; - }; - }; + # Enable Thunar and it's dependencies + programs.thunar.enable = true; + programs.xfconf.enable = true; # For configuring + services.gvfs.enable = true; # For mounting drives, trash, etc. + services.tumbler.enable = true; # Thumbnail support ## ## SOUND # ## # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -301,7 +303,10 @@ programs.steam = { enable = true; remotePlay.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + # ^ Enables so we can transfer games to other computers in the network. + # Add Proton-GE to 'compatibilitytools.d'. extraCompatPackages = with pkgs; [ proton-ge-bin ]; }; @@ -327,28 +332,40 @@ ## Tools # Utilities bat - btop - docker-compose + btrfs-progs duf - fzf - gping - killall lm_sensors - nmap - ripgrep tree unrar unzip wget - wl-clipboard - xclip zip - zoxide # File managing sshfs yazi + # Virtualization + docker-compose + quickemu + + # Desktop + wl-clipboard + xclip + zoxide + + # Networking + gping + nmap + + # Processes + btop + killall + + # Filter + fzf + ripgrep + ## Libraries libsForQt5.qt5.qtgraphicaleffects libsForQt5.qt5.qtquickcontrols2 diff --git a/programs/alacritty.nix b/programs/alacritty.nix new file mode 100644 index 0000000..323d4b9 --- /dev/null +++ b/programs/alacritty.nix @@ -0,0 +1,38 @@ +{ pkgs, ... }: + +let + catppuccin-theme = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "alacritty"; + rev = "94800165c13998b600a9da9d29c330de9f28618e"; + hash = "sha256-Pi1Hicv3wPALGgqurdTzXEzJNx7vVh+8B9tlqhRpR2Y="; + }; +in +{ + programs.alacritty = { + enable = true; + settings = { + import = [ "${catppuccin-theme}/catppuccin-frappe.toml" ]; + + font = { + normal = { + family = "FantasqueSansM Nerd Font"; + style = "Regular"; + }; + + size = 13; + }; + + window = { + decorations = "None"; + opacity = 0.88; + blur = true; + + padding = { + x = 18; + y = 18; + }; + }; + }; + }; +} diff --git a/programs/emacs/default.nix b/programs/emacs/default.nix index 9fb5428..6319ca3 100644 --- a/programs/emacs/default.nix +++ b/programs/emacs/default.nix @@ -10,6 +10,14 @@ fd pandoc # For org-pandoc + (aspellWithDicts ( + dicts: with dicts; [ + en + pt_BR + ] + )) # for flyspell + languagetool # for grammar + ledger # for accounting and org-ledger ]; # Neatly place the configuration files for doom in their right place. diff --git a/programs/emacs/doom/init.el b/programs/emacs/doom/init.el index 511e06f..eefc4d6 100644 --- a/programs/emacs/doom/init.el +++ b/programs/emacs/doom/init.el @@ -82,8 +82,10 @@ :checkers syntax ; tasing you for every semicolon you forget - (spell +flyspell) ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make + (spell ; tasing you for misspelling mispelling + +aspell + +flyspell) + grammar ; tasing grammar mistake every you make :tools ;;ansible @@ -102,7 +104,6 @@ ;;pass ; password manager for nerds ;;pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders - rgb ; creating color strings ;;taskrunner ; taskrunner for all your projects ;;terraform ; infrastructure as code ;;tmux ; an API for interacting with tmux diff --git a/programs/hyprland/default.nix b/programs/hyprland/default.nix index 8ee3b7e..f6dc4c4 100644 --- a/programs/hyprland/default.nix +++ b/programs/hyprland/default.nix @@ -197,12 +197,12 @@ bind = $mainMod SHIFT, F, fullscreen, 1 bind = $mainMod SHIFT, P, exec, ~/.local/share/scripts/hyprland/screenshot.sh bind = $mainMod, C, killactive - bind = $mainMod, E, exec, wezterm start fish -c "ya" + bind = $mainMod, E, exec, thunar bind = $mainMod, F, fullscreen bind = $mainMod, M, exit bind = $mainMod, O, togglesplit # dwindle bind = $mainMod, P, pseudo # dwindle - bind = $mainMod, Q, exec, wezterm + bind = $mainMod, Q, exec, alacritty bind = $mainMod, R, exec, rofi -show drun bind = $mainMod, V, togglefloating @@ -245,6 +245,10 @@ bind = $mainMod SHIFT, L, movewindow, r bind = $mainMod SHIFT, K, movewindow, u bind = $mainMod SHIFT, J, movewindow, d + bind = $mainMod ALT, H, resizeactive, -5% 0 + bind = $mainMod ALT, L, resizeactive, 5% 0 + bind = $mainMod ALT, K, resizeactive, 0 -5% + bind = $mainMod ALT, J, resizeactive, 0 5% bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow @@ -253,6 +257,9 @@ binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%- bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle + # Passthrough binds + bind = SHIFT CTRL, F12, pass, ^(com.obsproject.Studio)$ + # Window rules windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ windowrulev2 = noanim,class:^(xwaylandvideobridge)$ diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix index 415bc72..212f6be 100644 --- a/programs/neovim/default.nix +++ b/programs/neovim/default.nix @@ -16,13 +16,10 @@ clang-tools gcc # Needed for treesitter - # HTML/CSS + # HTML/CSS/JSON emmet-ls vscode-langservers-extracted - # JSON - nodePackages_latest.vscode-json-languageserver-bin - # LUA lua-language-server stylua @@ -33,7 +30,7 @@ prettierd # Nix - nil + nixd nixfmt-rfc-style # TypeScript diff --git a/programs/neovim/lua/community.lua b/programs/neovim/lua/community.lua index 5ec0465..4a34756 100644 --- a/programs/neovim/lua/community.lua +++ b/programs/neovim/lua/community.lua @@ -16,6 +16,7 @@ return { }, { import = "astrocommunity.editing-support.todo-comments-nvim" }, + { import = "astrocommunity.editing-support.zen-mode-nvim" }, { import = "astrocommunity.motion.flash-nvim" }, { import = "astrocommunity.motion.flit-nvim" }, diff --git a/programs/neovim/lua/plugins/astrolsp.lua b/programs/neovim/lua/plugins/astrolsp.lua index 9d25c02..7c28eb8 100644 --- a/programs/neovim/lua/plugins/astrolsp.lua +++ b/programs/neovim/lua/plugins/astrolsp.lua @@ -55,7 +55,7 @@ return { "jsonls", "lua_ls", "marksman", - "nil_ls", + "nixd", "rust_analyzer", "svelte", "taplo", @@ -67,6 +67,21 @@ return { ---@diagnostic disable: missing-fields config = { -- clangd = { capabilities = { offsetEncoding = "utf-8" } }, + nixd = { + settings = { + nixd = { + options = { + nixos = { + expr = '(builtins.getFlake ("git+file:///home/wizardlink/.system")).nixosConfigurations.nixos.options', + }, + home_manager = { + expr = + '(builtins.getFlake ("git+file:///home/wizardlink/.system")).homeConfigurations.wizardlink.options', + }, + }, + }, + }, + }, }, -- customize how language servers are attached handlers = { diff --git a/programs/neovim/lua/plugins/user.lua b/programs/neovim/lua/plugins/user.lua index 6a04d5a..ab4500c 100644 --- a/programs/neovim/lua/plugins/user.lua +++ b/programs/neovim/lua/plugins/user.lua @@ -34,6 +34,7 @@ return { end, }, { + -- Adds highlighting and lsp features for embedded code in documents. "jmbuhr/otter.nvim", dependencies = { "hrsh7th/nvim-cmp", diff --git a/programs/obs-studio.nix b/programs/obs-studio.nix index bc3348e..e6eaea1 100644 --- a/programs/obs-studio.nix +++ b/programs/obs-studio.nix @@ -5,11 +5,7 @@ enable = true; plugins = with pkgs.obs-studio-plugins; [ input-overlay - # Currently broken due to onnxruntime failing to build. - # obs-backgroundremoval - obs-pipewire-audio-capture - obs-vaapi - obs-vkcapture + obs-backgroundremoval ]; }; } diff --git a/programs/rofi/default.nix b/programs/rofi/default.nix index ce54140..1ad328b 100644 --- a/programs/rofi/default.nix +++ b/programs/rofi/default.nix @@ -20,7 +20,7 @@ modi = "run,drun,window"; show-icons = true; sidebar-mode = true; - terminal = "wezterm"; + terminal = "alacritty"; }; theme = ./catppuccin-frappe.rasi; diff --git a/programs/spotify/default.nix b/programs/spotify/default.nix new file mode 100644 index 0000000..9ae1c18 --- /dev/null +++ b/programs/spotify/default.nix @@ -0,0 +1,19 @@ +{ pkgs, spicetify-nix, ... }: + +let + spicePkgs = spicetify-nix.legacyPackages.${pkgs.system}; +in +{ + imports = [ spicetify-nix.homeManagerModules.default ]; + + programs.spicetify = { + enable = true; + theme = spicePkgs.themes.catppuccin; + colorScheme = "frappe"; + + enabledExtensions = with spicePkgs.extensions; [ + autoVolume + shuffle + ]; + }; +} diff --git a/programs/vtsls/package-lock.json b/programs/vtsls/package-lock.json index b2b9401..94ed1a8 100644 --- a/programs/vtsls/package-lock.json +++ b/programs/vtsls/package-lock.json @@ -1,15 +1,15 @@ { "name": "@vtsls/language-server", - "version": "0.2.3", + "version": "0.2.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@vtsls/language-server", - "version": "0.2.3", + "version": "0.2.5", "license": "MIT", "dependencies": { - "@vtsls/language-service": "0.2.3", + "@vtsls/language-service": "0.2.5", "vscode-languageserver": "^9.0.1", "vscode-uri": "^3.0.8" }, @@ -20,7 +20,7 @@ "esbuild": "^0.21.3" }, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/@esbuild/aix-ppc64": { @@ -397,21 +397,21 @@ "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" }, "node_modules/@vtsls/language-service": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@vtsls/language-service/-/language-service-0.2.3.tgz", - "integrity": "sha512-VqjmaSGbW0LHiJNdhBrKnxKXFrpBUUDc/FxakrRh6z26d4kg55mRpm9IM1khR0tkl3MYtejn0lLNQYcfCVHgYg==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@vtsls/language-service/-/language-service-0.2.5.tgz", + "integrity": "sha512-jf4624do1ZpZLEi4Q2NPZPjACpYRP+TNj3Xtc9kTs+llJDY26zQd1Yfcw9G/uDEREZAN958UTfAjkbuEkVNLYA==", "dependencies": { "@vscode/l10n": "^0.0.18", "@vtsls/vscode-fuzzy": "0.0.1", "jsonc-parser": "^3.2.0", "semver": "7.5.2", - "typescript": "5.4.5", + "typescript": "5.5.2", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/@vtsls/vscode-fuzzy": { @@ -458,9 +458,9 @@ } }, "node_modules/jsonc-parser": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", - "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz", + "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==" }, "node_modules/lru-cache": { "version": "6.0.0", @@ -488,9 +488,9 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/programs/vtsls/package.nix b/programs/vtsls/package.nix index fe824ae..47eb56f 100644 --- a/programs/vtsls/package.nix +++ b/programs/vtsls/package.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { pname = "vtsls"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "yioneko"; repo = "vtsls"; rev = "server-v${version}"; - hash = "sha256-rHiH42WpKR1nZjsW+Q4pit1aLbNIKxpYSy7sjPS0WGc="; + hash = "sha256-4tuVM1mT3NvtJgFf6EdTZmW5PfdiMv7lj2wCSgOOvcc="; fetchSubmodules = true; }; @@ -24,8 +24,6 @@ buildNpmPackage rec { packageLock = lib.importJSON ./package-lock.json; }; - npmDepsHash = "sha256-R70+8vwcZHlT9J5MMCw3rjUQmki4/IoRYHO45CC8TiI="; - npmConfigHook = importNpmLock.npmConfigHook; dontNpmPrune = true; diff --git a/programs/wezterm/default.nix b/programs/wezterm/default.nix deleted file mode 100644 index 599ccfa..0000000 --- a/programs/wezterm/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ ... }: - -{ - programs.wezterm = { - enable = true; - extraConfig = # lua - '' - local wezterm = require("wezterm") - - return { - color_scheme = "Catppuccin Frappe", - enable_wayland = false, -- Unfortunately broken on Hyprland, AGAIN - font = wezterm.font("FantasqueSansM Nerd Font"), - font_size = 13, - hide_tab_bar_if_only_one_tab = true, - hide_mouse_cursor_when_typing = false, - window_background_opacity = 0.88, - window_padding = { - left = 18, - right = 18, - top = 18, - bottom = 18, - }, - } - ''; - }; -} diff --git a/scripts/games/launch.sh b/scripts/games/launch.sh index 3ff1fe9..c738bb9 100755 --- a/scripts/games/launch.sh +++ b/scripts/games/launch.sh @@ -1,9 +1,7 @@ #!/bin/sh -export MANGOHUD=1 - +# I've removed all environment variables +# but there might be useful ones in the future. # https://docs.mesa3d.org/envvars.html -export MESA_NO_DITHER=1 # Disables dither -export MESA_BACK_BUFFER=pixmap # For X only -gamemoderun "$@" +mangohud gamemoderun "$@" diff --git a/services/archi.nix b/services/archi.nix new file mode 100644 index 0000000..dc0d506 --- /dev/null +++ b/services/archi.nix @@ -0,0 +1,20 @@ +{ + services.archisteamfarm = { + enable = true; + web-ui.enable = true; + + bots.wizardlink = { + enabled = true; + username = "master1891891"; + + settings = { + CustomGamePlayedWhileFarming = "In the fields"; + }; + }; + + bots.zak = { + enabled = true; + username = "matheuszak"; + }; + }; +} diff --git a/services/jellyfin.nix b/services/jellyfin.nix new file mode 100644 index 0000000..c5f6277 --- /dev/null +++ b/services/jellyfin.nix @@ -0,0 +1,9 @@ +{ + services.jellyfin = { + enable = true; + openFirewall = true; + user = "wizardlink"; + + cacheDir = "/mnt/media/jellyfin/cache"; + }; +} diff --git a/theming/sddm/Background.jpg b/theming/sddm/Background.jpg new file mode 100644 index 0000000..01fce54 Binary files /dev/null and b/theming/sddm/Background.jpg differ diff --git a/theming/sddm.nix b/theming/sddm/default.nix similarity index 69% rename from theming/sddm.nix rename to theming/sddm/default.nix index ec16288..6f79482 100644 --- a/theming/sddm.nix +++ b/theming/sddm/default.nix @@ -1,12 +1,7 @@ { pkgs }: let - imgLink = "https://w.wallhaven.cc/full/yj/wallhaven-yjq257.png"; - - image = pkgs.fetchurl { - url = imgLink; - sha256 = "sha256-lrQv8VAks86zMzRaF9VEZotp78O9M7/dV8jZNTRb6SY="; - }; + image = ./Background.jpg; in pkgs.stdenv.mkDerivation { name = "sddm-theme";