Compare commits
No commits in common. "fb09434e89b61c9bb77b8101195a5c72eff65908" and "058aec49c03c3825b674d7008974bc69fa423a55" have entirely different histories.
fb09434e89
...
058aec49c0
12
flake.lock
generated
12
flake.lock
generated
@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709204054,
|
"lastModified": 1708988456,
|
||||||
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
|
"narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2f3367769a93b226c467551315e9e270c3f78b15",
|
"rev": "1d085ea4444d26aa52297758b333b449b2aa6fca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -22,11 +22,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709150264,
|
"lastModified": 1708807242,
|
||||||
"narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
|
"narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
|
"rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{ pkgs, inputs, self, user, ... }: {
|
{ inputs, self, user, ... }: {
|
||||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
extraSpecialArgs = { inherit pkgs inputs user; };
|
extraSpecialArgs = { inherit inputs user; };
|
||||||
users.${user} = { pkgs, ... }: {
|
users.${user} = {
|
||||||
imports = [
|
imports = [
|
||||||
./editor/neovim
|
./editor/neovim
|
||||||
./programs/firefox
|
./programs/firefox
|
||||||
|
@ -14,13 +14,9 @@
|
|||||||
lsp-zero-nvim
|
lsp-zero-nvim
|
||||||
vim-floaterm
|
vim-floaterm
|
||||||
luasnip
|
luasnip
|
||||||
lualine-nvim
|
|
||||||
vim-sleuth
|
|
||||||
(nvim-treesitter.withPlugins (p: [
|
(nvim-treesitter.withPlugins (p: [
|
||||||
p.tree-sitter-yaml
|
|
||||||
p.tree-sitter-nix
|
p.tree-sitter-nix
|
||||||
p.tree-sitter-go
|
p.tree-sitter-go
|
||||||
p.tree-sitter-lua
|
|
||||||
p.tree-sitter-vim
|
p.tree-sitter-vim
|
||||||
p.tree-sitter-bash
|
p.tree-sitter-bash
|
||||||
p.tree-sitter-json
|
p.tree-sitter-json
|
||||||
|
@ -16,7 +16,3 @@ vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles,
|
|||||||
{ desc = '[?] FInd recently opened files' })
|
{ desc = '[?] FInd recently opened files' })
|
||||||
vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
|
vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
|
||||||
{ desc = '[F]ind [F]iles' })
|
{ desc = '[F]ind [F]iles' })
|
||||||
vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files,
|
|
||||||
{ desc = '[F]ind [F]iles' })
|
|
||||||
vim.keymap.set('n', '<leader>fg', require('telescope.builtin').live_grep,
|
|
||||||
{ desc = '[F]ind by [G]rep' })
|
|
||||||
|
@ -10,4 +10,3 @@ vim.o.relativenumber = true
|
|||||||
|
|
||||||
vim.o.tabstop = 4
|
vim.o.tabstop = 4
|
||||||
vim.o.shiftwidth = 4
|
vim.o.shiftwidth = 4
|
||||||
vim.o.expandtab = true
|
|
||||||
|
@ -49,69 +49,3 @@ require('telescope').setup({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Tresitter stuff
|
|
||||||
require('nvim-treesitter.configs').setup {
|
|
||||||
ensure_installed = {},
|
|
||||||
auto_install = false,
|
|
||||||
highlight = { enable = true },
|
|
||||||
indent = { enable = true},
|
|
||||||
|
|
||||||
incremental_selection = {
|
|
||||||
enable = true,
|
|
||||||
keymaps = {
|
|
||||||
init_selection = '<c-space>',
|
|
||||||
node_incremental = '<c-space>',
|
|
||||||
scope_incremental = '<c-s>',
|
|
||||||
node_decremental = '<M-space>',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
textobjects = {
|
|
||||||
select = {
|
|
||||||
enable = true,
|
|
||||||
lookahead = true,
|
|
||||||
|
|
||||||
keymaps = {
|
|
||||||
['aa'] = '@parameter.outer',
|
|
||||||
['ia'] = '@parameter.inner',
|
|
||||||
['af'] = '@function.outer',
|
|
||||||
['if'] = '@function.inner',
|
|
||||||
['ac'] = '@class.outer',
|
|
||||||
['ic'] = '@class.inner',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-- Lualine
|
|
||||||
require('lualine').setup({
|
|
||||||
options = {
|
|
||||||
icons_enabled = false,
|
|
||||||
component_separators = '|',
|
|
||||||
disabled_filetypes = {},
|
|
||||||
always_divide_middle = true,
|
|
||||||
globalstatus = true,
|
|
||||||
},
|
|
||||||
sections = {
|
|
||||||
lualine_a = { 'mode' },
|
|
||||||
lualine_b = { 'branch', 'diff', 'diagnostics' },
|
|
||||||
lualine_c = {
|
|
||||||
{
|
|
||||||
'filename',
|
|
||||||
file_status = true,
|
|
||||||
newfile_status = true,
|
|
||||||
path = 3,
|
|
||||||
shorting_target = 30,
|
|
||||||
symbols = {
|
|
||||||
modified = '[+]',
|
|
||||||
readonly = '[-]',
|
|
||||||
unnamed = '[No name]',
|
|
||||||
newfile = '[New]'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
lualine_x = {'encoding', 'fileformat', 'filetype'},
|
|
||||||
lualine_y = { 'progress' },
|
|
||||||
lualine_z = { 'location' }
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
@ -1 +1 @@
|
|||||||
{ imports = [ ./hyprland.nix ./waybar.nix ./xdg.nix ]; }
|
{ imports = [ ./hyprland.nix ./waybar.nix ]; }
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ inputs, pkgs, lib, config, ... }: {
|
{ inputs, pkgs, lib, ... }: {
|
||||||
options.hyprland.enable = lib.mkEnableOption "Hyprland";
|
options.hyprland.enable = lib.mkEnableOption "Hyprland";
|
||||||
config = {
|
config = {
|
||||||
home.packages = with pkgs; [ swww wl-clipboard cliphist hyprpaper hyprlock ];
|
home.packages = with pkgs; [ swww wl-clipboard cliphist ];
|
||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -54,10 +54,6 @@
|
|||||||
master.new_is_master = true;
|
master.new_is_master = true;
|
||||||
misc.force_default_wallpaper = -1;
|
misc.force_default_wallpaper = -1;
|
||||||
|
|
||||||
windowrulev2 = [
|
|
||||||
"opacity 0.95 override 0.5 override,class:^(Alacritty)$"
|
|
||||||
];
|
|
||||||
|
|
||||||
bind = [
|
bind = [
|
||||||
# term
|
# term
|
||||||
"$mainMod,Return,exec,$term"
|
"$mainMod,Return,exec,$term"
|
||||||
@ -89,7 +85,7 @@
|
|||||||
"$mainMod, ${ws}, workspace, ${toString (x + 1)}"
|
"$mainMod, ${ws}, workspace, ${toString (x + 1)}"
|
||||||
"ALT, ${ws}, workspace, ${toString (x + 1)}"
|
"ALT, ${ws}, workspace, ${toString (x + 1)}"
|
||||||
]) 10));
|
]) 10));
|
||||||
exec-once = [ "waybar & hyprpaper" ];
|
exec-once = [ "waybar &" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
preload = ~/pics/wallpapers/1.jpg
|
|
||||||
wallpaper = eDP-1,~/pics/wallpapers/1.jpg
|
|
||||||
splash = false
|
|
@ -1,8 +0,0 @@
|
|||||||
{ config, ... }: {
|
|
||||||
xdg.configFile = {
|
|
||||||
"hypr/hyprpaper.conf" = {
|
|
||||||
source = config.lib.file.mkOutOfStoreSymlink ./. + "/hyprpaper.conf";
|
|
||||||
target = "hypr/hyprpaper.conf";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -6,8 +6,6 @@
|
|||||||
btop
|
btop
|
||||||
bzip2
|
bzip2
|
||||||
croc
|
croc
|
||||||
fd
|
|
||||||
ffmpeg
|
|
||||||
file
|
file
|
||||||
go-task
|
go-task
|
||||||
jq
|
jq
|
||||||
|
@ -4,11 +4,6 @@
|
|||||||
imports = [ ./hardware-configuration.nix ];
|
imports = [ ./hardware-configuration.nix ];
|
||||||
|
|
||||||
# Bootloader stuff
|
# Bootloader stuff
|
||||||
boot.kernelParams = [
|
|
||||||
"quiet"
|
|
||||||
"splash"
|
|
||||||
"rd.systemd.show_status=false"
|
|
||||||
];
|
|
||||||
boot.loader.systemd-boot = { enable = true; };
|
boot.loader.systemd-boot = { enable = true; };
|
||||||
boot.loader.efi = { canTouchEfiVariables = true; };
|
boot.loader.efi = { canTouchEfiVariables = true; };
|
||||||
|
|
||||||
@ -19,22 +14,11 @@
|
|||||||
# Set time stuff
|
# Set time stuff
|
||||||
time.timeZone = "Europe/Oslo";
|
time.timeZone = "Europe/Oslo";
|
||||||
|
|
||||||
# Enable opengl
|
|
||||||
hardware.opengl = {
|
|
||||||
enable = true;
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
intel-media-driver
|
|
||||||
vaapiVdpau
|
|
||||||
libvdpau-va-gl
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Setup hyprland
|
# Setup hyprland
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
xwayland.enable = true;
|
xwayland.enable = true;
|
||||||
portalPackage = pkgs.xdg-desktop-portal-hyprland;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Setup common XDG env vars
|
# Setup common XDG env vars
|
||||||
@ -47,16 +31,6 @@
|
|||||||
PATH = [ "${XDG_BIN_HOME}" ];
|
PATH = [ "${XDG_BIN_HOME}" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Setup xdg portal
|
|
||||||
xdg.portal = {
|
|
||||||
enable = true;
|
|
||||||
xdgOpenUsePortal = true;
|
|
||||||
extraPortals = (with pkgs; [
|
|
||||||
xdg-desktop-portal-hyprland
|
|
||||||
xdg-desktop-portal-gtk
|
|
||||||
]);
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable flakes
|
# Enable flakes
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk
|
noto-fonts-cjk
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
noto-fonts-monochrome-emoji
|
|
||||||
twemoji-color-font
|
twemoji-color-font
|
||||||
font-awesome
|
font-awesome
|
||||||
];
|
];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user