AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade and fixes

Browse Source
This commit is contained in:
Dmitriy Kholkin 2022-04-22 02:14:31 +03:00
parent 032d8c35b5
commit 5e50e03ad1
10 changed files with 134 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
flake.lock generated
View File

@ -1,5 +1,21 @@
{ {
"nodes": { "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": { "base16": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -85,11 +101,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1641205782, "lastModified": 1648199409,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -135,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1647903177, "lastModified": 1649984295,
"narHash": "sha256-9aWSpW/F8POA/7cuVpoqhVGfjAgcGRIinwxUaXmUpkk=", "narHash": "sha256-55dgKGs7W8eC3s9GYewll9y4IlP/KAlSinjQwshNpxM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "80b4360678fa7890964ba8e40a722985bf8d107e", "rev": "d49d68f4196d32c5039cb9e91d730cee894f6f14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -228,11 +244,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1647858236, "lastModified": 1650011465,
"narHash": "sha256-JrSxi3SsMJPlp6YgrtPUAjY+79u7ZNm62M+T5PjMsbE=", "narHash": "sha256-ERDnX4ZP46ddhj7/17csHJWO0l7d3iQ4j5nWNMzd42A=",
"owner": "nixos", "owner": "nixos",
"repo": "nix", "repo": "nix",
"rev": "7ed81701ee5da8c49f31bf0bbe3bca3645cf37bc", "rev": "b135de2b5f08aa8b549d69371823235124ef04a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,11 +266,11 @@
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
"lastModified": 1646697248, "lastModified": 1649747452,
"narHash": "sha256-1EkvVmPEwvpt0m3Zdc9FecFJ/YQZ6+pCZengETOewsA=", "narHash": "sha256-/3A3kiElwIZlM1BZxKLD4azQLQTaOc9rFOXiTxhSLZA=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "d3fe0c2835caeb7a183ad74f700c386cb931419a", "rev": "2820f11c5a3e0ccae4fa705cc9898084ec1f523c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +296,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1647914114, "lastModified": 1650053573,
"narHash": "sha256-9B3TFOK9+k6BISVy+kNK5YucQAbgY+GhqXaoGmQwQbs=", "narHash": "sha256-7gJ1zHWNV2+BHKg7HIXuZwplH5Vf5PgCEy/78kgiVhA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85a633de9fb69e1becebe8d69dbf8ad12b06e08d", "rev": "ae00b02e5bc940aeed7fd974965442a70ccc47d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -343,11 +359,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1647490331, "lastModified": 1649944829,
"narHash": "sha256-Jcc+vHNDN3KDWuzGNTl3A24ICGovPneJDejiN2t57QI=", "narHash": "sha256-wjOgLfjCdyoRamMOrVJceeDJk4LvJsQOxBoT3k16/7Q=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c66a7a6e036971c4847cca424125f55b9eb0b0b", "rev": "2f06b87f64bc06229e05045853e0876666e1b023",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +382,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1647813462, "lastModified": 1649618397,
"narHash": "sha256-5vNvX3Ib9bHWR/hyEUjpUD8/t4k40cQIknhSYf0eZrE=", "narHash": "sha256-slzjG/T03eVX9QZzO9qLrJfVhBgIcEymktetOImDh4Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "832a0ed28dbb0aa50f2dc2a1a85abfb11ed56c1d", "rev": "7edb849271e82862e343c9e86cf38cdc825ba5b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +397,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1632864508, "lastModified": 1645296114,
"narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +412,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1647800324, "lastModified": 1649986882,
"narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=", "narHash": "sha256-cNsInUFq1MbuvaEmv8x6jetWnmAU+osMpnwKumtjksI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e", "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -410,6 +426,21 @@
"type": "github" "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": { "poetry2nix": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -438,11 +469,11 @@
"qbittorrent-ee": { "qbittorrent-ee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1647268508, "lastModified": 1649528993,
"narHash": "sha256-3yh/mjdiiUJN2cfrRxu6bv5IcpXDzOTYTRgX3NJQiDU=", "narHash": "sha256-z1zb84soyQIeUDIuxCCmxtf8cOLCPPhEQUvrXg3lp2k=",
"owner": "c0re100", "owner": "c0re100",
"repo": "qBittorrent-Enhanced-Edition", "repo": "qBittorrent-Enhanced-Edition",
"rev": "1cb261407b0deca0586f182f465f95486b2dc053", "rev": "ab45816bcfafb8633864af9739e667f1ebb9794b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,6 +484,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"arkenfox-userjs": "arkenfox-userjs",
"base16": "base16", "base16": "base16",
"base16-horizon-scheme": "base16-horizon-scheme", "base16-horizon-scheme": "base16-horizon-scheme",
"base16-tokyonight-scheme": "base16-tokyonight-scheme", "base16-tokyonight-scheme": "base16-tokyonight-scheme",
@ -466,6 +498,7 @@
"nixpkgs-mozilla": "nixpkgs-mozilla", "nixpkgs-mozilla": "nixpkgs-mozilla",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur",
"qbittorrent-ee": "qbittorrent-ee", "qbittorrent-ee": "qbittorrent-ee",
"rycee": "rycee", "rycee": "rycee",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
@ -479,11 +512,11 @@
"rycee": { "rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1647903363, "lastModified": 1649995343,
"narHash": "sha256-3JHF8yh3BscxysU2Yd7WeoRiRwwZEIDw+f5IuMJbQXE=", "narHash": "sha256-KGjxBRtL9zYx7Nu5R43jj7o3M4thToqaXr0HAeJKerQ=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "303332622f24e566ffca62b8e8a864b597643f50", "rev": "818b7b7021900e81c7069023f051f66f282e4428",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -587,11 +620,11 @@
"zsh-nix-shell": { "zsh-nix-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1628023704, "lastModified": 1648749800,
"narHash": "sha256-WNa8RljYhkOWk7AZbdTOvYhWw1fR8PjFxH/tnUCbems=", "narHash": "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=",
"owner": "chisui", "owner": "chisui",
"repo": "zsh-nix-shell", "repo": "zsh-nix-shell",
"rev": "f8574f27e1d7772629c9509b2116d504798fe30a", "rev": "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
profiles/applications/mpv.nix
View File

@ -16,15 +16,10 @@
"bestvideo[height<=?2160]+bestaudio/best"; "bestvideo[height<=?2160]+bestaudio/best";
}; };
}; };
# TODO: --cookies-from-browser
home-manager.users.alukard.home.file.".config/yt-dlp/config" = { home-manager.users.alukard.home.file.".config/yt-dlp/config" = {
text = '' text = ''
--cookie=/var/secrets/yt-cookie --cookies-from-browser firefox
--mark-watched --mark-watched
''; '';
}; };
secrets.yt-cookie = {
owner = "alukard";
};
} }

6
profiles/applications/packages.nix
View File

@ -46,10 +46,13 @@ with config.deviceSpecific; {
ranger ranger
# gui # gui
bitwarden
discord discord
element-desktop element-desktop
feh feh
foliate
gparted gparted
jellyfin-media-player
keepassxc keepassxc
# persepolis # persepolis
pinta pinta
@ -74,6 +77,7 @@ with config.deviceSpecific; {
audacity audacity
blueman blueman
libreoffice libreoffice
nodePackages.peerflix
samba samba
scrcpy scrcpy
] ++ lib.optionals isGaming [ ] ++ lib.optionals isGaming [
@ -81,7 +85,7 @@ with config.deviceSpecific; {
# ckan # ckan
# gamescope # gamescope
goverlay goverlay
# multimc multimc
lutris lutris
obs-studio obs-studio
reshade-shaders reshade-shaders

50
profiles/applications/vscode.nix
View File

@ -18,8 +18,8 @@ in
{ {
name = "Bookmarks"; name = "Bookmarks";
publisher = "alefragnani"; publisher = "alefragnani";
version = "13.2.3"; version = "13.2.4";
sha256 = "1lbrv4vh5yhjpl897n71785z0ydz0ig8wcggzsgjqrxay09mppmz"; sha256 = "0376hs09wypn781s4cz3qb74qvsxck0nw1s39bfsgpqi0rgvwa9f";
} }
{ {
name = "project-manager"; name = "project-manager";
@ -48,8 +48,8 @@ in
{ {
name = "path-intellisense"; name = "path-intellisense";
publisher = "christian-kohler"; publisher = "christian-kohler";
version = "2.7.0"; version = "2.8.0";
sha256 = "11jbaz8dlr9zmamikgii6pvbncsm61bhkipfarlqrisgfk99im9w"; sha256 = "04vardis9k6yzaha5hhhv16c3z6np48adih46xj88y83ipvg5z2l";
} }
{ {
name = "gitignore"; name = "gitignore";
@ -60,20 +60,20 @@ in
{ {
name = "bracket-pair-colorizer-2"; name = "bracket-pair-colorizer-2";
publisher = "CoenraadS"; publisher = "CoenraadS";
version = "0.2.2"; version = "0.2.4";
sha256 = "0zcbs7h801agfs2cggk1cz8m8j0i2ypmgznkgw17lcx3zisll9ad"; sha256 = "1vdd3l5khxacwsqnzd9a19h2i7xpp3hi7awgdfbwvvr8w5v8vkmk";
} }
{ {
name = "dart-code"; name = "dart-code";
publisher = "Dart-Code"; publisher = "Dart-Code";
version = "3.35.20220201"; version = "3.37.20220310";
sha256 = "118gb78anvzm1m1rjpi9mhdb3k7dcq7ldl9pw4l4kby07al5lkvf"; sha256 = "07ppxizyawy247n2spz44qna1xsq7irywdkq6w9xsmd6lqbw9xcx";
} }
{ {
name = "flutter"; name = "flutter";
publisher = "Dart-Code"; publisher = "Dart-Code";
version = "3.35.20220201"; version = "3.37.20220301";
sha256 = "1j9dhlpl6r34126w0xwpz5sshfg2pglnsj6wsw1y2y0l84zr8jfg"; sha256 = "0l96nx6xwciq509q0cijkymhyvdhx04al4ypr3k9ydcapajvhb9x";
} }
{ {
name = "wal-theme"; name = "wal-theme";
@ -84,8 +84,8 @@ in
{ {
name = "gitlens"; name = "gitlens";
publisher = "eamodio"; publisher = "eamodio";
version = "11.7.0"; version = "12.0.5";
sha256 = "0apjjlfdwljqih394ggz2d8m599pyyjrb0b4cfcz83601b7hk3x6"; sha256 = "0zfawv9nn88x8m30h7ryax0c7p68najl23a51r88a70hqppzxshw";
} }
{ {
name = "tokyo-night"; name = "tokyo-night";
@ -96,8 +96,8 @@ in
{ {
name = "vscode-pull-request-github"; name = "vscode-pull-request-github";
publisher = "GitHub"; publisher = "GitHub";
version = "0.37.2022021107"; version = "0.41.2022033109";
sha256 = "0rwym24z1fg7qqffgv8v3szdqkrv4pbb40s7wjqfgi8jmi5zhqir"; sha256 = "02iqf7pm2ldfw9xwlibl97nywyfkmnvj26y2s9jia1hvhwb6s7ql";
} }
{ {
name = "vscode-env"; name = "vscode-env";
@ -132,14 +132,14 @@ in
{ {
name = "remote-ssh"; name = "remote-ssh";
publisher = "ms-vscode-remote"; publisher = "ms-vscode-remote";
version = "0.73.2022021015"; version = "0.78.0";
sha256 = "18gwf9r9fsqxrgdjh70ii3b0fw9i1yvq9g978ww69mr25yai2p7j"; sha256 = "1743rwmbqw2mi2dfy3r9qc6qkn42pjchj5cl8ayqvwwrrrvvvpxx";
} }
{ {
name = "remote-ssh-edit"; name = "remote-ssh-edit";
publisher = "ms-vscode-remote"; publisher = "ms-vscode-remote";
version = "0.73.2022021015"; version = "0.78.0";
sha256 = "1vv9xhm3hksjx9bbx92ggn3qf3mbbaiszpzd3im2hvjca431539w"; sha256 = "0vfzz6k4hk7m5r6l7hszbf4fwhxq6hxf8f8gimphkc57v4z376ls";
} }
{ {
name = "awesome-flutter-snippets"; name = "awesome-flutter-snippets";
@ -156,8 +156,8 @@ in
{ {
name = "material-icon-theme"; name = "material-icon-theme";
publisher = "PKief"; publisher = "PKief";
version = "4.13.0"; version = "4.15.0";
sha256 = "0b5z08v34q10xlbjbb5sn3zdwq6bflhd96z3dqsiakywhrsxi0jm"; sha256 = "1bs78k27ypq298zyhclcj3xac9xlj7f3zpy6jh2gv9x8fbwnqp3x";
} }
{ {
name = "gruvbox-material"; name = "gruvbox-material";
@ -168,8 +168,8 @@ in
{ {
name = "code-spell-checker"; name = "code-spell-checker";
publisher = "streetsidesoftware"; publisher = "streetsidesoftware";
version = "2.1.6"; version = "2.1.11";
sha256 = "15ycxgah3pqar2ngbpz2sq9a0fz7hzabyslzc37dm3s40mxzsnwk"; sha256 = "0zjvv6msz9w9k81rkynqp6xgfzd11slakmr1rm8v875bpgzdfg9s";
} }
{ {
name = "code-spell-checker-russian"; name = "code-spell-checker-russian";
@ -189,6 +189,12 @@ in
version = "1.9.1"; version = "1.9.1";
sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb"; sha256 = "0dds99j6awdxb0ipm15g543a5b6f0hr00q9rz961n0zkyawgdlcb";
} }
{
name = "vscode-nginx";
publisher = "william-voyek";
version = "0.7.2";
sha256 = "0s4akrhdmrf8qwn6vp8kc31k5hx2k2wml5mcashfc09hxiqsf2cq";
}
]; ];
userSettings = { userSettings = {
"update.mode" = "none"; "update.mode" = "none";

74
profiles/filesystems.nix
View File

@ -49,7 +49,8 @@ with deviceSpecific;
"_netdev" "_netdev"
]; ];
}; };
"/media/files" = if (device == "AMD-Workstation") then { # "/media/files" = if (device == "AMD-Workstation") then {
"/media/files" = lib.mkIf (device == "AMD-Workstation") {
# Samba host # Samba host
fsType = "ntfs"; fsType = "ntfs";
device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f"; device = "/dev/disk/by-partuuid/8a1d933c-302b-4e62-b9af-a45ecd05777f";
@ -59,61 +60,22 @@ with deviceSpecific;
"uid=${toString config.users.users.alukard.uid}" "uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.smbuser.gid}" "gid=${toString config.users.groups.smbuser.gid}"
]; ];
} else { };
# } else {
# Linux samba # Linux samba
fsType = "cifs"; # fsType = "cifs";
device = "//192.168.0.100/files"; # device = "//192.168.0.100/files";
options = [ # options = [
"credentials=${secrets.samba.decrypted}" # "credentials=${secrets.samba.decrypted}"
"uid=${toString config.users.users.alukard.uid}" # "uid=${toString config.users.users.alukard.uid}"
"gid=${toString config.users.groups.users.gid}" # "gid=${toString config.users.groups.users.gid}"
"vers=3.0" # "vers=3.0"
"nofail" # "nofail"
"noauto" # "noauto"
"x-systemd.automount" # "x-systemd.automount"
"x-systemd.mount-timeout=5" # "x-systemd.mount-timeout=5"
"_netdev" # "_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"
];
};
}; };
} }

6
profiles/nix/default.nix
View File

@ -13,11 +13,7 @@ with config.deviceSpecific; {
# patches = [ ./nix.patch ] ++ oa.patches or [ ]; # patches = [ ./nix.patch ] ++ oa.patches or [ ];
# }) # })
# else pkgs.nixFlakes; # else pkgs.nixFlakes;
package = if !config.deviceSpecific.isServer then package = pkgs.nixFlakes;
pkgs.nixFlakes.overrideAttrs (oa: {
patches = [ ./nix.patch ] ++ oa.patches or [ ];
})
else pkgs.nixFlakes;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes

10
profiles/overlay.nix
View File

@ -13,7 +13,7 @@ let
in in
with lib; { with lib; {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.nixpkgs-wayland.overlay # inputs.nixpkgs-wayland.overlay
inputs.nix-alien.overlay inputs.nix-alien.overlay
roundcube-plugins roundcube-plugins
(self: super: (self: super:
@ -38,10 +38,10 @@ with lib; {
vivaldi = master.vivaldi; vivaldi = master.vivaldi;
wine = super.wineWowPackages.staging; wine = super.wineWowPackages.staging;
pass-secret-service = super.pass-secret-service.overrideAttrs (_: { installCheckPhase = null; }); pass-secret-service = super.pass-secret-service.overrideAttrs (_: { installCheckPhase = null; });
qbittorrent = super.qbittorrent.overrideAttrs (old: rec { # qbittorrent = super.qbittorrent.overrideAttrs (old: rec {
version = "enchanced-edition"; # version = "enchanced-edition";
src = inputs.qbittorrent-ee; # src = inputs.qbittorrent-ee;
}); # });
btrbk = if (versionOlder super.btrbk.version "0.32.0") then super.btrbk.overrideAttrs (old: rec { btrbk = if (versionOlder super.btrbk.version "0.32.0") then super.btrbk.overrideAttrs (old: rec {
version = "0.32.0-master"; version = "0.32.0-master";
src = super.fetchFromGitHub { src = super.fetchFromGitHub {

3
profiles/services.nix
View File

@ -28,7 +28,8 @@ with config.deviceSpecific; {
interval = "weekly"; interval = "weekly";
}; };
services.thermald.enable = isLaptop; # FIX!
#services.thermald.enable = isLaptop;
services.tlp = { services.tlp = {
enable = isLaptop; enable = isLaptop;

3
profiles/workspace/git.nix
View File

@ -17,6 +17,9 @@
defaultBranch = "master"; defaultBranch = "master";
}; };
pull.rebase = true; pull.rebase = true;
"url \"https://github.com/\"" = {
insteadOf = "git://github.com/";
};
}; };
}; };
}; };

2
roles/desktop.nix
View File

@ -45,5 +45,7 @@
print-scan print-scan
proxy proxy
sway sway
vscode-server
]; ];
} }