From 9bf30df8a90fea406ca42372f219ea7f6f7ffb77 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Thu, 16 Jun 2022 21:38:12 +0300 Subject: [PATCH] a --- flake.lock | 18 ++--- flake.nix | 1 - hosts/lungmen/default.nix | 2 +- modules/base/default.nix | 8 +- pkgs-set/overlays/firefox-wayland.nix | 3 - pkgs-set/overlays/steam.nix | 5 ++ pkgs-set/overlays/vscode-wayland.nix | 49 ------------ users/modules/psd/default.nix | 24 ++++++ users/patriot/default.nix | 107 +++----------------------- 9 files changed, 52 insertions(+), 165 deletions(-) delete mode 100644 pkgs-set/overlays/firefox-wayland.nix create mode 100644 pkgs-set/overlays/steam.nix delete mode 100644 pkgs-set/overlays/vscode-wayland.nix create mode 100644 users/modules/psd/default.nix diff --git a/flake.lock b/flake.lock index d331649..d676782 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1654628474, - "narHash": "sha256-Llm9X8Af15uC9IMStxqjCfO15WgYTqTnsQq8wMcpp5Q=", + "lastModified": 1655381586, + "narHash": "sha256-2IrSYYjxoT+iOihSiH0Elo9wzjbHjDSH+qPvI5BklCs=", "owner": "nix-community", "repo": "home-manager", - "rev": "70824bb5c790b820b189f62f643f795b1d2ade2e", + "rev": "1de492f6f8e9937c822333739c5d5b20d93bf49f", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654593855, - "narHash": "sha256-c+SyXvj7THre87OyIdZfRVR+HhI/g1ZDrQ3VUtTuHkU=", + "lastModified": 1655221618, + "narHash": "sha256-ht8HRFthDKzYt+il+sGgkBwrv+Ex2l8jdGVpsrPfFME=", "owner": "nixos", "repo": "nixpkgs", - "rev": "033bd4fa9a8fbe0c68a88e925d9a884161044b25", + "rev": "6616de389ed55fba6eeba60377fc04732d5a207c", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "smos": { "flake": false, "locked": { - "lastModified": 1654685920, - "narHash": "sha256-7RiRcI/Gf9M2Kg3AhKDm1pOU8ZLZcyvwmkVbdVynFio=", + "lastModified": 1654691963, + "narHash": "sha256-XY2esyEIZJr37aflbkn37a3wWBTAtl93a7pAHKfDH5E=", "owner": "yusdacra", "repo": "smos", - "rev": "52d7ba2d8d9610c2291af949647b0d2ce647952e", + "rev": "c11222bc1c836746dbaf1fdffea92509ce775faf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6aa8a18..4de60f4 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,5 @@ packages = tlib.genPkgs (pkgs: pkgs._exported); devShells = import ./shells {inherit lib tlib inputs;}; - devShell = lib.mapAttrs (_: value: value.default) devShells; }; } diff --git a/hosts/lungmen/default.nix b/hosts/lungmen/default.nix index 0715bcb..77a407e 100644 --- a/hosts/lungmen/default.nix +++ b/hosts/lungmen/default.nix @@ -17,7 +17,7 @@ in { common-gpu-amd common-cpu-amd ../../modules/network - ../../modules/develop/nixbuild + #../../modules/develop/nixbuild ../../users/root ../../users/patriot ]; diff --git a/modules/base/default.nix b/modules/base/default.nix index 5c183c8..2c025b9 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -68,10 +68,10 @@ in { df = "${coreBin "df"} -h"; free = "${pkgs.procps}/bin/free -h"; ls = pkgBin "exa"; - l = "${pkgBin "exa"} -lhg --git"; - la = "${pkgBin "exa"} -lhg --git -a"; - t = "${pkgBin "exa"} -lhg --git -T"; - ta = "${pkgBin "exa"} -lhg --git -a -T"; + l = "${pkgBin "exa"} -lhg"; + la = "${pkgBin "exa"} -lhg -a"; + t = "${pkgBin "exa"} -lhg -T"; + ta = "${pkgBin "exa"} -lhg -a -T"; n = nixBin; nf = "${nixBin} flake"; nfu = "${nixBin} flake update"; diff --git a/pkgs-set/overlays/firefox-wayland.nix b/pkgs-set/overlays/firefox-wayland.nix deleted file mode 100644 index 159fc97..0000000 --- a/pkgs-set/overlays/firefox-wayland.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: prev: { - firefox = prev.firefox-wayland; -} diff --git a/pkgs-set/overlays/steam.nix b/pkgs-set/overlays/steam.nix new file mode 100644 index 0000000..56ca78f --- /dev/null +++ b/pkgs-set/overlays/steam.nix @@ -0,0 +1,5 @@ +final: prev: { + steam = prev.steam.override { + extraLibraries = pkgs: with pkgs; [mimalloc pipewire vulkan-loader wayland wayland-protocols]; + }; +} diff --git a/pkgs-set/overlays/vscode-wayland.nix b/pkgs-set/overlays/vscode-wayland.nix deleted file mode 100644 index 6557aaa..0000000 --- a/pkgs-set/overlays/vscode-wayland.nix +++ /dev/null @@ -1,49 +0,0 @@ -_: prev: let - pkgs = prev; - lib = pkgs.lib; - vscodeWayland = let - flags = [ - "--flag-switches-begin" - "--enable-features=UseOzonePlatform,IgnoreGPUBlocklist" - "--flag-switches-end" - "--ozone-platform=wayland" - "--ignore-gpu-blocklist" - "--enable-gpu-rasterization" - "--enable-zero-copy" - "--disable-gpu-driver-bug-workarounds" - ]; - in - pkgs.writeScriptBin - "vscode-wayland" - '' - #!${pkgs.stdenv.shell} - ${pkgs.vscodium}/bin/codium ${lib.concatStringsSep " " flags} - ''; -in { - vscodeWayland = let - pname = "vscode"; - desktop = - pkgs.makeDesktopItem - { - name = pname; - exec = pname; - icon = "vscode"; - desktopName = "VSCode Wayland"; - }; - in - lib.hiPrio - ( - pkgs.stdenv.mkDerivation - { - inherit pname; - version = pkgs.vscode.version; - nativeBuildInputs = [pkgs.makeWrapper]; - phases = ["installPhase"]; - installPhase = '' - mkdir -p $out/bin - install -m755 ${vscodeWayland}/bin/${pname}-wayland $out/bin/${pname} - cp -r ${desktop}/share $out/share - ''; - } - ); -} diff --git a/users/modules/psd/default.nix b/users/modules/psd/default.nix new file mode 100644 index 0000000..53915d5 --- /dev/null +++ b/users/modules/psd/default.nix @@ -0,0 +1,24 @@ +username: {pkgs, ...}: { + services.psd.enable = true; + + security.sudo.extraRules = [ + { + users = [username]; + commands = [ + { + command = "${pkgs.profile-sync-daemon}/bin/psd-overlay-helper"; + options = ["SETENV" "NOPASSWD"]; + } + ]; + } + ]; + + home-manager.users.${username} = { + xdg.enable = true; + xdg.configFile."psd/psd.conf".text = '' + USE_OVERLAYFS="no" + BROWSERS=(chromium) + USE_BACKUPS="no" + ''; + }; +} diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 267f740..f40ece3 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -35,7 +35,7 @@ in { programs = { fuse.userAllowOther = true; adb.enable = true; - #steam.enable = true; + steam.enable = true; kdeconnect = { enable = true; package = pkgs.gnomeExtensions.gsconnect; @@ -49,20 +49,8 @@ in { enableGnomeKeyring = true; enableKwallet = false; }; - sudo.extraRules = [ - { - users = ["patriot"]; - commands = [ - { - command = "${pkgs.profile-sync-daemon}/bin/psd-overlay-helper"; - options = ["SETENV" "NOPASSWD"]; - } - ]; - } - ]; }; services = { - psd.enable = true; gnome = { gnome-keyring.enable = true; core-shell.enable = true; @@ -134,7 +122,7 @@ in { ../modules/direnv ../modules/git ../modules/starship - ../modules/smos + # ../modules/smos inputs.nixos-persistence.nixosModules.home-manager.impermanence ]; @@ -146,7 +134,8 @@ in { [ "Downloads" "proj" - "smos" + # "smos" + ".steam" # ssh / gpg / keys ".ssh" ".gnupg" @@ -160,6 +149,8 @@ in { "zoxide" "direnv" "bottles" + "zsh" + "Steam" ] ++ mkPaths ".config" [ "dconf" @@ -168,7 +159,6 @@ in { ]; files = [ ".config/gnome-initial-setup-done" - config.programs.zsh.history.path (lib.removePrefix "~/" config.programs.ssh.userKnownHostsFile) ]; allowOther = true; @@ -184,6 +174,7 @@ in { font-awesome dejavu_fonts # Programs + bitwarden wezterm cargo-outdated cargo-release @@ -194,21 +185,11 @@ in { gnupg imv mpv - youtube-dl ffmpeg mupdf xdg_utils - papirus-icon-theme wl-clipboard rust-analyzer - /* - ( - lib.hiPrio - (steam.override { - extraLibraries = pkgs: with pkgs; [mimalloc pipewire vulkan-loader wayland wayland-protocols]; - }) - ) - */ /* (multimc.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/AfoninZ/MultiMC5-Cracked.git"; ref = "develop"; rev = "9069e9c9d0b7951c310fdcc8bdc70ebc422a7634"; submodules = true; }; @@ -226,10 +207,8 @@ in { }; }; programs = { - command-not-found.enable = nixosConfig.programs.command-not-found.enable; - firefox = { - enable = false; - }; + command-not-found.enable = + nixosConfig.programs.command-not-found.enable; chromium = { enable = true; package = pkgs.chromium; @@ -325,74 +304,6 @@ in { ''; }; fzf.enable = true; - vscode = { - enable = false; - package = pkgs.vscode; - extensions = let - mkExt = n: v: p: s: { - name = n; - version = v; - publisher = p; - sha256 = s; - }; - in - ( - pkgs.vscode-utils.extensionsFromVscodeMarketplace - [ - # Rust - (mkExt "rust-analyzer" "0.3.968" "matklad" "sha256-wuNdmUYburGjgri8gFJl1FSryJbz1aXjJy4NQ+/Wbk4=") - (mkExt "even-better-toml" "0.14.2" "tamasfe" "sha256-lE2t+KUfClD/xjpvexTJlEr7Kufo+22DUM9Ju4Tisp0=") - (mkExt "crates" "0.5.10" "serayuzgur" "sha256-bY/dphiEPPgTg1zMjvxx4b0Ska2XggRucnZxtbppcLU=") - # Nix - ( - mkExt "nix-env-selector" "1.0.7" "arrterian" "sha256-DnaIXJ27bcpOrIp1hm7DcrlIzGSjo4RTJ9fD72ukKlc=" - ) - # Go - (mkExt "Go" "0.32.0" "golang" "sha256-OsKeZrG157l1HUCDvymJ3ovLxlEEJf7RBe2hXOutdyg=") - # Flutter and dart - (mkExt "flutter" "3.37.20220301" "Dart-Code" "sha256-PS24pbqKNZ/myNcTqgjosG0Pq58yMoATKDgy3k23JlE=") - (mkExt "dart-code" "3.37.20220303" "Dart-Code" "sha256-hS+V4kLe+eGIqj/1mZdgbhxWWxqSr2ZUsc2V0HI6tN8=") - # protobuf - (mkExt "vscode-proto3" "0.5.5" "zxh404" "sha256-Em+w3FyJLXrpVAe9N7zsHRoMcpvl+psmG1new7nA8iE=") - (mkExt "vscode-buf" "0.4.0" "bufbuild" "sha256-VM6LYYak1rB4AdpVYfKpOfizGaFI/R+iUsf6UT50vdw=") - # git - (mkExt "gitlens" "12.0.2" "eamodio" "sha256-et2uam4hOQkxxT+r0fwZhpWGjHk45NAOriFA/43ngpo=") - # Customization - (mkExt "material-icon-theme" "4.14.1" "PKief" "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ=") - (mkExt "horizon-theme-vscode" "1.0.0" "alexandernanberg" "sha256-M7SmOYPkAVi5jQLynZqTjmFo9UcQ6W4dU4euP6ua9Z8=") - ] - ) - ++ ( - with pkgs.vscode-extensions; [ - a5huynh.vscode-ron - /* - vadimcn.vscode-lldb - */ - jnoortheen.nix-ide - ] - ); - userSettings = { - "workbench.iconTheme" = "material-icon-theme"; - "workbench.colorTheme" = "Horizon Bold"; - "rust-analyzer.cargo.loadOutDirsFromCheck" = true; - "rust-analyzer.procMacro.enable" = true; - "rust-analyzer.server.path" = "${pkgs.rust-analyzer}/bin/rust-analyzer"; - "rust-analyzer.updates.channel" = "nightly"; - "editor.fontFamily" = "'${font.name}'"; - "debug.console.fontFamily" = "${font.name}"; - "debug.console.fontSize" = toString font.size; - "terminal.integrated.fontSize" = toString font.size; - "go.useLanguageServer" = true; - "rust-analyzer.checkOnSave.command" = "clippy"; - "nix.enableLanguageServer" = true; - "nix.serverPath" = pkgBin "rnix-lsp"; - "editor.bracketPairColorization.enabled" = true; - "editor.semanticHighlighting.enabled" = true; - "remote.SSH.defaultExtensions" = [ - "gitpod.gitpod-remote-ssh" - ]; - }; - }; }; services = { gpg-agent = let