formatting + some pkgs cfg update

This commit is contained in:
Your Name 2024-03-28 21:51:20 +03:00
parent 5042b40cdb
commit 57c8b128f5
11 changed files with 391 additions and 71 deletions

View file

@ -9,6 +9,10 @@ let
Status = "locked"; Status = "locked";
}; };
in { in {
imports = [
inputs.nixvim.nixosModules.nixvim
];
users.users.delta.packages = (with pkgs; [ users.users.delta.packages = (with pkgs; [
git git
#chromium #chromium
@ -47,6 +51,9 @@ in {
monero-gui monero-gui
inputs.telegram-desktop-patched.packages.${pkgs.system}.default inputs.telegram-desktop-patched.packages.${pkgs.system}.default
translate-shell translate-shell
tridactyl-native #firefox tridactyl addon
inputs.neovim.packages.${pkgs.system}.default ripgrep #ripgrep for neovim
lunarvim
]); ]);
programs.firefox = { programs.firefox = {
@ -81,7 +88,7 @@ in {
Status = "Locked"; Status = "Locked";
}; };
"browser.tabs.firefox-view" = lock-false; "browser.tabs.firefox-view" = lock-false;
"browser.startup.homepage" = "http://ifconfig.co/json"; "browser.startup.homepage" = "https://ifconfig.me";
}; };
# https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17 # https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
@ -159,7 +166,29 @@ in {
shellInit = '' shellInit = ''
set -U __done_kitty_remote_control 1 set -U __done_kitty_remote_control 1
set -U __done_kitty_remote_control_password "kitty-notification-password-fish" set -U __done_kitty_remote_control_password "kitty-notification-password-fish"
set -U __done_notification_command 'notify-send --icon=kitty --app-name=kitty \$title \$argv[1] && ' set -U __done_notification_command "${pkgs.libnotify}/bin/notify-send --icon=kitty --app-name=kitty \$title \$argv[1]"
''; '';
}; };
programs.neovim = {
enable = true;
#defaultEditor = true;
configure = {
customRC = ''
:set mouse=a
'';
#packages.myVimPackage = with pkgs.vimPlugins; {
# # loaded on launch
# start = [ fugitive nvchad nvchad-ui ];
# # manually loadable by calling `:packadd $plugin-name`
# opt = [ ];
#};
};
};
#programs.nixvim = {
# enable = true;
# extraPlugins = with pkgs.vimPlugins; [
# nvchad nvchad-ui fugitive
# ];
#};
} }

View file

