Compare commits
No commits in common. "053f51617513d91127a51e8e2dc4ebe57b636513" and "57d91555a03a72d5f991833b30c979bcf7851a94" have entirely different histories.
053f516175
...
57d91555a0
|
@ -1154,16 +1154,16 @@
|
||||||
},
|
},
|
||||||
"stable": {
|
"stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718437845,
|
"lastModified": 1704290814,
|
||||||
"narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=",
|
"narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e",
|
"rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
master.url = "github:nixos/nixpkgs";
|
master.url = "github:nixos/nixpkgs";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
|
||||||
stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
stable.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -47,11 +47,9 @@ in
|
||||||
col.active_border = rgba(1affffee)
|
col.active_border = rgba(1affffee)
|
||||||
col.inactive_border = rgba(595959aa)
|
col.inactive_border = rgba(595959aa)
|
||||||
|
|
||||||
layout = dwindle
|
cursor_inactive_timeout = 1
|
||||||
}
|
|
||||||
|
|
||||||
cursor {
|
layout = dwindle
|
||||||
inactive_timeout = 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
decoration {
|
decoration {
|
||||||
|
@ -163,8 +161,7 @@ in
|
||||||
bind = $mainMod , D , exec , hyprctl keyword general:layout dwindle
|
bind = $mainMod , D , exec , hyprctl keyword general:layout dwindle
|
||||||
bind = $mainMod , M , exec , hyprctl keyword general:layout master
|
bind = $mainMod , M , exec , hyprctl keyword general:layout master
|
||||||
bind = $mainMod , R , exec , rofi -show combi
|
bind = $mainMod , R , exec , rofi -show combi
|
||||||
# bind = $mainMod , RETURN , exec , systemctl --user is-active --quiet foot && footclient --no-wait || foot
|
bind = $mainMod , RETURN , exec , systemctl --user is-active --quiet foot && footclient --no-wait || foot
|
||||||
bind = $mainMod , RETURN , exec , kitty
|
|
||||||
|
|
||||||
# XF86 keys
|
# XF86 keys
|
||||||
binde = , XF86AudioLowerVolume , exec , pamixer -d 5
|
binde = , XF86AudioLowerVolume , exec , pamixer -d 5
|
||||||
|
@ -227,10 +224,6 @@ in
|
||||||
# Toggle waybar
|
# Toggle waybar
|
||||||
bindr = $mainMod , SUPER_L , exec , pkill -USR1 waybar
|
bindr = $mainMod , SUPER_L , exec , pkill -USR1 waybar
|
||||||
|
|
||||||
# Lid open/close
|
|
||||||
bindl=,switch:on:Lid Switch,exec,monitors="$(hyprctl monitors | grep -c '^Monitor')" && hyprctl keyword monitor "eDP-1, disable" && [ "$monitors" = 1 ] && loginctl lock-session
|
|
||||||
bindl=,switch:off:Lid Switch,exec, hyprctl keyword monitor "eDP-1, prefered, auto"
|
|
||||||
|
|
||||||
# Extra Config
|
# Extra Config
|
||||||
${cfg.extraConfig}
|
${cfg.extraConfig}
|
||||||
''
|
''
|
||||||
|
|
|
@ -48,8 +48,7 @@ in
|
||||||
];
|
];
|
||||||
programs = {
|
programs = {
|
||||||
wallpaper.enable = true;
|
wallpaper.enable = true;
|
||||||
# foot.enable = true;
|
foot.enable = true;
|
||||||
kitty.enable = true;
|
|
||||||
rofi.enable = true;
|
rofi.enable = true;
|
||||||
};
|
};
|
||||||
wallpapers.enable = true;
|
wallpapers.enable = true;
|
||||||
|
|
|
@ -4,15 +4,12 @@ let mapleader=" "
|
||||||
""" Plugins --------------------------------
|
""" Plugins --------------------------------
|
||||||
set surround
|
set surround
|
||||||
set commentary
|
set commentary
|
||||||
set NERDTree
|
|
||||||
|
|
||||||
""" Common settings -------------------------
|
""" Common settings -------------------------
|
||||||
set showmode
|
set showmode
|
||||||
set so=5
|
set so=5
|
||||||
set incsearch
|
set incsearch
|
||||||
set nu
|
set nu
|
||||||
set relativenumber
|
|
||||||
set number
|
|
||||||
|
|
||||||
""" Which-Key
|
""" Which-Key
|
||||||
set which-key
|
set which-key
|
||||||
|
@ -39,8 +36,6 @@ let g:WhichKeyDesc_extract_field = '<leader>ef Extract field'
|
||||||
map <leader>ef <Action>(IntroduceField)
|
map <leader>ef <Action>(IntroduceField)
|
||||||
let g:WhichKeyDesc_extract_parameter = '<leader>ep Extract parameter'
|
let g:WhichKeyDesc_extract_parameter = '<leader>ep Extract parameter'
|
||||||
map <leader>ep <Action>(IntroduceParameter)
|
map <leader>ep <Action>(IntroduceParameter)
|
||||||
let g:WhichKeyDesc_extract_method = '<leader>em Extract method'
|
|
||||||
map <leader>em <Action>(ExtractMethod)
|
|
||||||
|
|
||||||
let g:WhichKeyDesc_rename = '<leader>r Rename'
|
let g:WhichKeyDesc_rename = '<leader>r Rename'
|
||||||
map <leader>r <Action>(RenameElement)
|
map <leader>r <Action>(RenameElement)
|
||||||
|
@ -51,10 +46,8 @@ map [b <Action>(PreviousTab)
|
||||||
let g:WhichKeyDesc_next_buffer = ']b Next buffer'
|
let g:WhichKeyDesc_next_buffer = ']b Next buffer'
|
||||||
map ]b <Action>(NextTab)
|
map ]b <Action>(NextTab)
|
||||||
|
|
||||||
let g:WhichKeyDesc_goto_impl = 'gI Goto implementation'
|
let g:WhichKeyDesc_prev_error = 'gI Goto Implementation'
|
||||||
map gI <Action>(GotoImplementation)
|
map gI <Action>(GotoImplementation)
|
||||||
let g:WhichKeyDesc_goto_type = 'gt Goto type declaration'
|
|
||||||
map gt <Action>(GotoTypeDeclaration)
|
|
||||||
|
|
||||||
"" Other
|
"" Other
|
||||||
let g:WhichKeyDesc_terminal = '<leader>t Terminal'
|
let g:WhichKeyDesc_terminal = '<leader>t Terminal'
|
||||||
|
|
|
@ -10,7 +10,7 @@ let
|
||||||
|
|
||||||
cfg = config.my.programs.python;
|
cfg = config.my.programs.python;
|
||||||
|
|
||||||
pythonVersions = map (version: "3${toString version}") (range 8 13);
|
pythonVersions = map (version: "3${toString version}") (range 8 11);
|
||||||
enabledVersions = filterAttrs (_: value: value.enable) cfg.versions;
|
enabledVersions = filterAttrs (_: value: value.enable) cfg.versions;
|
||||||
|
|
||||||
pythonPackages = version: attrNames pkgs."python${version}Packages";
|
pythonPackages = version: attrNames pkgs."python${version}Packages";
|
||||||
|
|
Loading…
Reference in New Issue