fixes... fixes everywhere
This commit is contained in:
Dmitriy Kholkin
parent
59ae38770e
commit
5394a1fd8a
248
flake.lock
generated
248
flake.lock
generated
@ -3,11 +3,11 @@
|
||||
"arkenfox-userjs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1654091479,
|
||||
"narHash": "sha256-fw8BZSCgEMLAD1IYvnCxTwYAPCrobZmmE7Y+foydkLk=",
|
||||
"lastModified": 1655190061,
|
||||
"narHash": "sha256-3bN/T4vCaIqkoz1AfZvczTXQup9B4Myq1cIRy/CyCgo=",
|
||||
"owner": "arkenfox",
|
||||
"repo": "user.js",
|
||||
"rev": "662eddbc2124d9d09774da7d5bc385f45c287c0d",
|
||||
"rev": "c21b9faefc0d99ab4f91836ceddc68a2a52ff9cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -84,11 +84,11 @@
|
||||
},
|
||||
"cachix": {
|
||||
"locked": {
|
||||
"lastModified": 1653996475,
|
||||
"narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=",
|
||||
"lastModified": 1656032109,
|
||||
"narHash": "sha256-yVpOG/FDHQa8hzhTGoLFgplTCDH/+ydYsF7Mc3pMQfk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3",
|
||||
"rev": "902d91def1efbea804f5158e5999cb113cedf04b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -115,6 +115,22 @@
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1650374568,
|
||||
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1648199409,
|
||||
@ -131,21 +147,6 @@
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1652557277,
|
||||
"narHash": "sha256-jSes9DaIVMdmwBB78KkFUVrlDzawmD62vrUg0GS2500=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "12806d31a381e7cd169a6bac35590e7b36dc5fe5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
@ -160,18 +161,37 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1656065134,
|
||||
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"nmd": "nmd",
|
||||
"nmt": "nmt",
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1654422613,
|
||||
"narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=",
|
||||
"lastModified": 1656150467,
|
||||
"narHash": "sha256-IJcYUzBfHhk0bklnWROwvw3P4txsfas+EzPb3fD+dvw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "20703892473d01c70fb10248442231fe94f4ceb4",
|
||||
"rev": "e0baf8ee0c3578ea158df99f4443fdd30b9bfe14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -186,11 +206,11 @@
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1653912655,
|
||||
"narHash": "sha256-sSBnbOqyVvV7CKq4jAmoZwd0VpYje1Yk0xSSmiSczCs=",
|
||||
"lastModified": 1656072606,
|
||||
"narHash": "sha256-Cu62yV1ndmrXVw6LryyGFq0Jk+QqFPCNwWoG4IIszYs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "93e3b4ce728ebcb91e8e47101ec4cd6c53c63dee",
|
||||
"rev": "e048dc74c4b6e21c10f7b675d6f5f43b5fd5d7fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -274,11 +294,11 @@
|
||||
"nixpkgs-regression": "nixpkgs-regression"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1654239108,
|
||||
"narHash": "sha256-0JzuElxLe5DxM+R4tvBYfvQnMGCERZy4KMRf0JYxxS4=",
|
||||
"lastModified": 1656108215,
|
||||
"narHash": "sha256-RzgcfbXxNWtt4BeJ/rPzHxR+l+wCfiauN4XTVnRLiy0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nix",
|
||||
"rev": "1dd7253133c4dfd2e7a16ad6fe505442cef38a5b",
|
||||
"rev": "586fa707fca207dbd12e49800691390249bdcd03",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -296,11 +316,11 @@
|
||||
"poetry2nix": "poetry2nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1652791933,
|
||||
"narHash": "sha256-ACttLTSoZx09T7jXn1YfEgM0gMcfvMI3QkYJSKRMV3w=",
|
||||
"lastModified": 1655280191,
|
||||
"narHash": "sha256-OEgjk89Hr2/yNH+iPeFRi+X5dy+bZxhULVknqaBCcOg=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "faeda0a028eca556dec136631f2e905fd7a46bb7",
|
||||
"rev": "ccf910e15a6dc5a41f8e714f9c35996aeb688760",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -324,13 +344,44 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-22_05": {
|
||||
"locked": {
|
||||
"lastModified": 1654936503,
|
||||
"narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dab6df51387c3878cdea09f43589a15729cae9f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-22.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-custom": {
|
||||
"locked": {
|
||||
"lastModified": 1656168011,
|
||||
"narHash": "sha256-iIXlI4dloMt7YiPInH7PuBCiSBmvgclkRZwOzlYv/xg=",
|
||||
"owner": "AlukardBF",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4bc62eae18b26c627f2549b6833de9362568c7fb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AlukardBF",
|
||||
"ref": "master",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1653785473,
|
||||
"narHash": "sha256-kqSk70xGTRfmJi2XPfpxF4ckfrlB0bf9vmN1V3aydTA=",
|
||||
"lastModified": 1655599917,
|
||||
"narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "81ce0b50f52b58a6a97184c0a4c42e6d964cfa06",
|
||||
"rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -341,11 +392,11 @@
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1654429103,
|
||||
"narHash": "sha256-xpSQ0UJGrwCGEye29IHcSZZEtSem+U7uvaFPRem+ZoE=",
|
||||
"lastModified": 1656157493,
|
||||
"narHash": "sha256-ComBm/Wo4sGHCAuLNJ+VAbPd2/dWLWN03bkSK8uq/LI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "88e0f07bd610fb9dd41c166ed3769fb83fd10af5",
|
||||
"rev": "41c91c48eee8801b91eb6c18ef763b11dc059047",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -389,16 +440,16 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1653996475,
|
||||
"narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=",
|
||||
"lastModified": 1656007306,
|
||||
"narHash": "sha256-MsC44YZ6wuBwn5Bu8T+RVoQWlp2l5BR6hhmNoAAHIEw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3",
|
||||
"rev": "ccf8bdf72624521358be6bb7d9b524c4cbcf7aff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-21.11",
|
||||
"ref": "nixos-22.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@ -406,18 +457,18 @@
|
||||
"nixpkgs-wayland": {
|
||||
"inputs": {
|
||||
"cachix": "cachix",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1654425625,
|
||||
"narHash": "sha256-wSRwf3acRxAMqFsMvli3LSnpTMiFO/LEvKyc+GwJKAE=",
|
||||
"lastModified": 1656159969,
|
||||
"narHash": "sha256-tetFScs4LsZ5DrrsSxpJeo/FI5pi14xFhDuKswv1K3s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "7c64142116dbdbf8b1b3e60110af5beb64b57085",
|
||||
"rev": "ac93a688a4e11da7f57d404534b3581290181495",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -428,43 +479,75 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1645296114,
|
||||
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
|
||||
"lastModified": 1653988320,
|
||||
"narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
|
||||
"rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-21.05-small",
|
||||
"ref": "nixos-22.05-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1654431174,
|
||||
"narHash": "sha256-oQLZA/bJmsi7tGY6KLqeOhgQ/9f4I3RyAgo/aCvhMGc=",
|
||||
"owner": "AlukardBF",
|
||||
"lastModified": 1655983783,
|
||||
"narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a97502f2a652f1251fa83a3f975d20c997b8166a",
|
||||
"rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AlukardBF",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nmd": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1653339422,
|
||||
"narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",
|
||||
"owner": "rycee",
|
||||
"repo": "nmd",
|
||||
"rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rycee",
|
||||
"repo": "nmd",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"nmt": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1648075362,
|
||||
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
|
||||
"owner": "rycee",
|
||||
"repo": "nmt",
|
||||
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rycee",
|
||||
"repo": "nmt",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1654423064,
|
||||
"narHash": "sha256-X3u2YCDQTiMU+geriz0bjLEJFIxXs1GOVEo8WKEi4Ic=",
|
||||
"lastModified": 1656158107,
|
||||
"narHash": "sha256-DbENc5ndWgpTd7bJbNqP8lX+lGfzcCI1vSjYy0ebASI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "522188d4fe94df9958d2c8f1271e21210394523f",
|
||||
"rev": "c45462e0eac81d8c779f9444e3b231f4e95f2f10",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -485,11 +568,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1652507075,
|
||||
"narHash": "sha256-K/f4DlYLWO+XGskE+OSIPDCkiWUAvOpDVyOL9D+VCUc=",
|
||||
"lastModified": 1655106322,
|
||||
"narHash": "sha256-X7oWgty5uKYYTg7n6gut/lShi1X5QxiOfLQNHyJ5LaM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "poetry2nix",
|
||||
"rev": "88ffae91c605aaafc2797f4096ca9f065152796a",
|
||||
"rev": "347ccb4ce58e7af1ece3f9743019263c4aede7b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -500,7 +583,7 @@
|
||||
},
|
||||
"polymc": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"libnbtplusplus": "libnbtplusplus",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
@ -524,11 +607,11 @@
|
||||
"qbittorrent-ee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1654043540,
|
||||
"narHash": "sha256-c2+QK+ieXIhh8/K04U3kCIqFXf5yce9xZelsnVMS3qk=",
|
||||
"lastModified": 1655159598,
|
||||
"narHash": "sha256-HQMlqyfP60DwN3dtQ1lWtKJeR7LiPh+reVKbwrMTL1w=",
|
||||
"owner": "c0re100",
|
||||
"repo": "qBittorrent-Enhanced-Edition",
|
||||
"rev": "683ecc7a7379b6e1cf87e06e8fc77967b5076224",
|
||||
"rev": "4ffc2ccce818b133e6355514234282e66c0ad5e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -565,6 +648,7 @@
|
||||
"nix": "nix",
|
||||
"nix-alien": "nix-alien",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-custom": "nixpkgs-custom",
|
||||
"nixpkgs-master": "nixpkgs-master",
|
||||
"nixpkgs-mozilla": "nixpkgs-mozilla",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
@ -584,11 +668,11 @@
|
||||
"rycee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1654423034,
|
||||
"narHash": "sha256-f5eiXLH4sFUD5pvGNdsiFRGjjNcDnwF+gOn3dmWVew0=",
|
||||
"lastModified": 1656150871,
|
||||
"narHash": "sha256-UQuoIv9nxHRMzh+0jAerDcl4WLqtI/ZjsUY8Ly3XCIE=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "a7c9b8b161267a74784460cfe21d3d16eed8b114",
|
||||
"rev": "882f830b66d99012374ff2140b5fd276449d49d6",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -603,14 +687,15 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
"nixpkgs-22_05": "nixpkgs-22_05",
|
||||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1653423337,
|
||||
"narHash": "sha256-TLNyDhwhQWimt5QWzFf/3B7lKk5isdICNRTwiCAhiB0=",
|
||||
"lastModified": 1655930346,
|
||||
"narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "15cf252a0dfffb2420a60fbd6be3467c11026142",
|
||||
"rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -620,6 +705,21 @@
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1605370193,
|
||||
"narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
description = "System configuration";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:AlukardBF/nixpkgs/nixos-unstable";
|
||||
# nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs-custom.url = "github:AlukardBF/nixpkgs/master";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-21.11";
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||
nixpkgs-wayland = {
|
||||
url = "github:nix-community/nixpkgs-wayland";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
@ -88,7 +88,7 @@ let
|
||||
addDependencies = name: cfg:
|
||||
with cfg;
|
||||
genAttrs services (service: rec {
|
||||
requires = [ "${name}-envsubst" ];
|
||||
requires = [ "${name}-envsubst.service" ];
|
||||
after = requires;
|
||||
bindsTo = requires;
|
||||
});
|
||||
|
||||
@ -48,7 +48,6 @@ with config.deviceSpecific; {
|
||||
# gui
|
||||
bitwarden
|
||||
discord
|
||||
element-desktop
|
||||
feh
|
||||
foliate
|
||||
gparted
|
||||
@ -58,6 +57,7 @@ with config.deviceSpecific; {
|
||||
qbittorrent
|
||||
qimgv
|
||||
quodlibet
|
||||
schildichat-desktop-wayland
|
||||
system-config-printer
|
||||
tdesktop
|
||||
xarchiver
|
||||
|
||||
@ -1,5 +1,23 @@
|
||||
{ pkgs, lib, config, ... }: {
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
waydroidGbinderConf = pkgs.writeText "waydroid.conf" ''
|
||||
[General]
|
||||
ApiLevel = 29
|
||||
'';
|
||||
# anboxGbinderConf = pkgs.writeText "anbox.conf" ''
|
||||
# [Protocol]
|
||||
# /dev/anbox-binder = aidl2
|
||||
# /dev/anbox-vndbinder = aidl2
|
||||
# /dev/anbox-hwbinder = hidl
|
||||
# [ServiceManager]
|
||||
# /dev/anbox-binder = aidl2
|
||||
# /dev/anbox-vndbinder = aidl2
|
||||
# /dev/anbox-hwbinder = hidl
|
||||
# '';
|
||||
in {
|
||||
config = lib.mkIf config.deviceSpecific.isGaming {
|
||||
environment.etc."gbinder.d/waydroid.conf".source = lib.mkForce waydroidGbinderConf;
|
||||
# environment.etc."gbinder.d/anbox.conf".source = lib.mkForce anboxGbinderConf;
|
||||
virtualisation.waydroid.enable = true;
|
||||
virtualisation.lxd.enable = true;
|
||||
};
|
||||
|
||||
@ -9,6 +9,10 @@ let
|
||||
config = config.nixpkgs.config;
|
||||
localSystem = { inherit system; };
|
||||
});
|
||||
custom = import inputs.nixpkgs-custom ({
|
||||
config = config.nixpkgs.config;
|
||||
localSystem = { inherit system; };
|
||||
});
|
||||
roundcube-plugins = import ./packages/roundcube-plugins/default.nix;
|
||||
in
|
||||
with lib; {
|
||||
@ -41,26 +45,30 @@ with lib; {
|
||||
youtube-to-mpv = pkgs.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
|
||||
vivaldi = master.vivaldi;
|
||||
wine = super.wineWowPackages.staging;
|
||||
pass-secret-service = super.pass-secret-service.overrideAttrs (_: { installCheckPhase = null; });
|
||||
pass-secret-service = custom.pass-secret-service.overrideAttrs (_: {
|
||||
installCheckPhase = null;
|
||||
setuptoolsCheckHook = null;
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{dbus-1/services,xdg-desktop-portal/portals}
|
||||
cat > $out/share/dbus-1/services/org.freedesktop.secrets.service << EOF
|
||||
[D-BUS Service]
|
||||
Name=org.freedesktop.secrets
|
||||
Exec=/run/current-system/sw/bin/systemctl --user start pass-secret-service
|
||||
EOF
|
||||
cp $out/share/dbus-1/services/{org.freedesktop.secrets.service,org.freedesktop.impl.portal.Secret.service}
|
||||
cat > $out/share/xdg-desktop-portal/portals/pass-secret-service.portal << EOF
|
||||
[portal]
|
||||
DBusName=org.freedesktop.secrets
|
||||
Interfaces=org.freedesktop.impl.portal.Secrets
|
||||
UseIn=gnome
|
||||
EOF
|
||||
'';
|
||||
});
|
||||
flutter = custom.flutter;
|
||||
# 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 {
|
||||
owner = "digint";
|
||||
repo = "btrbk";
|
||||
rev = "c5273a8745fa60fc52b3180fa210ec3048e6a419";
|
||||
sha256 = "sha256-Q5KIndnXtTJmqVjmuucutWPggLey7ceT9sqeEInC8vw=";
|
||||
};
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/btrbk \
|
||||
--set PERL5LIB $PERL5LIB \
|
||||
--run 'export program_name=$0' \
|
||||
--prefix PATH ':' "${with self; lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
|
||||
'';
|
||||
}) else super.btrbk;
|
||||
}
|
||||
)
|
||||
];
|
||||
|
||||
@ -6,27 +6,28 @@ with config.deviceSpecific; {
|
||||
users.users.alukard = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [
|
||||
"sudo"
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
"disk"
|
||||
"dbus"
|
||||
"audio"
|
||||
"docker"
|
||||
"sound"
|
||||
"pulse"
|
||||
"adbusers"
|
||||
"input"
|
||||
"libvirtd"
|
||||
"kvm"
|
||||
"vboxusers"
|
||||
"smbuser"
|
||||
"audio"
|
||||
"cdrom"
|
||||
"scanner"
|
||||
"lp"
|
||||
"dialout"
|
||||
"corectrl"
|
||||
"dbus"
|
||||
"dialout"
|
||||
"disk"
|
||||
"docker"
|
||||
"input"
|
||||
"kvm"
|
||||
"libvirtd"
|
||||
"lp"
|
||||
"lxd"
|
||||
"networkmanager"
|
||||
"pulse"
|
||||
"scanner"
|
||||
"smbuser"
|
||||
"sound"
|
||||
"sudo"
|
||||
"vboxusers"
|
||||
"video"
|
||||
"wheel"
|
||||
];
|
||||
description = "Dmitriy Kholkin";
|
||||
uid = 1000;
|
||||
|
||||
19
profiles/workspace/copyq.nix
Normal file
19
profiles/workspace/copyq.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ config, pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.copyq ];
|
||||
home-manager.users.alukard = {
|
||||
wayland.windowManager.sway.config = {
|
||||
window.commands = [
|
||||
{
|
||||
criteria = { title = ".*CopyQ"; };
|
||||
command = "floating enable";
|
||||
}
|
||||
{
|
||||
criteria = { title = ".*CopyQ"; };
|
||||
command = "move position mouse";
|
||||
}
|
||||
];
|
||||
startup = [{ command = "${pkgs.copyq}/bin/copyq"; }];
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
@ -8,7 +8,7 @@
|
||||
signByDefault = true;
|
||||
key = "922DA6E758A0FE4CFAB4E4B2FD266B810DF48DF2";
|
||||
};
|
||||
ignores = [ ".envrc" ".direnv" "*~" ];
|
||||
ignores = [ ".envrc" ".direnv" "*~" ".#*" "#*#" ];
|
||||
extraConfig = {
|
||||
core = {
|
||||
editor = "code --wait";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, ... }:
|
||||
{ config, lib, ... }:
|
||||
with config.deviceSpecific; {
|
||||
home-manager.users.alukard = {
|
||||
programs.gpg = {
|
||||
@ -14,5 +14,15 @@ with config.deviceSpecific; {
|
||||
"E6A6377C3D0827C36428A290199FDB3B91414AFE"
|
||||
];
|
||||
};
|
||||
|
||||
systemd.user.services.gpg-agent = {
|
||||
Service = {
|
||||
Environment = lib.mkForce [
|
||||
"GPG_TTY=/dev/tty1"
|
||||
"DISPLAY=:0"
|
||||
"GNUPGHOME=${config.home-manager.users.alukard.xdg.dataHome}/gnupg"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -7,26 +7,29 @@
|
||||
CARGO_HOME = "${config.home-manager.users.alukard.xdg.dataHome}/cargo";
|
||||
};
|
||||
|
||||
# environment.systemPackages = [ pkgs.pass-secret-service ];
|
||||
# services.dbus.packages = [ pkgs.pass-secret-service ];
|
||||
# xdg.portal.extraPortals = [ pkgs.pass-secret-service ];
|
||||
|
||||
home-manager.users.alukard = {
|
||||
news.display = "silent";
|
||||
systemd.user.startServices = true;
|
||||
home.stateVersion = "21.11";
|
||||
|
||||
#TODO: Move to another file
|
||||
services.pass-secret-service.enable = true;
|
||||
systemd.user.services.pass-secret-service = {
|
||||
Service = {
|
||||
ExecStart = lib.mkForce
|
||||
"${pkgs.pass-secret-service}/bin/pass_secret_service --path ${config.environment.variables.PASSWORD_STORE_DIR}";
|
||||
Type = "dbus";
|
||||
BusName = "org.freedesktop.secrets";
|
||||
};
|
||||
Unit = rec {
|
||||
Wants = [ "gpg-agent.service" "activate-secrets.service" ];
|
||||
After = Wants;
|
||||
PartOf = [ "graphical-session-pre.target" ];
|
||||
};
|
||||
};
|
||||
# services.pass-secret-service.enable = true;
|
||||
# systemd.user.services.pass-secret-service = {
|
||||
# Service = {
|
||||
# Type = "dbus";
|
||||
# Environment = [ "GPG_TTY=/dev/tty1" "DISPLAY=:0" ];
|
||||
# BusName = "org.freedesktop.secrets";
|
||||
# };
|
||||
# Unit = rec {
|
||||
# Wants = [ "gpg-agent.service" ];
|
||||
# After = Wants;
|
||||
# PartOf = [ "graphical-session-pre.target" ];
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
system.stateVersion = "21.11";
|
||||
|
||||
@ -192,6 +192,7 @@ in {
|
||||
"${modifier}+j" = "exec ${pkgs.mpris-ctl}/bin/mpris-ctl prev";
|
||||
"${modifier}+k" = "exec ${pkgs.mpris-ctl}/bin/mpris-ctl pp";
|
||||
"${modifier}+l" = "exec ${pkgs.mpris-ctl}/bin/mpris-ctl next";
|
||||
"${modifier}+Slash" = "exec ${pkgs.copyq}/bin/copyq menu";
|
||||
"${modifier}+Shift+j" = "exec ${pkgs.mpris-ctl}/bin/mpris-ctl --player Spotify prev";
|
||||
"${modifier}+Shift+k" = "exec ${pkgs.mpris-ctl}/bin/mpris-ctl --player Spotify pp";
|
||||
"${modifier}+Shift+l" = "exec ${pkgs.mpris-ctl}/bin/mpris-ctl --player Spotify next";
|
||||
|
||||
@ -34,6 +34,7 @@
|
||||
vscode
|
||||
waydroid
|
||||
|
||||
copyq
|
||||
cursor
|
||||
direnv
|
||||
fonts
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user