This commit is contained in:
Varris 2023-06-01 22:20:44 +02:00
parent 9b6420d631
commit 1318405807
7 changed files with 44 additions and 55 deletions

View File

@ -33,7 +33,7 @@
};
};
kernelPackages = pkgs.linuxPackages_zen;
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = [ "i2c-dev" "i2c-piix4" ];
};
@ -45,7 +45,7 @@
firewall.enable = false;
extraHosts = ''
192.168.0.18 steam.deck
'';
'';
};
# Set your time zone.
@ -115,15 +115,12 @@
};
};
# Define a user account. Don't forget to set a password with passwd.
users.users.manuel = {
isNormalUser = true;
extraGroups = [ "audio" "games" "input" "scanner" "lp" "users" "video" "vboxusers" "wheel" "networkmanager" ];
shell = pkgs.fish;
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment = {
systemPackages = with pkgs; [
bc compsize distrobox fd file git htop links2 libsForQt5.dolphin
@ -136,7 +133,6 @@
package = pkgs.gamescope_git;
};
# List services that you want to enable:
programs = {
dconf.enable = true;
hyprland.enable = true;
@ -197,7 +193,6 @@
virtualisation = {
podman.enable = true;
# virtualbox.host.enable = true;
};
xdg.portal = {
@ -205,7 +200,7 @@
xdgOpenUsePortal = true;
wlr.enable = false; #conflict with XDPH if enabled
extraPortals = [
pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-gtk
];
};
@ -225,7 +220,7 @@
extraOptions = ''
experimental-features = nix-command flakes
warn-dirty = false
'';
'';
gc = {
persistent = true;
automatic = true;
@ -234,16 +229,18 @@
};
settings = {
auto-optimise-store = true;
extra-substituters = [
substituters = [
"https://nyx.chaotic.cx"
"https://hyprland.cachix.org"
];
extra-trusted-public-keys = [
trusted-public-keys = [
"nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
};
};
system.stateVersion = "22.05"; # Did you read the comment?
system.stateVersion = "22.05";
}

View File

@ -15,7 +15,7 @@
fish-plugin-gruvbox-theme = { url = "github:Jomik/fish-gruvbox"; flake = false; };
arrpc = { url = "github:notashelf/arrpc-flake"; inputs.nixpkgs.follows = "nixpkgs"; };
chaotic-nyx.url = "github:chaotic-cx/nyx";
chaotic-nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
grub2-themes = { url = "github:vinceliuice/grub2-themes"; inputs.nixpkgs.follows = "nixpkgs"; };
openmw-git = { url = "gitlab:OpenMW/openmw"; flake = false; };
waybar = { url = "github:alexays/waybar"; flake = false; };
@ -27,7 +27,6 @@
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config = {

View File

@ -1,4 +1,4 @@
{ stdenvNoCC, fetchFromGitHub, gtk3 }:
{ stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
stdenvNoCC.mkDerivation rec {
pname = "gruvbox-plus-icon-pack";
@ -13,10 +13,15 @@ stdenvNoCC.mkDerivation rec {
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
installPhase = ''
mkdir -p $out/share/icons/GruvboxPlus
cp -r * $out/share/icons/GruvboxPlus
gtk-update-icon-cache $out/share/icons/GruvboxPlus
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
'';
dontDropIconThemeCache = true;

View File

@ -17,6 +17,8 @@
nvim-surround
nvim-web-devicons
which-key-nvim
smart-splits-nvim
legendary-nvim
vim-fugitive

View File

@ -90,13 +90,12 @@ require("nvim-treesitter.configs").setup({
highlight = { enable = true, },
})
require("which-key").setup()
require("smart-splits").setup()
require("trouble").setup()
local telescope = require("telescope")
local telescope_builtin = require("telescope.builtin")
local telescope = require("telescope") local telescope_builtin = require("telescope.builtin")
telescope.load_extension("fzf")
require('nvim-surround').setup()
@ -114,7 +113,7 @@ lspconfig.lua_ls.setup {
Lua = {
runtime = { version = "LuaJIT" },
diagnostics = { globals = { "vim" } },
workspace = {
workspace = {
library = vim.api.nvim_get_runtime_file("", true),
checkThirdParty = false
},
@ -254,36 +253,26 @@ cmp.setup.cmdline("/", {
{ name = "buffer" },
})
})
-- keymaps
vim.keymap.set("n", "<C-n>", "<cmd>NeoTreeFocusToggle<CR>")
require("which-key").setup()
require("legendary").setup({
keymaps = {
{ "<S-h>", "<cmd>BufferLineCyclePrev<CR>", description = "Prev buffer" },
{ "<S-l>", "<cmd>BufferLineCycleNext<CR>", description = "Next buffer" },
{ "<ESC>", "<cmd>noh<CR><ESC>", description = "Escape and clear hlsearch", mode = {"n", "i" }},
vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Go to left window" })
vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Go to lower window" })
vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Go to upper window" })
vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Go to right window" })
{ "<Leader>ff", telescope_builtin.find_files, description = "Find Files" },
{ "<Leader>fg", telescope_builtin.live_grep, description = "Live Grep" },
{ "<Leader>fb", telescope_builtin.buffers, description = "List Buffers" },
{ "<Leader>fh", telescope_builtin.help_tags, description = "Help Tags" },
{ "<Leader>fc", telescope_builtin.git_files, description = "Find Files (Git)" },
vim.keymap.set("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase window height" })
vim.keymap.set("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease window height" })
vim.keymap.set("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease window width" })
vim.keymap.set("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase window width" })
{ "<C-n>", "<cmd>NeoTreeFocusToggle<CR>", description = "Open NeoTree" },
{ "<leader>xx", "<cmd>TroubleToggle<CR>", description = "Toggle Trouble Window", opts = { silent = true, noremap = true } },
vim.keymap.set("n", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
vim.keymap.set("o", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" })
vim.keymap.set("n", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
vim.keymap.set("x", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
vim.keymap.set("o", "N", "'nN'[v:searchforward]", { expr = true, desc = "Prev search result" })
vim.keymap.set({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and clear hlsearch" })
vim.keymap.set("n", "<S-h>", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buffer" })
vim.keymap.set("n", "<S-l>", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
vim.keymap.set("n", "[b", "<cmd>BufferLineCyclePrev<cr>", { desc = "Prev buffer" })
vim.keymap.set("n", "]b", "<cmd>BufferLineCycleNext<cr>", { desc = "Next buffer" })
vim.keymap.set("n", '<leader>ff', telescope_builtin.find_files, { desc = "Find Files" })
vim.keymap.set("n", '<leader>fg', telescope_builtin.live_grep, { desc = "Live Grep" })
vim.keymap.set("n", '<leader>fb', telescope_builtin.buffers, { desc = "List Buffers" })
vim.keymap.set("n", '<leader>fh', telescope_builtin.help_tags, { desc = "Help Tags" })
vim.keymap.set("n", '<leader>fc', telescope_builtin.git_files, { desc = "Find Files (Git)" })
vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>", { silent = true, noremap = true, desc = "Toggle Trouble Window" })
},
extensions = {
smart_splits = {},
},
})

View File

@ -138,7 +138,6 @@ in
exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1
exec-once = ${pkgs.swww}/bin/swww-daemon
exec-once = ${pkgs.arrpc}/bin/arRPC
exec-once = ${pkgs.jamesdsp}/bin/jamesdsp -t
exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh;
exec = pkill waybar; ${pkgs.waybar_hyprland}/bin/waybar
@ -160,7 +159,6 @@ in
bind = ${modKey} SHIFT, 3, movetoworkspace, 3
bind = ${modKey} SHIFT, 4, movetoworkspace, 4
bind = ${modKey} SHIFT, 5, movetoworkspace, 5
bind = ${modKey} SHIFT, 6, movetoworkspace, 6
bindm = ${modKey}, mouse:272, movewindow

View File

@ -23,7 +23,6 @@
bc
bottom
calcurse
jamesdsp
gimp
gnome.file-roller
gnome.gnome-boxes
@ -144,7 +143,7 @@
services.gnome-keyring.enable = true;
services.easyeffects = {
enable = false;
enable = true;
preset = "DT770";
};