@ -29,14 +29,20 @@ in
}); });
}) })
]; ];
system.activationScripts."gnome_setup_misc".text = ''
# rm -f /home/delta/.config/gtk-4.0/gtk.css
# rm -f /home/delta/.config/gtk-3.0/gtk.css
# ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface cursor-size 16
'';
programs.dconf.enable = true; programs.dconf.enable = true;
programs.dconf.profiles.user.databases = [ programs.dconf.profiles.user.databases = [
{ {
settings = { settings = {
"org/gnome/mutter" = { # "org/gnome/mutter" = {
experimental-features = [ "scale-monitor-framebuffer" ]; # experimental-features = [ "scale-monitor-framebuffer" ];
}; # };
"org/gnome/settings-daemon/plugins/media-keys" = { "org/gnome/settings-daemon/plugins/media-keys" = {
custom-keybindings = [ custom-keybindings = [
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"

View file

@ -4,8 +4,8 @@ let
ephemeralbrowser = pkgs.writeScriptBin "ephemeralbrowser" '' ephemeralbrowser = pkgs.writeScriptBin "ephemeralbrowser" ''
#!/usr/bin/env bash #!/usr/bin/env bash
default_interface=$(${pkgs.iproute2}/bin/ip route show default | ${pkgs.gawk}/bin/awk '/default/ {print $5}') default_interface=$(${pkgs.iproute2}/bin/ip route show default | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}')
interfaces=$(${pkgs.iproute2}/bin/ip -o -4 addr show | ${pkgs.gawk}/bin/awk '$4 ~ /\/24/ {print $2}' | grep -v "wlp1s0" | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/|/g') interfaces=$(${pkgs.iproute2}/bin/ip -o -4 addr show | ${pkgs.gawk}/bin/awk '$4 ~ /\/24/ {print $2; exit}' | grep -v "wlp1s0" | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/|/g')
# The difference between default_interface and and default chose option is that default_interface is used to get dhcp from it, and default is for leave network as is without tweaking it (e.g. VPN/proxy/whatever) # The difference between default_interface and and default chose option is that default_interface is used to get dhcp from it, and default is for leave network as is without tweaking it (e.g. VPN/proxy/whatever)
@ -68,11 +68,32 @@ let
ephemeralbrowserDesktopItem = pkgs.makeDesktopItem { ephemeralbrowserDesktopItem = pkgs.makeDesktopItem {
name = "ephemeralbrowser"; name = "ephemeralbrowser";
desktopName = "Ephemeral Browser"; desktopName = "Ephemeral Browser";
icon = "google-chrome-unstable"; icon = "browser";
exec = "/etc/profiles/per-user/delta/bin/ephemeralbrowser"; exec = "/etc/profiles/per-user/delta/bin/ephemeralbrowser";
type = "Application"; type = "Application";
}; };
googleChromeRussia = pkgs.writeScriptBin "google-chrome-russia" ''
mkdir -p $HOME/.google-chrome-russia/.pki/nssdb/
${pkgs.nssTools}/bin/certutil -d sql:$HOME/.google-chrome-russia/.pki/nssdb -A -t "C,," -n "Russian Trusted Root" -i ${builtins.fetchurl {
url = "https://gu-st.ru/content/lending/russian_trusted_root_ca_pem.crt";
sha256 = "sha256:0135zid0166n0rwymb38kd5zrd117nfcs6pqq2y2brg8lvz46slk";
}}
${pkgs.nssTools}/bin/certutil -d sql:$HOME/.google-chrome-russia/.pki/nssdb -A -t "C,," -n "Russian Trusted Sub CA" -i ${builtins.fetchurl {
url = "https://gu-st.ru/content/lending/russian_trusted_sub_ca_pem.crt";
sha256 = "sha256:19jffjrawgbpdlivdvpzy7kcqbyl115rixs86vpjjkvp6sgmibph";
}}
firejail --blacklist="/var/run/nscd" --ignore="include whitelist-run-common.inc" --private=$HOME/.google-chrome-russia --net=$(${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}') --dns=77.88.8.1 --profile=google-chrome ${pkgs.google-chrome}/bin/google-chrome-stable --class=google-chrome-russia --app-id=google-chrome-russia
'';
googleChromeRussiaDesktopItem = pkgs.makeDesktopItem {
name = "google-chrome-russia";
desktopName = "Google Chrome Russia";
startupWMClass = "google-chrome-russia";
icon = "google-chrome-unstable";
exec = "google-chrome-russia";
};
keepassxc = pkgs.writeScriptBin "keepassxc" '' keepassxc = pkgs.writeScriptBin "keepassxc" ''
#!/usr/bin/env bash #!/usr/bin/env bash
${pkgs.coreutils}/bin/base64 -d ${config.sops.secrets.qqq.path} | ${pkgs.keepassxc}/bin/keepassxc --pw-stdin ~/Dropbox/pswd.kdbx ${pkgs.coreutils}/bin/base64 -d ${config.sops.secrets.qqq.path} | ${pkgs.keepassxc}/bin/keepassxc --pw-stdin ~/Dropbox/pswd.kdbx
@ -104,7 +125,7 @@ let
${pkgs.coreutils}/bin/sleep 5 ${pkgs.coreutils}/bin/sleep 5
${pkgs.gtk3}/bin/gtk-launch dropbox.desktop ${pkgs.gtk3}/bin/gtk-launch dropbox.desktop
${pkgs.gtk3}/bin/gtk-launch org.keepassxc.KeePassXC.desktop ${pkgs.gtk3}/bin/gtk-launch org.keepassxc.KeePassXC.desktop
gsettings set org.gnome.desktop.interface cursor-size 16 # gsettings set org.gnome.desktop.interface cursor-size 16
exit 0 exit 0
''; '';
@ -118,7 +139,7 @@ let
firefoxRussia = pkgs.writeScriptBin "firefox-russia" '' firefoxRussia = pkgs.writeScriptBin "firefox-russia" ''
#!/usr/bin/env bash #!/usr/bin/env bash
firejail --blacklist="/var/run/nscd" --ignore="include whitelist-run-common.inc" --net=$(${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5}') --dns=77.88.8.1 firefox --class firefox-russia --name firefox-russia -P russia -no-remote firejail --blacklist="/var/run/nscd" --ignore="include whitelist-run-common.inc" --net=$(${pkgs.iproute2}/bin/ip route | ${pkgs.gawk}/bin/awk '/default/ {print $5; exit}') --dns=77.88.8.1 firefox --class firefox-russia --name firefox-russia -P russia -no-remote
''; '';
firefoxRussiaDesktopItem = pkgs.makeDesktopItem { firefoxRussiaDesktopItem = pkgs.makeDesktopItem {
@ -134,5 +155,6 @@ in {
keepassxc keepassxcDesktopItem keepassxc keepassxcDesktopItem
autostart autostartDesktopItem autostart autostartDesktopItem
firefoxRussia firefoxRussiaDesktopItem firefoxRussia firefoxRussiaDesktopItem
googleChromeRussia googleChromeRussiaDesktopItem
]; ];
} }

View file

@ -58,8 +58,8 @@ let
} }
set_gateway() { set_gateway() {
default_interface_new=$(ip route | awk '/default/ {print $5}') default_interface_new=$(ip route | awk '/default/ {print $5; exit}')
default_gateway_new=$(ip route | awk '/default/ {print $3}') default_gateway_new=$(ip route | awk '/default/ {print $3; exit}')
if [[ ! -z "$default_interface_new" && ! -z "$default_gateway_new" ]]; then if [[ ! -z "$default_interface_new" && ! -z "$default_gateway_new" ]]; then
default_interface=$default_interface_new default_interface=$default_interface_new

View file

@ -88,7 +88,7 @@ let
######################################################################################################################## ########################################################################################################################
if ip netns | grep -q "$NETNS_NAME"; then if ip netns | grep -q "$NETNS_NAME"; then
echo "This script is already running!" echo "This script is already running!"
exit 1 exit 1
fi fi
@ -97,8 +97,8 @@ let
RUNNING=true RUNNING=true
get_default_interface() { get_default_interface() {
default_gateway=$(ip route | awk '/default/ {print $3}') default_gateway=$(ip route | awk '/default/ {print $3; exit}')
default_interface=$(ip route | awk '/default/ {print $5}') default_interface=$(ip route | awk '/default/ {print $5; exit}')
if [[ -z "$default_interface" ]]; then if [[ -z "$default_interface" ]]; then
echo "No default interface, are you connected to the internet?" echo "No default interface, are you connected to the internet?"
@ -200,7 +200,7 @@ let
ip monitor route | while read -r event; do ip monitor route | while read -r event; do
case "$event" in case "$event" in
'local '*) 'local '*)
default_gateway_new=$(ip route | awk '/default/ {print $3}') default_gateway_new=$(ip route | awk '/default/ {print $3; exit}')
if [[ ! -z "$default_gateway_new" ]]; then if [[ ! -z "$default_gateway_new" ]]; then
if [[ ! "$default_gateway_new" == "$default_gateway" ]]; then if [[ ! "$default_gateway_new" == "$default_gateway" ]]; then

View file

@ -21,6 +21,58 @@
"type": "github" "type": "github"
} }
}, },
"devshell": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1711099426,
"narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
"owner": "numtide",
"repo": "devshell",
"rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"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"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -42,10 +94,49 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@ -60,6 +151,46 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nixvim",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -80,6 +211,48 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1710717205,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1710806803,
@ -161,6 +334,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1711001935,
"narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "20f77aa09916374aa3141cbc605c955626762c9a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1710806803,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
@ -176,7 +365,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1710534455, "lastModified": 1710534455,
"narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=",
@ -192,7 +381,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
@ -208,6 +397,58 @@
"type": "github" "type": "github"
} }
}, },
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1711284540,
"narHash": "sha256-DTzi4ujZoxM3ZXStCwD6Lph3FdGtkBlvfYsDCRITjfA=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "e7a3461fefd983ae3443e9aa849e9d1566ab47e4",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1710923068,
"narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"anyrun": "anyrun", "anyrun": "anyrun",
@ -216,13 +457,14 @@
"nixpkgs-2105": "nixpkgs-2105", "nixpkgs-2105": "nixpkgs-2105",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim",
"secrets": "secrets", "secrets": "secrets",
"telegram-desktop-patched": "telegram-desktop-patched" "telegram-desktop-patched": "telegram-desktop-patched"
} }
}, },
"secrets": { "secrets": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
}, },
"locked": { "locked": {
@ -241,7 +483,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
@ -273,10 +515,40 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"telegram-desktop-patched": { "telegram-desktop-patched": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1710455470, "lastModified": 1710455470,

View file

@ -10,6 +10,11 @@
anyrun.inputs.nixpkgs.follows = "nixpkgs"; anyrun.inputs.nixpkgs.follows = "nixpkgs";
telegram-desktop-patched.url = "github:shwewo/telegram-desktop-patched"; telegram-desktop-patched.url = "github:shwewo/telegram-desktop-patched";
secrets.url = "git+ssh://git@github.com/deltathetawastaken/secrets.git"; secrets.url = "git+ssh://git@github.com/deltathetawastaken/secrets.git";
#nixvim.url = "github:nix-community/nixvim";
neovim = {
url = "github:deltathetawastaken/neovim";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs @ { self, nixpkgs, home-manager, anyrun, ... }: outputs = inputs @ { self, nixpkgs, home-manager, anyrun, ... }:

View file

@ -10,7 +10,6 @@
#services.blueman-applet.enable = true; #services.blueman-applet.enable = true;
#services.network-manager-applet.enable = true; #services.network-manager-applet.enable = true;
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
@ -22,7 +21,8 @@
userSettings = { userSettings = {
"window.titleBarStyle" = "custom"; "window.titleBarStyle" = "custom";
"nix.enableLanguageServer"= true; "nix.enableLanguageServer"= true;
"nix.serverPath" = "${pkgs.nil}/bin/nil"; #"nix.serverPath" = "${pkgs.nil}/bin/nil";
"nix.serverPath" = "${pkgs.nixd}/bin/nixd";
"nix.serverSettings" = { "nix.serverSettings" = {
nil = { nil = {
formatting = { formatting = {

View file

@ -30,7 +30,7 @@ in {
x11.enable = true; x11.enable = true;
package = cursor-package; package = cursor-package;
name = cursor-theme; name = cursor-theme;
size = 8; # size = 16;
}; };
file = { file = {
".local/share/fonts" = { ".local/share/fonts" = {
@ -71,34 +71,34 @@ in {
name = "Papirus-Dark"; name = "Papirus-Dark";
package = lib.mkForce unstable.papirus-icon-theme; package = lib.mkForce unstable.papirus-icon-theme;
}; };
gtk3.extraCss = '' # gtk3.extraCss = ''
headerbar, .titlebar, # headerbar, .titlebar,
.csd:not(.popup):not(tooltip):not(messagedialog) decoration{ # .csd:not(.popup):not(tooltip):not(messagedialog) decoration{
border-radius: 0; # border-radius: 0;
} # }
/* UNITE windowDecorations */ # /* UNITE windowDecorations */
@import url('/run/current-system/sw/share/gnome-shell/extensions/unite@hardpixel.eu/styles/gtk3/buttons-right/maximized.css'); # @import url('/run/current-system/sw/share/gnome-shell/extensions/unite@hardpixel.eu/styles/gtk3/buttons-right/maximized.css');
/* windowDecorations UNITE */ # /* windowDecorations UNITE */
headerbar, .titlebar, # headerbar, .titlebar,
.csd:not(.popup):not(tooltip):not(messagedialog) decoration{ # .csd:not(.popup):not(tooltip):not(messagedialog) decoration{
border-radius: 0; # border-radius: 0;
} # }
''; # '';
gtk4.extraCss = '' # gtk4.extraCss = ''
window.messagedialog .response-area > button, # window.messagedialog .response-area > button,
window.dialog.message .dialog-action-area > button, # window.dialog.message .dialog-action-area > button,
.background.csd{ # .background.csd{
border-radius: 0; # border-radius: 0;
} # }
/* UNITE windowDecorations */ # /* UNITE windowDecorations */
@import url('/run/current-system/sw/share/gnome-shell/extensions/unite@hardpixel.eu/styles/gtk4/buttons-right/maximized.css'); # @import url('/run/current-system/sw/share/gnome-shell/extensions/unite@hardpixel.eu/styles/gtk4/buttons-right/maximized.css');
/* windowDecorations UNITE */ # /* windowDecorations UNITE */
window.messagedialog .response-area > button, # window.messagedialog .response-area > button,
window.dialog.message .dialog-action-area > button, # window.dialog.message .dialog-action-area > button,
.background.csd{ # .background.csd{
border-radius: 0; # border-radius: 0;
} # }
''; # '';
}; };
qt = { qt = {

View file

@ -157,21 +157,6 @@
lua5_4 lua5_4
nodejs_21 nodejs_21
]; ];
programs.fish = {
enable = true;
shellAliases = {
fru = "trans ru:en";
fen = "trans en:ru";
icat = "kitten icat";
};
shellInit = ''
set -U __done_kitty_remote_control 1
set -U __done_kitty_remote_control_password "kitty-notification-password-fish"
set -U __done_notification_command 'notify-send --icon=kitty --app-name=kitty \$title \$argv[1] && '
'';
};
system.stateVersion = "23.11"; # Don't forget the comment system.stateVersion = "23.11"; # Don't forget the comment
} }

View file

@ -10,13 +10,14 @@
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_QPA_PLATFORM = "wayland"; QT_QPA_PLATFORM = "wayland";
STEAM_FORCE_DESKTOPUI_SCALING = "1"; STEAM_FORCE_DESKTOPUI_SCALING = "1";
NIXOS_OZONE_WL = "1"; # NIXOS_OZONE_WL = "1";
XCURSOR_SIZE = "16"; MOZ_ENABLE_WAYLAND = "1";
XCURSOR_SIZE = "";
}; };
services.xserver = { services.xserver = {
enable = true; enable = true;
videoDrivers = [ "modesetting" ]; videoDrivers = [ "amdgpu" ];
displayManager = { displayManager = {
gdm.enable = true; gdm.enable = true;
autoLogin = { autoLogin = {