diff --git a/flake.lock b/flake.lock index 844636c..aeb02a2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "arkenfox-userjs": { + "flake": false, + "locked": { + "lastModified": 1649497545, + "narHash": "sha256-ScO19N/EVpmMzdN2kkfjYIJN7c0CQdZJ9qMZReqMpI4=", + "owner": "arkenfox", + "repo": "user.js", + "rev": "4ff931781a1bf012e0e7e2ec89dc5c2a9bedd890", + "type": "github" + }, + "original": { + "owner": "arkenfox", + "repo": "user.js", + "type": "github" + } + }, "base16": { "inputs": { "nixpkgs": "nixpkgs" @@ -85,11 +101,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -135,11 +151,11 @@ ] }, "locked": { - "lastModified": 1647903177, - "narHash": "sha256-9aWSpW/F8POA/7cuVpoqhVGfjAgcGRIinwxUaXmUpkk=", + "lastModified": 1649984295, + "narHash": "sha256-55dgKGs7W8eC3s9GYewll9y4IlP/KAlSinjQwshNpxM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b4360678fa7890964ba8e40a722985bf8d107e", + "rev": "d49d68f4196d32c5039cb9e91d730cee894f6f14", "type": "github" }, "original": { @@ -228,11 +244,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1647858236, - "narHash": "sha256-JrSxi3SsMJPlp6YgrtPUAjY+79u7ZNm62M+T5PjMsbE=", + "lastModified": 1650011465, + "narHash": "sha256-ERDnX4ZP46ddhj7/17csHJWO0l7d3iQ4j5nWNMzd42A=", "owner": "nixos", "repo": "nix", - "rev": "7ed81701ee5da8c49f31bf0bbe3bca3645cf37bc", + "rev": "b135de2b5f08aa8b549d69371823235124ef04a1", "type": "github" }, "original": { @@ -250,11 +266,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1646697248, - "narHash": "sha256-1EkvVmPEwvpt0m3Zdc9FecFJ/YQZ6+pCZengETOewsA=", + "lastModified": 1649747452, + "narHash": "sha256-/3A3kiElwIZlM1BZxKLD4azQLQTaOc9rFOXiTxhSLZA=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "d3fe0c2835caeb7a183ad74f700c386cb931419a", + "rev": "2820f11c5a3e0ccae4fa705cc9898084ec1f523c", "type": "github" }, "original": { @@ -280,11 +296,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1647914114, - "narHash": "sha256-9B3TFOK9+k6BISVy+kNK5YucQAbgY+GhqXaoGmQwQbs=", + "lastModified": 1650053573, + "narHash": "sha256-7gJ1zHWNV2+BHKg7HIXuZwplH5Vf5PgCEy/78kgiVhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85a633de9fb69e1becebe8d69dbf8ad12b06e08d", + "rev": "ae00b02e5bc940aeed7fd974965442a70ccc47d6", "type": "github" }, "original": { @@ -343,11 +359,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1647490331, - "narHash": "sha256-Jcc+vHNDN3KDWuzGNTl3A24ICGovPneJDejiN2t57QI=", + "lastModified": 1649944829, + "narHash": "sha256-wjOgLfjCdyoRamMOrVJceeDJk4LvJsQOxBoT3k16/7Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c66a7a6e036971c4847cca424125f55b9eb0b0b", + "rev": "2f06b87f64bc06229e05045853e0876666e1b023", "type": "github" }, "original": { @@ -366,11 +382,11 @@ ] }, "locked": { - "lastModified": 1647813462, - "narHash": "sha256-5vNvX3Ib9bHWR/hyEUjpUD8/t4k40cQIknhSYf0eZrE=", + "lastModified": 1649618397, + "narHash": "sha256-slzjG/T03eVX9QZzO9qLrJfVhBgIcEymktetOImDh4Y=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "832a0ed28dbb0aa50f2dc2a1a85abfb11ed56c1d", + "rev": "7edb849271e82862e343c9e86cf38cdc825ba5b0", "type": "github" }, "original": { @@ -381,11 +397,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { @@ -396,11 +412,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1647800324, - "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=", + "lastModified": 1649986882, + "narHash": "sha256-cNsInUFq1MbuvaEmv8x6jetWnmAU+osMpnwKumtjksI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e", + "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee", "type": "github" }, "original": { @@ -410,6 +426,21 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1650047132, + "narHash": "sha256-LbqkAB8FvqvyvszaIC6c4B7O3nurGChX+uCjJxqr6gA=", + "owner": "nix-community", + "repo": "NUR", + "rev": "92a4b2236658264c9d30c94b144b8b05ed3bdfbf", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "poetry2nix": { "inputs": { "flake-utils": [ @@ -438,11 +469,11 @@ "qbittorrent-ee": { "flake": false, "locked": { - "lastModified": 1647268508, - "narHash": "sha256-3yh/mjdiiUJN2cfrRxu6bv5IcpXDzOTYTRgX3NJQiDU=", + "lastModified": 1649528993, + "narHash": "sha256-z1zb84soyQIeUDIuxCCmxtf8cOLCPPhEQUvrXg3lp2k=", "owner": "c0re100", "repo": "qBittorrent-Enhanced-Edition", - "rev": "1cb261407b0deca0586f182f465f95486b2dc053", + "rev": "ab45816bcfafb8633864af9739e667f1ebb9794b", "type": "github" }, "original": { @@ -453,6 +484,7 @@ }, "root": { "inputs": { + "arkenfox-userjs": "arkenfox-userjs", "base16": "base16", "base16-horizon-scheme": "base16-horizon-scheme", "base16-tokyonight-scheme": "base16-tokyonight-scheme", @@ -466,6 +498,7 @@ "nixpkgs-mozilla": "nixpkgs-mozilla", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-wayland": "nixpkgs-wayland", + "nur": "nur", "qbittorrent-ee": "qbittorrent-ee", "rycee": "rycee", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -479,11 +512,11 @@ "rycee": { "flake": false, "locked": { - "lastModified": 1647903363, - "narHash": "sha256-3JHF8yh3BscxysU2Yd7WeoRiRwwZEIDw+f5IuMJbQXE=", + "lastModified": 1649995343, + "narHash": "sha256-KGjxBRtL9zYx7Nu5R43jj7o3M4thToqaXr0HAeJKerQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "303332622f24e566ffca62b8e8a864b597643f50", + "rev": "818b7b7021900e81c7069023f051f66f282e4428", "type": "gitlab" }, "original": { @@ -587,11 +620,11 @@ "zsh-nix-shell": { "flake": false, "locked": { - "lastModified": 1628023704, - "narHash": "sha256-WNa8RljYhkOWk7AZbdTOvYhWw1fR8PjFxH/tnUCbems=", + "lastModified": 1648749800, + "narHash": "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=", "owner": "chisui", "repo": "zsh-nix-shell", - "rev": "f8574f27e1d7772629c9509b2116d504798fe30a", + "rev": "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08", "type": "github" }, "original": { diff --git a/profiles/applications/mpv.nix b/profiles/applications/mpv.nix index f333982..1ed1cbf 100644 --- a/profiles/applications/mpv.nix +++ b/profiles/applications/mpv.nix @@ -16,15 +16,10 @@ "bestvideo[height<=?2160]+bestaudio/best"; }; }; - # TODO: --cookies-from-browser home-manager.users.alukard.home.file.".config/yt-dlp/config" = { text = '' - --cookie=/var/secrets/yt-cookie + --cookies-from-browser firefox --mark-watched ''; }; - - secrets.yt-cookie = { - owner = "alukard"; - }; } \ No newline at end of file diff --git a/profiles/applications/packages.nix b/profiles/applications/packages.nix index 8c906be..c64fddc 100644 --- a/profiles/applications/packages.nix +++ b/profiles/applications/packages.nix @@ -46,10 +46,13 @@ with config.deviceSpecific; { ranger # gui + bitwarden discord element-desktop feh + foliate gparted + jellyfin-media-player keepassxc # persepolis pinta @@ -74,6 +77,7 @@ with config.deviceSpecific; { audacity blueman libreoffice + nodePackages.peerflix samba scrcpy ] ++ lib.optionals isGaming [ @@ -81,7 +85,7 @@ with config.deviceSpecific; { # ckan # gamescope goverlay - # multimc + multimc lutris obs-studio reshade-shaders diff --git a/profiles/applications/vscode.nix b/profiles/applications/vscode.nix index ada43f6..1b112ea 100644 --- a/profiles/applications/vscode.nix +++ b/profiles/applications/vscode.nix @@ -18,8 +18,8 @@ in { name = "Bookmarks"; publisher = "alefragnani"; - version = "13.2.3"; - sha256 = "1lbrv4vh5yhjpl897n71785z0ydz0ig8wcggzsgjqrxay09mppmz"; + version = "13.2.4"; + sha256 = "0376hs09wypn781s4cz3qb74qvsxck0nw1s39bfsgpqi0rgvwa9f"; } { name = "project-manager"; @@ -48,8 +48,8 @@ in { name = "path-intellisense"; publisher = "christian-kohler"; - version = "2.7.0"; - sha256 = "11jbaz8dlr9zmamikgii6pvbncsm61bhkipfarlqrisgfk99im9w"; + version = "2.8.0"; + sha256 = "04vardis9k6yzaha5hhhv16c3z6np48adih46xj88y83ipvg5z2l"; } { name = "gitignore"; @@ -60,20 +60,20 @@ in { name = "bracket-pair-colorizer-2"; publisher = "CoenraadS"; - version = "0.2.2"; - sha256 = "0zcbs7h801agfs2cggk1cz8m8j0i2ypmgznkgw17lcx3zisll9ad"; + version = "0.2.4"; + sha256 = "1vdd3l5khxacwsqnzd9a19h2i7xpp3hi7awgdfbwvvr8w5v8vkmk"; } { name = "dart-code"; publisher = "Dart-Code"; - version = "3.35.20220201"; - sha256 = "118gb78anvzm1m1rjpi9mhdb3k7dcq7ldl9pw4l4kby07al5lkvf"; + version = "3.37.20220310"; + sha256 = "07ppxizyawy247n2spz44qna1xsq7irywdkq6w9xsmd6lqbw9xcx"; } { name = "flutter"; publisher = "Dart-Code"; - version = "3.35.20220201"; - sha256 = "1j9dhlpl6r34126w0xwpz5sshfg2pglnsj6wsw1y2y0l84zr8jfg"; + version = "3.37.20220301"; + sha256 = "0l96nx6xwciq509q0cijkymhyvdhx04al4ypr3k9ydcapajvhb9x"; } { name = "wal-theme"; @@ -84,8 +84,8 @@ in { name = "gitlens"; publisher = "eamodio"; - version = "11.7.0"; - sha256 = "0apjjlfdwljqih394ggz2d8m599pyyjrb0b4cfcz83601b7hk3x6"; + version = "12.0.5"; + sha256 = "0zfawv9nn88x8m30h7ryax0c7p68najl23a51r88a70hqppzxshw"; } { name = "tokyo-night"; @@ -96,8 +96,8 @@ in { name = "vscode-pull-request-github"; publisher = "GitHub"; - version = "0.37.2022021107"; - sha256 = "0rwym24z1fg7qqffgv8v3szdqkrv4pbb40s7wjqfgi8jmi5zhqir"; + version = "0.41.2022033109"; + sha256 = "02iqf7pm2ldfw9xwlibl97nywyfkmnvj26y2s9jia1hvhwb6s7ql"; } { name = "vscode-env"; @@ -132,14 +132,14 @@ in { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.73.2022021015"; - sha256 = "18gwf9r9fsqxrgdjh70ii3b0fw9i1yvq9g978ww69mr25yai2p7j"; + version = "0.78.0"; + sha256 = "1743rwmbqw2mi2dfy3r9qc6qkn42pjchj5cl8ayqvwwrrrvvvpxx"; } { name = "remote-ssh-edit"; publisher = "ms-vscode-remote"; - version = "0.73.2022021015"; - sha256 = "1vv9xhm3hksjx9bbx92ggn3qf3mbbaiszpzd3im2hvjca431539w"; + version = "0.78.0"; + sha256 = "0vfzz6k4hk7m5r6l7hszbf4fwhxq6hxf8f8gimphkc57v4z376ls"; } { name = "awesome-flutter-snippets"; @@ -156,8 +156,8 @@ in { name = "material-icon-theme"; publisher = "PKief"; - version = "4.13.0"; - sha256 = "0b5z08v34q10xlbjbb5sn3zdwq6bflhd96z3dqsiakywhrsxi0jm"; + version = "4.15.0"; + sha256 = "1bs78k27ypq298zyhclcj3xac9xlj7f3zpy6jh2gv9x8fbwnqp3x"; } { name = "gruvbox-material"; @@ -168,8 +168,8 @@ in { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.6"; - sha256 = "15ycxgah3pqar2ngbpz2sq9a0fz7hzabyslzc37dm3s40mxzsnwk"; + version = "2.1.11"; + sha256 = "0zjvv6msz9w9k81rkynqp6xgfzd11slakmr1rm8v875bpgzdfg9s"; } { name = "code-spell-checker-russian"; @@ -189,6 +189,12 @@ in version = "1.9.1"; sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb"; } + { + name = "vscode-nginx"; + publisher = "william-voyek"; + version = "0.7.2"; + sha256 = "0s4akrhdmrf8qwn6vp8kc31k5hx2k2wml5mcashfc09hxiqsf2cq"; + } ]; userSettings = { "update.mode" = "none"; diff --git a/profiles/filesystems.nix b/profiles/filesystems.nix index 4a386c1..4b48cc7 100644 --- a/profiles/filesystems.nix +++ b/profiles/filesystems.nix @@ -49,7 +49,8 @@ with deviceSpecific; "_netdev" ]; }; - "/media/files" = if (device == "AMD-Workstation") then { + # "/media/files" = if (device == "AMD-Workstation") then { + "/media/files" = lib.mkIf (device == "AMD-Workstation") { # Samba host fsType = "ntfs"; device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f"; @@ -59,61 +60,22 @@ with deviceSpecific; "uid=${toString config.users.users.alukard.uid}" "gid=${toString config.users.groups.smbuser.gid}" ]; - } else { + }; + # } else { # Linux samba - fsType = "cifs"; - device = "//192.168.0.100/files"; - options = [ - "credentials=${secrets.samba.decrypted}" - "uid=${toString config.users.users.alukard.uid}" - "gid=${toString config.users.groups.users.gid}" - "vers=3.0" - "nofail" - "noauto" - "x-systemd.automount" - "x-systemd.mount-timeout=5" - "_netdev" - ]; - }; - - "/media/local/win-data" = lib.mkIf (device == "Dell-Laptop") { - fsType = "ntfs"; - device = "/dev/disk/by-partuuid/506c04f2-ecb1-4747-843a-576163828373"; - options = [ - "nofail" - "uid=${toString config.users.users.alukard.uid}" - "gid=${toString config.users.groups.users.gid}" - "dmask=027" - "fmask=137" - "rw" - ]; - }; - "/media/local/win-sys" = lib.mkIf (device == "Dell-Laptop") { - fsType = "ntfs"; - device = "/dev/disk/by-partuuid/e4786ca3-bebf-4a03-9dbf-49ec65b24984"; - options = [ - "nofail" - "uid=${toString config.users.users.alukard.uid}" - "gid=${toString config.users.groups.users.gid}" - "dmask=027" - "fmask=137" - "ro" - ]; - }; - - # Music folder - # TODO: FIXIT - "/home/alukard/Music" = { - fsType = "none"; - device = "/media/files/Music"; - depends = [ "/media/files" ]; - options = [ - "uid=${toString config.users.users.alukard.uid}" - "gid=${toString config.users.groups.users.gid}" - "bind" - "nofail" - "_netdev" - ]; - }; + # fsType = "cifs"; + # device = "//192.168.0.100/files"; + # options = [ + # "credentials=${secrets.samba.decrypted}" + # "uid=${toString config.users.users.alukard.uid}" + # "gid=${toString config.users.groups.users.gid}" + # "vers=3.0" + # "nofail" + # "noauto" + # "x-systemd.automount" + # "x-systemd.mount-timeout=5" + # "_netdev" + # ]; + # }; }; } diff --git a/profiles/nix/default.nix b/profiles/nix/default.nix index d73190f..f603abd 100644 --- a/profiles/nix/default.nix +++ b/profiles/nix/default.nix @@ -13,11 +13,7 @@ with config.deviceSpecific; { # patches = [ ./nix.patch ] ++ oa.patches or [ ]; # }) # else pkgs.nixFlakes; - package = if !config.deviceSpecific.isServer then - pkgs.nixFlakes.overrideAttrs (oa: { - patches = [ ./nix.patch ] ++ oa.patches or [ ]; - }) - else pkgs.nixFlakes; + package = pkgs.nixFlakes; extraOptions = '' experimental-features = nix-command flakes diff --git a/profiles/overlay.nix b/profiles/overlay.nix index a2d97b3..3a10f88 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -13,7 +13,7 @@ let in with lib; { nixpkgs.overlays = [ - inputs.nixpkgs-wayland.overlay + # inputs.nixpkgs-wayland.overlay inputs.nix-alien.overlay roundcube-plugins (self: super: @@ -38,10 +38,10 @@ with lib; { vivaldi = master.vivaldi; wine = super.wineWowPackages.staging; pass-secret-service = super.pass-secret-service.overrideAttrs (_: { installCheckPhase = null; }); - qbittorrent = super.qbittorrent.overrideAttrs (old: rec { - version = "enchanced-edition"; - src = inputs.qbittorrent-ee; - }); + # qbittorrent = super.qbittorrent.overrideAttrs (old: rec { + # version = "enchanced-edition"; + # src = inputs.qbittorrent-ee; + # }); btrbk = if (versionOlder super.btrbk.version "0.32.0") then super.btrbk.overrideAttrs (old: rec { version = "0.32.0-master"; src = super.fetchFromGitHub { diff --git a/profiles/services.nix b/profiles/services.nix index 0071bb4..743bd8f 100644 --- a/profiles/services.nix +++ b/profiles/services.nix @@ -28,7 +28,8 @@ with config.deviceSpecific; { interval = "weekly"; }; - services.thermald.enable = isLaptop; + # FIX! + #services.thermald.enable = isLaptop; services.tlp = { enable = isLaptop; diff --git a/profiles/workspace/git.nix b/profiles/workspace/git.nix index 4536de4..49a1a17 100644 --- a/profiles/workspace/git.nix +++ b/profiles/workspace/git.nix @@ -17,6 +17,9 @@ defaultBranch = "master"; }; pull.rebase = true; + "url \"https://github.com/\"" = { + insteadOf = "git://github.com/"; + }; }; }; }; diff --git a/roles/desktop.nix b/roles/desktop.nix index 3a895bb..410c435 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -45,5 +45,7 @@ print-scan proxy sway + + vscode-server ]; }