From 5f89becff7cf8f4fd83e069459f6b8b5d773b956 Mon Sep 17 00:00:00 2001 From: spl3g Date: Fri, 8 Mar 2024 16:26:58 +0300 Subject: thats a lot of deletions --- flake.lock | 194 ++++++++------------- flake.nix | 29 ++- home-manager/general/default.nix | 39 ++--- .../general/programs/alacritty/default.nix | 4 +- home-manager/general/programs/emacs/default.nix | 121 ++----------- home-manager/general/programs/emacs/early-init.el | 1 + home-manager/general/programs/firefox/default.nix | 2 +- home-manager/general/themes/default.nix | 5 +- home-manager/laptop/default.nix | 6 +- home-manager/laptop/hyprland/default.nix | 42 ++++- home-manager/laptop/hyprland/hyprland.conf | 46 ++--- nixos/general.nix | 10 +- nixos/laptop/configuration.nix | 20 ++- nixos/laptop/hardware-configuration.nix | 33 ++-- overlays/default.nix | 2 - pkgs/amnezia-client/default.nix | 70 ++++++++ pkgs/ansel/default.nix | 159 ----------------- pkgs/default.nix | 7 +- pkgs/draw/default.nix | 15 -- pkgs/g-ls/default.nix | 22 --- pkgs/green-tunnel/default.nix | 16 -- pkgs/sddm-sugar-dark-theme/default.nix | 33 ---- pkgs/spoofDPI/default.nix | 15 -- pkgs/spoofDPI/default.nix~ | 13 -- 24 files changed, 303 insertions(+), 601 deletions(-) create mode 100644 pkgs/amnezia-client/default.nix delete mode 100644 pkgs/ansel/default.nix delete mode 100644 pkgs/draw/default.nix delete mode 100644 pkgs/g-ls/default.nix delete mode 100644 pkgs/green-tunnel/default.nix delete mode 100644 pkgs/sddm-sugar-dark-theme/default.nix delete mode 100644 pkgs/spoofDPI/default.nix delete mode 100644 pkgs/spoofDPI/default.nix~ diff --git a/flake.lock b/flake.lock index 0cbd1e0..a46ae6a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,58 +1,18 @@ { "nodes": { - "ags": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1703773758, - "narHash": "sha256-wY43cHzxcGMdwDcC0L868XU68hUPPRVttEqCXwsgCc0=", - "owner": "Aylur", - "repo": "ags", - "rev": "b2dc5f09834e04c368a8f07d69eac18c741b0a40", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1703796062, - "narHash": "sha256-xUcmgr007TeEshv4ZVZLAqTh0QWWCdJV40TltcPkv/c=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "a405e8becb24d38d7e0c465b6432ea3155da66c6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, + "base16-schemes": { + "flake": false, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "tinted-theming", + "repo": "base16-schemes", "type": "github" } }, @@ -63,11 +23,11 @@ ] }, "locked": { - "lastModified": 1703795120, - "narHash": "sha256-Scr4fwfGn03zwFgM7IltT8hqbFDkHvymnF5AaR4eDAg=", + "lastModified": 1708806879, + "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ba6b75011b44e85b1b755b6c423f85d0817645f7", + "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a", "type": "github" }, "original": { @@ -79,19 +39,20 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2", + "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1703801243, - "narHash": "sha256-+8K8Ax9anmVyEnP1Q3PNkceKDiZWei8YQhRyahXNNeA=", + "lastModified": 1708968051, + "narHash": "sha256-EkRf32ZKV2QAyDDaD98jc+EGxCQR5b+uGwpuNkH1Z+o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "cedf5f1fca057351d85560ff72bf2cc6cc609755", + "rev": "f7a34534873bf499fc1a04a5fa25ada03c4ee415", "type": "github" }, "original": { @@ -125,77 +86,88 @@ "type": "github" } }, - "nixpkgs": { + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, "locked": { - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "lastModified": 1708787654, + "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "0fce791ba2334aca183f2ed42399518947550d0d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "hyprwm", + "repo": "hyprlang", "type": "github" } }, - "nixpkgs-stable": { + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", + "owner": "Misterio77", + "repo": "nix-colors", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", + "owner": "Misterio77", + "repo": "nix-colors", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", - "owner": "NixOS", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_3": { + "nixpkgs-lib": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, "nurpkgs": { "locked": { - "lastModified": 1703796324, - "narHash": "sha256-uy3XJh8JjQ4jUF3BgjFmgF/gT4FqPuzEWM4GOFiIiLA=", + "lastModified": 1708971962, + "narHash": "sha256-ITVtpvlL8iWqHhcoaP5KiUIpZ9rf6tLlJVOoY/ZokP4=", "owner": "nix-community", "repo": "NUR", - "rev": "cee4581467953d2c1be3e57450fb0023d52f342e", + "rev": "bac24373cde80987b895dc80da7b22262a715c0d", "type": "github" }, "original": { @@ -206,30 +178,14 @@ }, "root": { "inputs": { - "ags": "ags", - "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_3", + "nix-colors": "nix-colors", + "nixpkgs": "nixpkgs", "nurpkgs": "nurpkgs" } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -248,18 +204,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1701368958, - "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -269,6 +225,10 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -279,11 +239,11 @@ ] }, "locked": { - "lastModified": 1703514399, - "narHash": "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=", + "lastModified": 1708696469, + "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0a318a7a217a6402b0b705837cd5b50b0e94b31b", + "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 07b8d6c..6c01c42 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,13 @@ { - description = "Yep thats i'm learning nix"; + description = "NixOS configs <3"; inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - # You can access packages and modules from different nixpkgs revs - # at the same time. Here's an working example: - # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. + nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; # Home manager home-manager = { - url = "github:nix-community/home-manager/"; + url = github:nix-community/home-manager; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -24,20 +21,22 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - emacs-overlay.url = "github:nix-community/emacs-overlay"; - - ags.url = "github:Aylur/ags"; + nix-colors.url = github:Misterio77/nix-colors; }; - outputs = { self, nixpkgs, home-manager, nurpkgs, hyprland, emacs-overlay, ags, ... }@inputs: + outputs = { self + , nixpkgs + , home-manager + , nurpkgs + , hyprland + , nix-colors + , ... }@inputs: let inherit (self) outputs; forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" "i686-linux" "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" ]; in { @@ -65,17 +64,15 @@ # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { ltrr-mini = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; + specialArgs = { inherit inputs outputs nix-colors; }; modules = [ - # > Our main nixos configuration file < ./nixos/laptop/configuration.nix nurpkgs.nixosModules.nur ]; }; ltrr = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; + specialArgs = { inherit inputs outputs nix-colors; }; modules = [ - # > Our main nixos configuration file < ./nixos/pc/configuration.nix nurpkgs.nixosModules.nur ]; diff --git a/home-manager/general/default.nix b/home-manager/general/default.nix index da62eec..d10dc77 100644 --- a/home-manager/general/default.nix +++ b/home-manager/general/default.nix @@ -1,41 +1,31 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: let username = "jerpo"; homeDirectory = "/home/${username}"; configHome = "${homeDirectory}/.config"; cliPkgs = with pkgs; [ - fd - tldr - wget - btop - # jq - bat - fzf - nix-prefetch-scripts - steam-run - unzip - ghostscript - xdragon + fd fh tldr + wget btop jq + bat fzf nix-prefetch-scripts + steam-run unzip ghostscript + xdragon python311 ripgrep + gcc pkg-config ]; gamingPkgs = with pkgs; [ - vkd3d - mangohud - gamemode - bottles - steam + vkd3d mangohud gamemode + bottles steam ]; - guiPkgs = with pkgs; [ - libreoffice-fresh + guiPkgs = with pkgs; [ + vesktop libreoffice-fresh pokemon-colorscripts telegram-desktop transmission-gtk osu-lazer-bin + brave bruno ]; - imports = builtins.concatMap import [ - ./programs - ] ++ [ ./themes ]; + imports = builtins.concatMap import [ ./programs ] ++ [ ./themes ]; in { inherit imports; @@ -43,7 +33,7 @@ in home = { inherit username homeDirectory; stateVersion = "23.05"; - packages = guiPkgs ++ gamingPkgs ++ cliPkgs ++ fonts; + packages = guiPkgs ++ gamingPkgs ++ cliPkgs; }; xdg = { @@ -52,5 +42,4 @@ in }; programs.home-manager.enable = true; - } diff --git a/home-manager/general/programs/alacritty/default.nix b/home-manager/general/programs/alacritty/default.nix index 930952d..7328fa7 100644 --- a/home-manager/general/programs/alacritty/default.nix +++ b/home-manager/general/programs/alacritty/default.nix @@ -5,10 +5,10 @@ programs.alacritty = { enable = true; settings = { - import = [ "${pkgs.alacritty-theme}/catppuccin_macchiato.yaml" ]; + import = [ "${pkgs.alacritty-theme}/catppuccin_macchiato.toml" ]; font = { normal = { - family = "Source Code Pro"; + family = "Sauce Code Pro Nerd Font"; style = "Medium"; }; size = 11.5; diff --git a/home-manager/general/programs/emacs/default.nix b/home-manager/general/programs/emacs/default.nix index 7b61850..db90f2c 100644 --- a/home-manager/general/programs/emacs/default.nix +++ b/home-manager/general/programs/emacs/default.nix @@ -1,116 +1,23 @@ { pkgs, ... }: -let - pkgsForEmacs = with pkgs; [ + +{ + services.emacs = { + enable = true; + package = pkgs.emacs29-pgtk; + }; + + programs.emacs = { + enable = true; + package = pkgs.emacs29-pgtk; + }; + home.packages = with pkgs; with python311Packages; [ tree-sitter emacs-all-the-icons-fonts libappindicator poppler_utils - nil - nodejs + emacs-lsp-booster + nixd ]; - - pkgsUsePackage = with pkgs; [ - (pkgs.emacsWithPackagesFromUsePackage { - package = pkgs.emacs29-pgtk; - config = ./init.el; - alwaysEnsure = true; - # TODO - # with next flake update delete this, if mood-line hash changes: - # "commit": "10b5195f1b400d64d646f73a21bf5469612a375b", - # "sha256": "0wj8rdgsqsdd2ps3w7sj8a7yhhz0iczwgnalalzws42x8s9yn4j0", - override = final: prev: { - mood-line = prev.melpaPackages.mood-line.overrideAttrs(old: { - src = pkgs.fetchgit { - url = "https://gitlab.com/jessieh/mood-line"; - sha256 = "00vbv40x04g5f9n8i1ylhawslf42fsz0046r3srs4ss6pq8s893r"; - rev = "10b5195f1b400d64d646f73a21bf5469612a375b"; - }; - }); - }; - extraEmacsPackages = epkgs: [ - epkgs.use-package - # (epkgs.melpaBuild rec { - # pname = "codeium"; - # version = "1.2.102"; - - # src = fetchFromGitHub { - # owner = "Exafunction"; - # repo = "codeium.el"; - # rev = "1.4.4"; - # sha256 = "1jjix7fn73ihjnhfivf72wris72f4kwf7xb6k5hxs41fm4kr9hdd"; - # }; - - # commit = "ddc9927ea231ecc5a32f7c9905f92fdfb7912e75"; - - # recipe = writeText "recipe" '' - # (codeium - # :repo "${src.owner}/${src.repo}" - # :fetcher github) - # ''; - # }) - # (epkgs.melpaBuild rec { - # pname = "telega"; - # version = "0.8.216"; - # src = fetchFromGitHub { - # owner = "zevlg"; - # repo = "telega.el"; - # rev = "3899aa8648b9e6deddbb34a2a817ca18acb9d97a"; - # sha256 = "05xrm86gp185mgwb62w720hcbn87salk8z0whq6zf2r2f24l6xbw"; - # }; - # commit = "3899aa8648b9e6deddbb34a2a817ca18acb9d97a"; - # recipe = writeText "recipe" '' - # (telega :fetcher github - # :repo "zevlg/telega.el" - # :files (:defaults "etc" "server" "contrib" "Makefile")) - # ''; - # }) - # (epkgs.melpaBuild rec { - # pname = "orgnote"; - # version = "0.7.17"; - - # src = fetchFromGitHub { - # owner = "Artawower"; - # repo = "orgnote.el"; - # rev = "v${version}"; - # sha256 = "1lrj47h244z4dqq2wyhpww7p3b4sy6bayk8lwlka517lhbcdgh33"; - # }; - - # commit = "ccc40cc346ebf5a6e6a55e3d4a147f0230337350"; - - # recipe = writeText "recipe" '' - # (orgnote - # :repo "${src.owner}/${src.repo}" - # :fetcher github) - # ''; - # }) - (epkgs.melpaBuild rec { - pname = "copilot"; - version = "20231219"; - - src = fetchFromGitHub { - owner = "zerolfx"; - repo = "copilot.el"; - rev = "d4fa14cea818e041b4a536c5052cf6d28c7223d7"; - sha256 = "1bn2im5ybzmwbwbi7v39s0qzmca5isp7zb0ls61y6sramh6k8fsg"; - }; - - packageRequires = with epkgs; [ editorconfig dash s ]; - - commit = "d4fa14cea818e041b4a536c5052cf6d28c7223d7"; - - recipe = writeText "recipe" '' - (copilot - :repo "${src.owner}/${src.repo}" - :fetcher github - :files ("*.el" "dist")) - ''; - }) - ]; - }) - ]; -in -{ - home.packages = pkgsForEmacs ++ pkgsUsePackage; xdg.configFile = { # "emacs/init.el".text = builtins.readFile ./init.el; "emacs/early-init.el".text = builtins.readFile ./early-init.el; diff --git a/home-manager/general/programs/emacs/early-init.el b/home-manager/general/programs/emacs/early-init.el index 46ead1f..c767bdc 100644 --- a/home-manager/general/programs/emacs/early-init.el +++ b/home-manager/general/programs/emacs/early-init.el @@ -1,4 +1,5 @@ (setq package-enable-at-startup nil) +(setenv "LSP_USE_PLISTS" "true") (menu-bar-mode -1) (tool-bar-mode -1) (scroll-bar-mode -1) diff --git a/home-manager/general/programs/firefox/default.nix b/home-manager/general/programs/firefox/default.nix index b08ae0c..be72299 100644 --- a/home-manager/general/programs/firefox/default.nix +++ b/home-manager/general/programs/firefox/default.nix @@ -88,7 +88,7 @@ let in { programs.firefox = { - enable = true; + enable = false; profiles.nothing = { isDefault = false; id = 1; diff --git a/home-manager/general/themes/default.nix b/home-manager/general/themes/default.nix index 5a1b7f4..9d88a41 100644 --- a/home-manager/general/themes/default.nix +++ b/home-manager/general/themes/default.nix @@ -21,7 +21,7 @@ in }; iconTheme = { package = pkgs.rose-pine-icon-theme; - name = "oomox-rose-pine-moon"; + name = "Rose-pine-moon"; }; gtk4.extraCss = builtins.readFile ./Catppuccin/gtk.css; }; @@ -39,4 +39,7 @@ in enable = true; platformTheme = "gtk"; }; + home.packages = with pkgs; [ + gnome.adwaita-icon-theme + ]; } diff --git a/home-manager/laptop/default.nix b/home-manager/laptop/default.nix index 66aa183..788da67 100644 --- a/home-manager/laptop/default.nix +++ b/home-manager/laptop/default.nix @@ -3,12 +3,10 @@ let imports = builtins.concatMap import [ ./programs ./services - ] ++ nonListImports; - nonListImports = [ - inputs.hyprland.homeManagerModules.default - inputs.ags.homeManagerModules.default + ] ++ [ ./hyprland ../general + inputs.hyprland.homeManagerModules.default ]; in { diff --git a/home-manager/laptop/hyprland/default.nix b/home-manager/laptop/hyprland/default.nix index 9f911e1..5b10c11 100644 --- a/home-manager/laptop/hyprland/default.nix +++ b/home-manager/laptop/hyprland/default.nix @@ -14,14 +14,50 @@ in home.packages = with pkgs; [ swww brightnessctl - slurp - grim + grimblast cliphist - xdg-desktop-portal-hyprland + polkit_gnome + xwaylandvideobridge ]; + + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-hyprland + ]; + configPackages = with pkgs; [ + xdg-desktop-portal-hyprland + ]; + }; + + programs.fish.loginShellInit = "Hyprland"; + wayland.windowManager.hyprland = { enable = true; package = pkgs.hyprland; inherit extraConfig; }; + + programs.swaylock = { + enable = true; + package = pkgs.swaylock-effects; + settings = { + indicator-radius = 100; + ring-color = "000000ff"; + layout-bg-color = "000000ff"; + key-hl-color = "e0c69fff"; + inside-color = "000000ff"; + layout-border-color = "e0c69fff"; + line-color = "ffffffff"; + separator-color = "000000ff"; + ring-ver-color = "000000ff"; + line-ver-color = "000000ff"; + inside-ver-color = "ffffff00"; + text-ver-color = "e0c69fff"; + inside-wrong-color = "ffffff00"; + text-wrong-color = "e0c69fff"; + ring-wrong-color = "762f20ff"; + fade-in = 1; + }; + }; } diff --git a/home-manager/laptop/hyprland/hyprland.conf b/home-manager/laptop/hyprland/hyprland.conf index 81ef9eb..e60503a 100644 --- a/home-manager/laptop/hyprland/hyprland.conf +++ b/home-manager/laptop/hyprland/hyprland.conf @@ -1,7 +1,7 @@ -monitor=,preferred,auto,1 +monitor=,preferred,auto,1,mirror,eDP-1 # Execute your favorite apps at launch -exec-once = waybar & swww init +exec-once = swww init # Set programs that you use $terminal = alacritty @@ -11,12 +11,6 @@ $scripts=~/.config/hypr/scripts # Some default env vars. env = XCURSOR_SIZE,18 -env = QT_QPA_PLATFORMTHEME, gtk3 -env = QT_STYLE_OVERRIDE, gtk2 -env = QT_QPA_PLATFORM, wayland -env = TERMINAL, "alacritty" -env = BROWSER, "firefox" - # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { @@ -30,7 +24,7 @@ input { touchpad { natural_scroll = yes - # disable_while_typing = no + disable_while_typing = no } sensitivity = 0.1 # -1.0 - 1.0, 0 means no modification. @@ -109,9 +103,17 @@ windowrulev2 = noborder, title:^(Firefox — Sharing Indicator)$ windowrulev2 = rounding 0, title:^(Firefox — Sharing Indicator)$ windowrulev2 = float, title:^(firefox)$, title:^(Picture-in-Picture)$ windowrulev2 = pin, title:^(firefox)$, title:^(Picture-in-Picture)$ +windowrulev2 = float, title:^(Save File)$ +windowrulev2 = pin, title:^(Save File)$ +windowrulev2 = float, title:^(Torrent Options)$ +windowrulev2 = pin, title:^(Torrent Options)$ +windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ +windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +windowrulev2 = noblur,class:^(xwaylandvideobridge)$ layerrule = blur, waybar - # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER @@ -128,28 +130,28 @@ bind = $mainMod SHIFT, Q, killactive, bind = $mainMod SHIFT, E, exit, # Apps -bind = $mainMod, B, exec, firefox +bind = $mainMod, B, exec, brave --enable-features=TouchpadOverscrollHistoryNavigation bind = $mainMod, T, exec, telegram-desktop bind = $mainMod, E, exec, emacsclient -c -a "emacs" bind = $mainMod CONTROL, E, exec, emacs # Screenshooting -bind = , Print, exec, $scripts/hshot -m -bind = ALT, Print, exec, $scripts/hshot -w -bind = SHIFT, Print, exec, $scripts/hshot -s -bind = CONTROL, Print, exec, $scripts/hshot -m -c -bind = ALT_CONTROL, Print, exec, $scripts/hshot -w -c -bind = CONTROL_SHIFT, Print, exec, $scripts/hshot -s -c +bind = , Print, exec, grimblast save screen +bind = ALT, Print, exec, grimblast save active +bind = SHIFT, Print, exec, grimblast save area +bind = CONTROL, Print, exec, grimblast copy screen +bind = ALT_CONTROL, Print, exec, grimblast copy active +bind = CONTROL_SHIFT, Print, exec, grimblast copy area # Volume -$volDev = wpctl status | grep '*' -m 1 | awk '{print $3 - 0}' | xargs -I _ -bind = ,0x1008FF11,exec,$volDev wpctl set-volume _ 5%- -bind = ,0x1008FF13,exec,$volDev wpctl set-volume _ 5%+ -bind = ,0x1008FF12,exec,$volDev wpctl set-mute _ toggle +bind = ,0x1008FF11,exec,wpctl set-volume @DEFAULT_SINK@ 5%- +bind = ,0x1008FF13,exec,wpctl set-volume @DEFAULT_SINK@ 5%+ +bind = ,0x1008FF12,exec,wpctl set-mute @DEFAULT_SINK@ toggle +bind = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle # Brightness bind = ,XF86MonBrightnessUp,exec,brightnessctl s +5% -bind = ,0x1008FF03,exec,brightnessctl s 5%- +bind = ,XF86MonBrightnessDown,exec,brightnessctl s 5%- # Move focus with mainMod + arrow keys bind = $mainMod, J, movefocus, d diff --git a/nixos/general.nix b/nixos/general.nix index 73d884f..5cc332a 100644 --- a/nixos/general.nix +++ b/nixos/general.nix @@ -6,7 +6,6 @@ outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages - outputs.overlays.emacs-overlay ]; config = { allowUnfree = true; @@ -39,7 +38,8 @@ enable = true; }; - networking.nftables.enable = true; + # networking.nftables.enable = true; + networking.firewall.enable = false; boot.loader = { systemd-boot.enable = true; @@ -72,6 +72,8 @@ }; }; + services.v2raya.enable = true; + fonts = { packages = with pkgs; [ # icon fonts @@ -84,7 +86,7 @@ rubik # code font - source-code-pro + (nerdfonts.override {fonts = ["SourceCodePro"];}) ]; enableDefaultPackages = false; @@ -102,7 +104,7 @@ programs.dconf.enable = true; - i18n.defaultLocale = "ru_RU.UTF-8"; + i18n.defaultLocale = "en_US.UTF-8"; programs.fish.enable = true; users.users = { jerpo = { diff --git a/nixos/laptop/configuration.nix b/nixos/laptop/configuration.nix index ceed24e..983e966 100644 --- a/nixos/laptop/configuration.nix +++ b/nixos/laptop/configuration.nix @@ -25,16 +25,30 @@ displayManager.lightdm.enable = false; }; + environment.systemPackages = with pkgs; [ + joycond-cemuhook + ]; - # environment.systemPackages = with pkgs; [ - # qemu - # ]; + virtualisation.docker = { + enable = true; + liveRestore = true; + daemon.settings = { + bip = "172.20.0.1/16"; + default-address-pools = [{ + base = "172.20.0.0/8"; + size = 16; + }]; + }; + }; + # services.postgresql.enable = true; programs.adb.enable = true; services.udev.packages = [ pkgs.android-udev-rules ]; + services.joycond.enable = true; + home-manager = { extraSpecialArgs = { inherit inputs outputs; }; useGlobalPkgs = true; diff --git a/nixos/laptop/hardware-configuration.nix b/nixos/laptop/hardware-configuration.nix index e3e8a01..8dc4a78 100644 --- a/nixos/laptop/hardware-configuration.nix +++ b/nixos/laptop/hardware-configuration.nix @@ -8,23 +8,23 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" "amdgpu" "hid_nintendo" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/b4d5e165-3c5d-494f-b6f4-dad51c470f4b"; + { device = "/dev/disk/by-uuid/f42dd8ca-f644-462f-a804-1e41d3a56d54"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4075-1CD3"; + { device = "/dev/disk/by-uuid/76AA-EF6D"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/92692e2e-0394-4d43-b309-d0d650af1e21"; } + [ { device = "/dev/disk/by-uuid/f1217bb2-a665-41f1-b381-057aac378262"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -32,21 +32,24 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - - hardware.bluetooth = { - enable = true; - }; - + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.opengl = { enable = true; driSupport = true; driSupport32Bit = true; - extraPackages = with pkgs; [ intel-compute-runtime ]; + extraPackages = with pkgs; [ + amdvlk + rocmPackages.clr.icd + ]; + }; + + hardware.bluetooth = { + enable = true; + powerOnBoot = true; }; - # hardware.opentabletdriver.enable = true; } diff --git a/overlays/default.nix b/overlays/default.nix index c97252a..9a03471 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -13,8 +13,6 @@ # }); }; - emacs-overlay = import inputs.emacs-overlay; - # When applied, the unstable nixpkgs set (declared in the flake inputs) will # be accessible through 'pkgs.unstable' unstable-packages = final: _prev: { diff --git a/pkgs/amnezia-client/default.nix b/pkgs/amnezia-client/default.nix new file mode 100644 index 0000000..5e8dc60 --- /dev/null +++ b/pkgs/amnezia-client/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libsecret +, libgcrypt +, openssl +, openvpn +, tun2socks +, cloak +, shadowsocks-libev +, wireguard-go +, xray +, qtbase +, wrapQtAppsHook +, qtremoteobjects +, qtsvg +, qttools +, qt5compat +, qtkeychain +}: + +stdenv.mkDerivation rec { + pname = "amnezia-client"; + version = "4.4.0.0"; + + src = fetchFromGitHub { + repo = "${pname}"; + owner = "amnezia-vpn"; + + rev = "${version}"; + sha256 = "0k0sjf1c8iqg9crq4sfzdg4cczaq5pbk5j2873yzsw88rps0awac"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + pkg-config + ]; + + buildInputs = [ + qtbase + qtremoteobjects + qtsvg + qttools + qt5compat + qtkeychain + libsecret + libgcrypt + openssl + openvpn + tun2socks + cloak + shadowsocks-libev + wireguard-go + xray + ]; + + installPhase = '' + runHook preInstall + make install + mkdir $out/bin + mkdir -p $out/usr/share/{pixmaps,applications} + cp client/AmneziaVPN $out/bin/ + cp service/server/AmneziaVPN-service $out/bin/ + runHook postInstall + ''; +} diff --git a/pkgs/ansel/default.nix b/pkgs/ansel/default.nix deleted file mode 100644 index fed20a9..0000000 --- a/pkgs/ansel/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ lib -, stdenv -, fetchgit -, cmake -, intltool -, wrapGAppsHook -, ocl-icd -, desktop-file-utils -, llvmPackages_13 -, python311Packages -, clang -, portmidi -, libwebp -, pkg-config -, gettext -, perl -, libxml2 -, pugixml -, libjpeg -, colord-gtk -, colord -, openexr_3 -, lensfun -, isocodes -, zlib -, exiv2 -, openjpeg -, graphicsmagick -, lua -, osm-gps-map -, libsecret -, gmic -, libavif -, jasper -, libjxl -, libxslt -, saxon -, exiftool -, pcre2 -, libheif -, sqlite -, librsvg -, curl -, opencl-clang -, lcms -, json-glib -, ninja -, gdk-pixbuf -, glib -, atkmm -, cairo -, cmocka -, cups -, gtk3 -, pango -, libpng -, libsoup -, libtiff -}: - -stdenv.mkDerivation rec { - name = "ansel"; - version = "06d9cda"; - src = fetchgit { - url = "https://github.com/aurelienpierreeng/${name}.git"; - rev = "06d9cda326f37dafe7e315a5440c8b8b78333ee1"; - hash = "sha256-b/O+ApenIphKJp/20ROy7/drQuo3mqQEvrkYDrSMxyc="; - fetchSubmodules = true; - }; - nativeBuildInputs = [ - gtk3 - cups - cmake - intltool - desktop-file-utils - llvmPackages_13.llvm - pkg-config - perl - llvmPackages_13.clang - opencl-clang - ninja - wrapGAppsHook - ]; - - buildInputs = [ - libtiff - libsoup - pango - libpng - cmocka - python311Packages.jsonschema - cairo - atkmm - gdk-pixbuf - json-glib - lcms - curl - librsvg - sqlite - exiftool - libheif - pcre2 - saxon - libxslt - libwebp - pugixml - libxml2 - libjpeg - colord-gtk - colord - openexr_3 - lensfun - isocodes - zlib - exiv2 - openjpeg - graphicsmagick - lua - osm-gps-map - libsecret - llvmPackages_13.openmp - gmic - libavif - jasper - libjxl - ]; - cmakeFlags = [ - "-G Ninja" - "-DCMAKE_BUILD_TYPE=Release" - "-DBINARY_PACKAGE_BUILD=ON" - "-DCMAKE_INSTALL_LIBDIR=lib64" - ]; - - preFixup = - let - libPathEnvVar = "LD_LIBRARY_PATH"; - libPathPrefix = "$out/lib/ansel:${ocl-icd}/lib"; - in - '' - for f in $out/share/ansel/kernels/*.cl; do - sed -r "s|#include \"(.*)\"|#include \"$out/share/ansel/kernels/\1\"|g" -i "$f" - done - - gappsWrapperArgs+=( - --prefix ${libPathEnvVar} ":" "${libPathPrefix}" - ) - ''; - - meta = with lib; { - description = "Photo-editing software for digital artists"; - homepage = "https://ansel.photos/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ spl3g ]; - }; - -} - - diff --git a/pkgs/default.nix b/pkgs/default.nix index b206caf..d3b5dfe 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,11 +1,6 @@ { pkgs ? import { } }: { - sddm-sugar-dark-theme = pkgs.libsForQt5.callPackage ./sddm-sugar-dark-theme { }; tgs2png = pkgs.callPackage ./tgs2png { }; pokemon-colorscripts = pkgs.callPackage ./pokemon-colorscripts { }; - ansel = pkgs.callPackage ./ansel { }; - g-ls = pkgs.callPackage ./g-ls { }; - draw = pkgs.callPackage ./draw { }; tdlib = pkgs.callPackage ./tdlib { }; - spoofDPI = pkgs.callPackage ./spoofDPI { }; - green-tunnel = pkgs.callPackage ./green-tunnel { }; + amnezia-client = pkgs.qt6Packages.callPackage ./amnezia-client { }; } diff --git a/pkgs/draw/default.nix b/pkgs/draw/default.nix deleted file mode 100644 index cd034db..0000000 --- a/pkgs/draw/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "draw"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "maaslalani"; - repo = "${pname}"; - rev = "v${version}"; - hash = "sha256-ItrIN2Jyk+aoG2xxHT546GBuUV7yQ+saypEZKSEdRmw="; - }; - - vendorHash = "sha256-wUGxg+cdNY5ekViN5nCuKAVEeTmUbiyrXsuwfhI/2iw="; -} diff --git a/pkgs/g-ls/default.nix b/pkgs/g-ls/default.nix deleted file mode 100644 index 06e0a02..0000000 --- a/pkgs/g-ls/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "g"; - version = "0.24.2"; - src = fetchFromGitHub { - owner = "Equationzhao"; - repo = "${pname}"; - rev = "v${version}"; - hash = "sha256-JXNnbw1ckpTe/OHV8E6R1JCmQGfjythzrw67B5ZkQAM="; - }; - - vendorHash = "sha256-vAUPenFdzXXq48fc0EQYQDpiOvpHRz69D8gPVa+6gUI="; - - ldflags = [ "-s" "-v" ]; - - postInstall = '' - mkdir -p $out/usr/share/man/man1 - gzip -d man/g.1.gz - cp man/g.1 $out/usr/share/man/man1/ - ''; -} diff --git a/pkgs/green-tunnel/default.nix b/pkgs/green-tunnel/default.nix deleted file mode 100644 index 02ef398..0000000 --- a/pkgs/green-tunnel/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ buildNpmPackage, fetchFromGitHub, lib }: - -buildNpmPackage rec { - name = "GreenTunnel"; - version = "1.8.3"; - - src = fetchFromGitHub { - repo = name; - owner = "SadeghHayeri"; - rev = "v${version}"; - sha256 = "06c90x2ykm350v2fd1zny0bh5s7hbchx457n916lgcbzzdq7yr6r"; - }; - - npmDepsHash = "sha256-Z+oJ0ZySQA2rFz/l6HSY0QzZodKxQ9jm8h+D6m3JzV0="; - dontNpmBuild = true; -} diff --git a/pkgs/sddm-sugar-dark-theme/default.nix b/pkgs/sddm-sugar-dark-theme/default.nix deleted file mode 100644 index 2df1adc..0000000 --- a/pkgs/sddm-sugar-dark-theme/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qtsvg, qtquickcontrols2, qtgraphicaleffects }: - -stdenv.mkDerivation { - pname = "sddm-sugar-dark-theme"; - version = "1.2"; - - src = fetchFromGitHub { - owner = "MarianArlt"; - repo = "sddm-sugar-dark"; - rev = "ceb2c455663429be03ba62d9f898c571650ef7fe"; - sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy"; - }; - propagatedBuildInputs = [ - qtsvg - qtquickcontrols2 - qtgraphicaleffects - ]; - BuildInputs = [ - qtsvg - qtquickcontrols2 - qtgraphicaleffects - ]; - dontWrapQtApps = true; - postInstall = '' - mkdir -p $out/share/sddm/themes/sugar-dark - mv * $out/share/sddm/themes/sugar-dark/ - ''; - postFixup = '' - echo ${qtgraphicaleffects} >> $out/nix-support/propageted-user-env-packages - echo ${qtsvg} >> $out/nix-support/propageted-user-env-packages - echo ${qtquickcontrols2} >> $out/nix-support/propageted-user-env-packages - ''; -} diff --git a/pkgs/spoofDPI/default.nix b/pkgs/spoofDPI/default.nix deleted file mode 100644 index 33b10f6..0000000 --- a/pkgs/spoofDPI/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ fetchFromGitHub, buildGoModule, lib }: - -buildGoModule rec { - name = "SpoofDPI"; - version = "0.8"; - - src = fetchFromGitHub { - repo = name; - owner = "xvzc"; - rev = "363f022c91773acd62f306ba9bae5bfae4913c2a"; - sha256 = "0gyp4411brdfa9wybgn2z4ljnylid0r4xx6ydy0v56vqk4wrvw4h"; - }; - - vendorHash = "sha256-ib9xRklkLfrDCuLf7zDkJE8lJiNiUMPZ01MDxvqho6o="; -} diff --git a/pkgs/spoofDPI/default.nix~ b/pkgs/spoofDPI/default.nix~ deleted file mode 100644 index ca3f71d..0000000 --- a/pkgs/spoofDPI/default.nix~ +++ /dev/null @@ -1,13 +0,0 @@ -{ fetchFromGitHub, buildGoModule, lib }: - -buildGoModule rec { - name = "SpoofDPI"; - version = "0.8"; - - src = fetchFromGitHub { - repo = name; - owner = "xvzc"; - rev = "363f022c91773acd62f306ba9bae5bfae4913c2a"; - sha256 = "https://github.com/xvzc/SpoofDPI/tags"; - }; -} -- cgit v1.2.3