From bd24a0c8ae65482ea637562e81271ea7de50d163 Mon Sep 17 00:00:00 2001 From: Varris Date: Mon, 15 May 2023 22:06:28 +0200 Subject: [PATCH] update, drop --impure --- system/configuration.nix => configuration.nix | 12 +- flake.lock | 6 +- flake.nix | 4 +- ...guration.nix => hardware-configuration.nix | 0 pkgs/custom-edid/default.nix | 18 --- pkgs/custom-edid/edid.bin | Bin 256 -> 0 bytes pkgs/wxedid/default.nix | 16 --- user/configs/fish/default.nix | 115 +++++++++--------- user/configs/neovim/default.nix | 1 + user/configs/neovim/init.lua | 18 ++- .../wayland/{foot.nix => foot/default.nix} | 2 + .../{fuzzel.nix => fuzzel/default.nix} | 0 .../{hyprland.nix => hyprland/default.nix} | 10 +- .../wayland/{mako.nix => mako/default.nix} | 0 .../{waybar.nix => waybar/default.nix} | 0 .../wayland/{wob.nix => wob/default.nix} | 0 user/home.nix | 6 +- 17 files changed, 85 insertions(+), 123 deletions(-) rename system/configuration.nix => configuration.nix (96%) rename system/hardware-configuration.nix => hardware-configuration.nix (100%) delete mode 100644 pkgs/custom-edid/default.nix delete mode 100644 pkgs/custom-edid/edid.bin delete mode 100644 pkgs/wxedid/default.nix rename user/configs/wayland/{foot.nix => foot/default.nix} (93%) rename user/configs/wayland/{fuzzel.nix => fuzzel/default.nix} (100%) rename user/configs/wayland/{hyprland.nix => hyprland/default.nix} (98%) rename user/configs/wayland/{mako.nix => mako/default.nix} (100%) rename user/configs/wayland/{waybar.nix => waybar/default.nix} (100%) rename user/configs/wayland/{wob.nix => wob/default.nix} (100%) diff --git a/system/configuration.nix b/configuration.nix similarity index 96% rename from system/configuration.nix rename to configuration.nix index 22d1531..22210f6 100755 --- a/system/configuration.nix +++ b/configuration.nix @@ -10,8 +10,6 @@ nixpkgs.config.allowUnfree = true; - hardware.firmware = [ pkgs.customedid ]; - boot = { kernelParams = [ @@ -19,11 +17,6 @@ "net.ifnames=0" ]; - extraModprobeConfig = '' - options iwlmvm power_scheme=1 - options iwlwifi power_save=0 - ''; - loader = { efi = { canTouchEfiVariables = true; @@ -87,6 +80,7 @@ }; chaotic.mesa-git.enable = true; # requires --impure for now + hardware.opengl = { enable = true; extraPackages = [ pkgs.libvdpau-va-gl ]; @@ -96,6 +90,8 @@ }; hardware.steam-hardware.enable = true; + programs.steam.enable = true; + chaotic.steam.extraCompatPackages = with pkgs; [ luxtorpeda proton-ge-custom ]; hardware.bluetooth.enable = true; hardware.sane = { @@ -190,7 +186,7 @@ }; printing = { - enable = false; + enable = true; drivers = [ pkgs.cnijfilter2 ]; }; diff --git a/flake.lock b/flake.lock index bbdb156..78cb337 100755 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ "yuzu-ea-git-src": "yuzu-ea-git-src" }, "locked": { - "lastModified": 1684156567, - "narHash": "sha256-1Yb3wAj2U8RFaVrjz9LiUJovCH7HP4lty7jR2DT8S64=", + "lastModified": 1684180667, + "narHash": "sha256-UO54GUkaEN+IsVMa/jWKZqHs3i2/L80aD4B8H6nqXFo=", "owner": "chaotic-aur", "repo": "nyx", - "rev": "098f1d05009e98953ce0fe9a989648d5efe67d3f", + "rev": "f4fc92c3559f71fd55c00069f9eafb2ab1938b57", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index dba58b3..f0b84fe 100755 --- a/flake.nix +++ b/flake.nix @@ -149,8 +149,6 @@ visualizerSupport = true; }; - customedid = pkgs.callPackage ./pkgs/custom-edid { }; - wxedid = pkgs.callPackage ./pkgs/wxedid { }; }; nixosConfigurations.terra = nixpkgs.lib.nixosSystem @@ -164,7 +162,7 @@ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; nix.registry = { nixpkgs.flake = nixpkgs; }; } - ./system/configuration.nix + ./configuration.nix home-manager.nixosModules.home-manager { home-manager = { diff --git a/system/hardware-configuration.nix b/hardware-configuration.nix similarity index 100% rename from system/hardware-configuration.nix rename to hardware-configuration.nix diff --git a/pkgs/custom-edid/default.nix b/pkgs/custom-edid/default.nix deleted file mode 100644 index 9bf365c..0000000 --- a/pkgs/custom-edid/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenvNoCC, lib }: - -stdenvNoCC.mkDerivation rec { - pname = "edid-main-monitor"; - version = "1"; - - edid = ./edid.bin; - - dontFixup = true; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/lib/firmware/edid - cp ${edid} $out/lib/firmware/edid/edid-EX2780Q.bin - ''; -} - diff --git a/pkgs/custom-edid/edid.bin b/pkgs/custom-edid/edid.bin deleted file mode 100644 index 4da44deddef7f9e2b1360189d4a0c714021a2770..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmZSh4+adJ7t88hLl_u@Xn-OEgB$|`!+(Zw6CVRJOCv)ALrX3NpvYeag9-QU*)Vb` zfB{hC4}()`UZ8?&gps+0K_C}n1QWB#$H3UQ_=H4z2LX8{MFkdNA!bHpPImTYMh1pQ z4Cm9Cc^Cv3EL$wKq?msQWP50Ufr2Rm#P+Z_kcei0K1@UkXcsZy1pw$J BLID5( diff --git a/pkgs/wxedid/default.nix b/pkgs/wxedid/default.nix deleted file mode 100644 index 537ef54..0000000 --- a/pkgs/wxedid/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, stdenv, fetchurl, wxGTK32 }: - -stdenv.mkDerivation rec { - pname = "wxedid"; - version = "0.0.27"; - src = fetchurl { - url = "https://downloads.sourceforge.net/${pname}/${pname}-${version}.tar.gz"; - sha256 = "KBIGrzsJ40TEsz+kJQZi9BPPFPITfVRrTlc1FYqdFfo="; - }; - - postPatch = '' - patchShebangs --build src/rcode/rcd_autogen - ''; - - buildInputs = [ wxGTK32 ]; -} diff --git a/user/configs/fish/default.nix b/user/configs/fish/default.nix index fe9213c..5baac53 100755 --- a/user/configs/fish/default.nix +++ b/user/configs/fish/default.nix @@ -1,63 +1,58 @@ -{ config, pkgs, inputs, ... }: { - programs.exa = { - enable = true; - enableAliases = true; - }; - - programs.fish = { - enable = true; - - plugins = [ - { - name = "bobthefish"; - src = inputs.bobthefish; - } - ]; - - interactiveShellInit = '' - ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source - - set -g theme_color_scheme gruvbox - set -g theme_nerd_fonts yes - set -g theme_display_git_default_branch yes - set -g theme_git_default_branches master main - - ''; - - # loginShellInit = '' - # if test (tty) = "/dev/tty1" - # ${pkgs.sway}/bin/sway &> ~/.sway.log - # end - #''; - - functions = { - fish_greeting = ""; - - ec = '' - pushd . &> /dev/null - cd "${config.home.homeDirectory}/.dotfiles" - nvim "+Telescope find_files" - popd - ''; - - nor = '' - pushd . &> /dev/null - cd "${config.home.homeDirectory}/.dotfiles" - doas nixos-rebuild switch --flake .# --impure - popd &> /dev/null - ''; - - nou = '' - pushd . &> /dev/null - cd "${config.home.homeDirectory}/.dotfiles" - nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager --update-input hyprland --update-input chaotic-nyx - doas nixos-rebuild switch --upgrade --flake .# --impure - popd &> /dev/null - ''; +{ config, pkgs, inputs, ... }: +{ + programs.exa = { + enable = true; + enableAliases = true; }; - shellAliases = { - nf = "${pkgs.pfetch}/bin/pfetch"; - e = "${pkgs.neovim}/bin/nvim"; + + programs.fish = { + enable = true; + + plugins = [ + { + name = "bobthefish"; + src = inputs.bobthefish; + } + ]; + + interactiveShellInit = '' + ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source + + set -g theme_color_scheme gruvbox + set -g theme_nerd_fonts yes + set -g theme_display_git_default_branch yes + set -g theme_git_default_branches master main + + ''; + + functions = { + fish_greeting = ""; + + ec = '' + pushd . &> /dev/null + cd "${config.home.homeDirectory}/.dotfiles" + nvim "+Telescope find_files" + popd + ''; + + nor = '' + pushd . &> /dev/null + cd "${config.home.homeDirectory}/.dotfiles" + doas nixos-rebuild switch --flake .# + popd &> /dev/null + ''; + + nou = '' + pushd . &> /dev/null + cd "${config.home.homeDirectory}/.dotfiles" + nix flake lock --commit-lock-file --update-input nixpkgs --update-input home-manager --update-input hyprland --update-input chaotic-nyx + doas nixos-rebuild switch --upgrade --flake .# + popd &> /dev/null + ''; + }; + shellAliases = { + nf = "${pkgs.pfetch}/bin/pfetch"; + e = "${pkgs.neovim}/bin/nvim"; + }; }; - }; } diff --git a/user/configs/neovim/default.nix b/user/configs/neovim/default.nix index 19bee3c..cce5f21 100644 --- a/user/configs/neovim/default.nix +++ b/user/configs/neovim/default.nix @@ -14,6 +14,7 @@ neo-tree-nvim nvim-notify nvim-treesitter.withAllGrammars + which-key-nvim telescope-nvim telescope-fzf-native-nvim diff --git a/user/configs/neovim/init.lua b/user/configs/neovim/init.lua index 74a6ea8..dbf4d48 100644 --- a/user/configs/neovim/init.lua +++ b/user/configs/neovim/init.lua @@ -11,6 +11,7 @@ vim.o.termguicolors = true vim.o.ignorecase = true vim.o.smartcase = true vim.o.lazyredraw = true +vim.o.timeoutlen = 100 vim.wo.number = true vim.wo.relativenumber = true @@ -26,9 +27,9 @@ require("lualine").setup({ require("bufferline").setup({ options = { - separator_style = "slant", show_tab_indicators = true, - } + separator_style = { "", "" }, + }, }) require("colorizer").setup() @@ -75,11 +76,16 @@ require("nvim-treesitter.configs").setup({ highlight = { enable = true, }, }) +require("which-key").setup() + local builtin = require("telescope.builtin") -vim.keymap.set('n', 'ff', builtin.find_files, {}) -vim.keymap.set('n', 'fg', builtin.live_grep, {}) -vim.keymap.set('n', 'fb', builtin.buffers, {}) -vim.keymap.set('n', 'fh', builtin.help_tags, {}) +vim.keymap.set('n', 'ff', builtin.find_files, { desc = "Find Files" }) +vim.keymap.set('n', 'fg', builtin.live_grep, { desc = "Live Grep" }) +vim.keymap.set('n', 'fb', builtin.buffers, { desc = "List Buffers" }) +vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "Help Tags" }) +vim.keymap.set('n', 'fc', builtin.git_files, { desc = "Find Files (Git)" }) + +require("telescope").load_extension("fzf") local cmp = require("cmp") local lspkind = require("lspkind") diff --git a/user/configs/wayland/foot.nix b/user/configs/wayland/foot/default.nix similarity index 93% rename from user/configs/wayland/foot.nix rename to user/configs/wayland/foot/default.nix index fafd9f3..62efa6a 100755 --- a/user/configs/wayland/foot.nix +++ b/user/configs/wayland/foot/default.nix @@ -11,6 +11,8 @@ in font = "JetBrainsMono Nerd Font:pixelsize=12"; box-drawings-uses-font-glyphs = "yes"; pad = "16x16 center"; + horizontal-letter-offset = "0"; + vertical-letter-offset = "0"; }; colors = { diff --git a/user/configs/wayland/fuzzel.nix b/user/configs/wayland/fuzzel/default.nix similarity index 100% rename from user/configs/wayland/fuzzel.nix rename to user/configs/wayland/fuzzel/default.nix diff --git a/user/configs/wayland/hyprland.nix b/user/configs/wayland/hyprland/default.nix similarity index 98% rename from user/configs/wayland/hyprland.nix rename to user/configs/wayland/hyprland/default.nix index b712d25..049392c 100644 --- a/user/configs/wayland/hyprland.nix +++ b/user/configs/wayland/hyprland/default.nix @@ -58,11 +58,11 @@ in { imports = [ inputs.hyprland.homeManagerModules.default - ./waybar.nix - ./foot.nix - ./wob.nix - ./fuzzel.nix - ./mako.nix + ../waybar + ../foot + ../wob + ../fuzzel + ../mako ]; wayland.windowManager.hyprland = { diff --git a/user/configs/wayland/mako.nix b/user/configs/wayland/mako/default.nix similarity index 100% rename from user/configs/wayland/mako.nix rename to user/configs/wayland/mako/default.nix diff --git a/user/configs/wayland/waybar.nix b/user/configs/wayland/waybar/default.nix similarity index 100% rename from user/configs/wayland/waybar.nix rename to user/configs/wayland/waybar/default.nix diff --git a/user/configs/wayland/wob.nix b/user/configs/wayland/wob/default.nix similarity index 100% rename from user/configs/wayland/wob.nix rename to user/configs/wayland/wob/default.nix diff --git a/user/home.nix b/user/home.nix index f0d6663..6cb112e 100755 --- a/user/home.nix +++ b/user/home.nix @@ -7,7 +7,7 @@ in nix-colors.homeManagerModule ./configs/beets ./configs/cava - ./configs/wayland/hyprland.nix + ./configs/wayland/hyprland ./configs/fish ./configs/mpd ./configs/mpv @@ -48,9 +48,7 @@ in sc-im signal-desktop sshfs - steam steam-run - steamtinkerlaunch sxiv thunderbird tldr @@ -60,7 +58,6 @@ in vulkan-validation-layers webcord-vencord wineWowPackages.stagingFull - wxedid xdg-utils xivlauncher qbittorrent @@ -70,6 +67,7 @@ in EDITOR = "nvim"; MESA_DISK_CACHE_SINGLE_FILE = "1"; NIXOS_OZONE_WL = "1"; + NIXPKGS_ALLOW_UNFREE = "1"; RADV_PERFTEST = "gpl"; WINEDLLOVERRIDES = "winemenubuilder.exe=d"; XDG_SCREENSHOTS_DIR = "~/Screenshots";